Fixes for compiling with gcc 2.95. Patch provided by Jens Granseuer

2006-12-14  Brian Cameron  <brian.cameron@sun.com>

        * daemon/gdm.c, daemon/gdmconfig.c, gui/gdmsetup.c,
          gui/greeter/greeter_action_language.c,
          gui/greeter/greeter_system.c: Fixes for compiling
          with gcc 2.95.  Patch provided by Jens Granseuer
          <jensgr@gmx.net>.

6 files changed, 48 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index ec60ab90..672d477c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-14  Brian Cameron  <brian.cameron@sun.com>
+
+	* daemon/gdm.c, daemon/gdmconfig.c, gui/gdmsetup.c,
+	  gui/greeter/greeter_action_language.c,
+	  gui/greeter/greeter_system.c: Fixes for compiling
+	  2.95.  Patch provided by Jens Granseuer
+	  <jensgr@gmx.net>.
+
 2006-12-13  Brian Cameron  <brian.cameron@sun.com>
 
         * Release 2.17.4:
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 56b45ad9..1a7ba20d 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -716,6 +716,8 @@ restart_machine (void)
 static void
 custom_cmd (long cmd_id)
 {	
+        gchar * key_string;
+
         if (cmd_id < 0 || cmd_id >= GDM_CUSTOM_COMMAND_MAX) {
 		/* We are just feeling very paranoid */
 		gdm_error (_("custom_cmd: Custom command index %ld outside permitted range [0,%d)"), 
@@ -723,7 +725,7 @@ custom_cmd (long cmd_id)
 		return;
 	}
 
-        gchar * key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, cmd_id);
+        key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, cmd_id);
         if (gdm_get_value_bool (key_string))
 	        custom_cmd_no_restart (cmd_id);
 	else
@@ -735,6 +737,8 @@ custom_cmd (long cmd_id)
 static void
 custom_cmd_restart (long cmd_id)
 {	
+	gchar * key_string;
+	char **argv;
 
         gdm_info (_("Executing custom command %ld with restart option..."), cmd_id);
 
@@ -745,8 +749,7 @@ custom_cmd_restart (long cmd_id)
 	change_to_first_and_clear (TRUE);
 #endif /* __linux */
 	
-	gchar * key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_id);
-	char **argv;
+	key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_id);
 	argv = ve_split (gdm_get_value_string (key_string));
 	g_free(key_string);
 	if (argv != NULL && argv[0] != NULL)
