80 cols

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3f32917b25f58703bc04b9f5bb32549db79723cb..d8eae91a515cb1bd517446cf5c49feed41ad7346 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -101,6 +101,8 @@ int main(int argc, char **argv)
 
     g_set_prgname(argv[0]);
      
+    session_startup(&argc, &argv);
+
     /* parse out command line args */
     parse_args(argc, argv);
 
@@ -120,8 +122,6 @@ int main(int argc, char **argv)
     ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL);
 
-    session_startup(&argc, &argv);
-
     ob_screen = DefaultScreen(ob_display);
 
     ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
@@ -419,14 +419,12 @@ ObState ob_state()
 gchar *ob_expand_tilde(const gchar *f)
 {
     gchar **spl;
-    gchar *ret, *mid;
+    gchar *ret;
 
     if (!f)
         return NULL;
     spl = g_strsplit(f, "~", 0);
-    mid = g_strconcat(g_get_home_dir(), G_DIR_SEPARATOR_S, NULL);
-    ret = g_strjoinv(mid, spl);
-    g_free(mid);
+    ret = g_strjoinv(g_get_home_dir(), spl);
     g_strfreev(spl);
     return ret;
 }