Merge lp:~bratsche/xsplash/help-fix into lp:xsplash

[Cody Russell]

[Ted Gould (ted)]

review: Approve

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-10-21 13:06:01 +0000
+++ src/xsplash.c	2009-11-04 22:25:18 +0000
@@ -984,6 +984,16 @@
   gchar           *log_filename = NULL;
   struct passwd   *pwd;
 
+  context = g_option_context_new ("xsplash");
+  g_option_context_add_main_entries (context,
+                                     entries,
+                                     "xsplash");
+  g_option_context_add_group (context, gtk_get_option_group (TRUE));
+  if (!g_option_context_parse (context, &argc, &argv, &error))
+    {
+      exit (1);
+    }
+
   pwd = getpwnam (XSPLASH_USER);
   if (pwd == NULL)
     {
@@ -1003,16 +1013,6 @@
       return 1;
     }
 
-  context = g_option_context_new ("xsplash");
-  g_option_context_add_main_entries (context,
-                                     entries,
-                                     "xsplash");
-  g_option_context_add_group (context, gtk_get_option_group (TRUE));
-  if (!g_option_context_parse (context, &argc, &argv, &error))
-    {
-      exit (1);
-    }
-
   log_filename = g_strdup_printf ("/var/log/gdm/xsplash-%s.log", gdm_session ? "gdm" : "user");
   log_init (log_filename); g_message ("xsplash started");
   g_free (log_filename);