@@ -761,10 +764,11 @@ custom_cmd_restart (long cmd_id)
 static void
 custom_cmd_no_restart (long cmd_id)
 {	
+        pid_t pid;
 
         gdm_info (_("Executing custom command %ld with no restart option ..."), cmd_id);
 
-		pid_t pid = fork ();
+        pid = fork ();
 	
 	if (pid < 0) {
 	        /*failed fork*/
@@ -3680,6 +3684,7 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
 		GdmDisplay *disp;
 		GString *msg;
 		gboolean sysmenu;
+		unsigned long no_restart_status_flag = 0; /* we can store up-to 32 commands this way */
 
 		disp = gdm_connection_get_display (conn);
 		sysmenu = gdm_get_value_bool_per_display (disp->name, GDM_KEY_SYSTEM_MENU);
@@ -3696,8 +3701,6 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
 		
 		msg = g_string_new ("OK ");
 
-		unsigned long no_restart_status_flag = 0; /* we can store up-to 32 commands this way */
-		
 		for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
 			gchar *key_string = NULL; 
 			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); 
diff --git a/daemon/gdmconfig.c b/daemon/gdmconfig.c
index 6a179dbe..f698153b 100644
--- a/daemon/gdmconfig.c
+++ b/daemon/gdmconfig.c
@@ -346,6 +346,7 @@ static void
 gdm_config_init (void)
 {
    gint i;
+   gchar *key_string = NULL; 
 
    type_hash    = g_hash_table_new (g_str_hash, g_str_equal);
    val_hash     = g_hash_table_new (g_str_hash, g_str_equal);
@@ -511,7 +512,6 @@ gdm_config_init (void)
 
    /* custom command string values */
    GdmCustomCommands = g_new0 (GdmCustomCmd, GDM_CUSTOM_COMMAND_MAX);   
-   gchar *key_string = NULL; 
    for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
 	   /* For each possible custom command */      
 	   key_string = g_strdup_printf (_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); 
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 3a4bea83..54677fee 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -685,9 +685,12 @@ intspin_timeout (GtkWidget *spin)
 		   timed login comboboxes are adjusted and greeters restarted */
 		char **list;
 		char *removed = NULL;	
+		int i;
+		gchar *autologon_user;
+		gchar *timedlogon_user;
+		
 		
 		list = g_strsplit (GdmInclude, ",", 0);
-		int i;
 		for (i=0; list != NULL && list[i] != NULL; i++) {
 			if (gdm_user_uid (list[i]) >= new_val) 
 				continue;					
@@ -748,9 +751,6 @@ intspin_timeout (GtkWidget *spin)
 
 		/* We also need to check if user (if any) in the
 		   autologon/timed logon still match the criteria */
-		gchar *autologon_user;
-		gchar *timedlogon_user;
-		
 		autologon_user = gdm_config_get_string (GDM_KEY_AUTOMATIC_LOGIN);
 		timedlogon_user = gdm_config_get_string (GDM_KEY_TIMED_LOGIN);
 
@@ -3527,6 +3527,12 @@ command_response (GtkWidget *button, gpointer data)
 	gint response;
 	gchar *filename;
 	
+	const gchar *key;
+	gchar *value;
+	GtkWidget *command_combobox;
+	GtkWidget *command_entry = NULL;
+	gint selected;
+	
 	setup_dialog = glade_helper_get (xml, "setup_dialog", GTK_TYPE_WINDOW);
 	
 	/* first get the file */
@@ -3563,12 +3569,6 @@ command_response (GtkWidget *button, gpointer data)
 		return;
 	}
 
-	const gchar *key;
-	gchar *value;
-	GtkWidget *command_combobox;
-	GtkWidget *command_entry = NULL;
-	gint selected;
-	
 	key = g_object_get_data (G_OBJECT (button), "key");	
 	
 	/* Then according to the selected command
@@ -3940,14 +3940,17 @@ strings_list_add (char *strings_list, const char *string, const char *sep)
 static char *
 strings_list_remove (char *strings_list, const char *string, const char *sep)
 {
-    if (ve_string_empty (strings_list))
-        return strings_list;
-    
     char **actions;   
     gint i;
-    GString *msg = g_string_new ("");
+    GString *msg;
     const char *separator = "";
+    char *n;
+
+    if (ve_string_empty (strings_list))
+        return strings_list;
     
+    msg = g_string_new ("");
+
     actions = g_strsplit (strings_list, sep, -1);
         for (i = 0; actions[i]; i++) {
         if (strncmp (actions[i], string, strlen (string)) == 0)
@@ -3956,7 +3959,7 @@ strings_list_remove (char *strings_list, const char *string, const char *sep)
         separator = sep;
     }
     g_strfreev (actions);
-    char *n = g_strdup (msg->str);
+    n = g_strdup (msg->str);
     g_string_free (msg, TRUE);
     g_free (strings_list);
     return n;
@@ -5635,14 +5638,14 @@ xserver_priority_timeout (GtkWidget *entry)
 	for (li = xservers; li != NULL; li = li->next) {
 		GdmXserver *svr = li->data;
 		if (strcmp (ve_sure_string (svr->id), ve_sure_string (section)) == 0) {
-		
+			gint new_value;
 			
 			if (strcmp (ve_sure_string (key),
 				    ve_sure_string (GDM_KEY_SERVER_PRIORITY)) == 0)
 				value = svr->priority;
 			
 			/* Update this servers configuration */
-			gint new_value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (entry));
+			new_value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (entry));
 			if (new_value != value) {
 				svr->priority = new_value;				
 				update_xserver (section, svr);			
@@ -7317,6 +7320,7 @@ setup_general_tab (void)
 	GtkWidget *apply_command_changes_button;
 	gchar *gtkrc_filename;
 	gchar *user_24hr_clock;
+	gint i;
 
 	
 	/* Setup use visual feedback in the passwotrd entry */
@@ -7413,7 +7417,6 @@ setup_general_tab (void)
 	gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Suspend command"));
 
 	/* Add all the custom commands */
-	gint i;
 	for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
 		gchar *label = g_strdup_printf("Custom command %d", i);
 		gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), label);
