Little fixes for lxsession and bump version number to 0.4.
authorHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Tue, 14 Jul 2009 11:46:37 +0000 (11:46 +0000)
committerHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Tue, 14 Jul 2009 11:46:37 +0000 (11:46 +0000)
configure.ac
lxsession/Makefile.am
lxsession/lxsession.c
lxsession/settings-daemon.c

index 8f1212a..08a9b7f 100644 (file)
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(lxsession,[0.3.8], [],lxsession)
+AC_INIT(lxsession,[0.4.0], [],lxsession)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_PROG_INTLTOOL(, [no-xml])
 AM_MAINTAINER_MODE
index 1ec29d4..f43f708 100644 (file)
@@ -3,7 +3,6 @@ NULL=
 bin_PROGRAMS = lxsession
 
 lxsession_CFLAGS = $(GLIB_CFLAGS) \
-                               -DPACKAGE_DATA_DIR=\""$(datadir)/lxde"\" \
                                -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
                                -Werror-implicit-function-declaration
                                $(NULL)
index b633868..196b3a3 100644 (file)
@@ -52,7 +52,6 @@ static char display_env[] = "DISPLAY";
 static char pid_env[] = "_LXSESSION_PID";
 
 static char prog_name[]="lxsession";
-static char config_filename[]="config";
 static char autostart_filename[]="autostart";
 
 const char *session_name = NULL;
@@ -240,10 +239,14 @@ static void parse_options(int argc, char** argv)
                                no_settings = TRUE;
                 continue;
             case 'r':
-                if( 0 == strcmp( argv[i]+1, "reload" ) )
-                    reload_settings = TRUE;
+                               reload_settings = TRUE;
+                               continue;
+                       default:
+                               goto usage;
             }
         }
+       }
+       return;
 usage:
         fprintf ( stderr,
                   "Usage:  lxsession [OPTIONS...]\n"
@@ -252,7 +255,6 @@ usage:
                                  "\t-r\t reload configurations (for Xsettings daemon)\n"
                                  "\t-n\t disable Xsettings daemon support\n" );
         exit(1);
-    }
 }
 
 int main(int argc, char** argv)
index 697a467..725ab00 100644 (file)
@@ -177,9 +177,9 @@ static void load_settings( GKeyFile* kf )
        configure_input(kf);
 
        /* Load GTK+ settings */
-       if ( keys = g_key_file_get_keys( kf, group, NULL, NULL ) == NULL ) 
+       if ( (keys = g_key_file_get_keys( kf, group, NULL, NULL )) == NULL ) 
            return;
-       
+
        for( key = keys; *key; ++key )
        {
                const char* name = *key + 1;