[gnome-session] Fix some compiler warnings

[Colin Walters <walters src gnome org>]

commit 0f86191608e8be52accf506cc4e5ae0366faae72
Author: Colin Walters <walters verbum org>
Date:   Wed Nov 7 07:06:03 2012 -0500

    Fix some compiler warnings
    
    A few from new gnome-common, others preexisting.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687838

 gnome-session/gsm-autostart-app.c |    4 +++-
 gnome-session/gsm-util.c          |    2 +-
 gnome-session/main.c              |    9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
index f8c1681..44a3a5a 100644
--- a/gnome-session/gsm-autostart-app.c
+++ b/gnome-session/gsm-autostart-app.c
@@ -587,7 +587,9 @@ setup_condition_monitor (GsmAutostartApp *app)
 
         g_free (key);
 
-        /* FIXME: cache the disabled value? */
+        if (disabled) {
+                /* FIXME: cache the disabled value? */
+        }
 }
 
 static gboolean
diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c
index 38844ea..735d55f 100644
--- a/gnome-session/gsm-util.c
+++ b/gnome-session/gsm-util.c
@@ -191,7 +191,7 @@ gsm_util_set_autostart_dirs (char ** dirs)
 }
 
 static char **
-gsm_util_get_standard_autostart_dirs ()
+gsm_util_get_standard_autostart_dirs (void)
 {
         GPtrArray          *dirs;
         const char * const *system_config_dirs;
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 0ec33bb..061ac0e 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -259,10 +259,11 @@ main (int argc, char **argv)
         GsmStore         *client_store;
         GsmXsmpServer    *xsmp_server;
         static char     **override_autostart_dirs = NULL;
-        static char      *session_name = NULL;
+        static char      *opt_session_name = NULL;
+        const char       *session_name;
         static GOptionEntry entries[] = {
                 { "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), N_("AUTOSTART_DIR") },
-                { "session", 0, 0, G_OPTION_ARG_STRING, &session_name, N_("Session to use"), N_("SESSION_NAME") },
+                { "session", 0, 0, G_OPTION_ARG_STRING, &opt_session_name, N_("Session to use"), N_("SESSION_NAME") },
                 { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
                 { "failsafe", 'f', 0, G_OPTION_ARG_NONE, &failsafe, N_("Do not load user-specified applications"), NULL },
                 { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
@@ -339,8 +340,10 @@ main (int argc, char **argv)
         g_unix_signal_add (SIGINT, term_or_int_signal_cb, manager);
         g_unix_signal_add (SIGUSR1, sigusr1_cb, manager);
 
-        if (IS_STRING_EMPTY (session_name))
+        if (IS_STRING_EMPTY (opt_session_name))
                 session_name = _gsm_manager_get_default_session (manager);
+        else
+                session_name = opt_session_name;
 
         gsm_util_set_autostart_dirs (override_autostart_dirs);