--- a/mcabber/src/hooks.c	Sat Feb 17 15:14:39 2007 +0100
+++ b/mcabber/src/hooks.c	Sun Feb 18 11:03:49 2007 +0100
@@ -305,7 +305,7 @@
     extcmd = NULL;
   }
   if (command)
-    extcmd = g_strdup(command);
+    extcmd = expand_filename(command);
 }
 
 //  hk_ext_cmd()
@@ -352,13 +352,17 @@
   if (strchr("MG", type) && data && settings_opt_get_int("event_log_files")) {
     int fd;
     const char *prefix;
+    char *prefix_xp = NULL;
     char *data_locale;
 
     data_locale = from_utf8(data);
     prefix = settings_opt_get("event_log_dir");
-    if (!prefix)
+    if (prefix)
+      prefix = prefix_xp = expand_filename(prefix);
+    else
       prefix = ut_get_tmpdir();
     datafname = g_strdup_printf("%s/mcabber-%d.XXXXXX", prefix, getpid());
+    g_free(prefix_xp);
 
     // XXX Some old systems may require us to set umask first.
     fd = mkstemp(datafname);