@@ -8193,6 +8196,9 @@ int
 main (int argc, char *argv[])
 {
 	GtkWidget *dialog;
+	char **list;
+	gint GdmMinimalUID;
+	int i;
 
 	gdm_config_never_cache (TRUE);
 
@@ -8293,10 +8299,8 @@ main (int argc, char *argv[])
 	/* We need to make sure that the users in the include list exist
 	   and have uid that are higher than MinimalUID. This protects us
 	   from invalid data obtained from the config file */
-	char **list;
-	gint GdmMinimalUID = gdm_config_get_int (GDM_KEY_MINIMAL_UID);
+	GdmMinimalUID = gdm_config_get_int (GDM_KEY_MINIMAL_UID);
 	list = g_strsplit (GdmInclude, ",", 0);
-	int i;
 	for (i=0; list != NULL && list[i] != NULL; i++) {
 		if (gdm_is_user_valid (list[i]) && gdm_user_uid (list[i]) >= GdmMinimalUID)
 			continue;
diff --git a/gui/greeter/greeter_action_language.c b/gui/greeter/greeter_action_language.c
index 2ca83867..0e2c7982 100644
--- a/gui/greeter/greeter_action_language.c
+++ b/gui/greeter/greeter_action_language.c
@@ -306,6 +306,7 @@ void
 greeter_language_set (char *language)
 {
    char *locale;
+   GtkTreeSelection *selection;
    GtkTreeIter iter = {0};
 
    g_free (current_language);
@@ -319,7 +320,7 @@ greeter_language_set (char *language)
  
    greeter_custom_set_language (language);
 
-   GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
    gtk_tree_selection_unselect_all (selection);
 
    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (lang_model), &iter)) {
diff --git a/gui/greeter/greeter_system.c b/gui/greeter/greeter_system.c
index dc38607f..7c6bcb4f 100644
--- a/gui/greeter/greeter_system.c
+++ b/gui/greeter/greeter_system.c
@@ -217,8 +217,8 @@ greeter_system_append_system_menu (GtkWidget *menu)
 		for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
 		        if (GdmCustomCmdsFound[i]){
 				gint * cmd_index = g_new0(gint, 1);
-				*cmd_index = i;
 				gchar * key_string = NULL;
+				*cmd_index = i;
 				key_string = g_strdup_printf (_("%s%d="), GDM_KEY_CUSTOM_CMD_LABEL_TEMPLATE, i);
 				w = gtk_menu_item_new_with_mnemonic (gdm_config_get_string(key_string));
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
@@ -512,8 +512,9 @@ greeter_item_system_setup (void)
 
   for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
 	  gint * cmd_index = g_new0(gint, 1);
+	  gchar * key_string;
 	  *cmd_index = i;
-	  gchar * key_string = g_strdup_printf (_("custom_cmd_button%d"), i);
+	  key_string = g_strdup_printf (_("custom_cmd_button%d"), i);
 	  greeter_item_register_action_callback (key_string,
 						 (ActionFunc)query_greeter_custom_cmd_handler,
 						 cmd_index);