diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-01-09 01:29:11 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-01-09 01:29:11 +0000 |
| commit | c431d02b87203e837c6b79a10c8a7ade707ca08c (patch) | |
| tree | e90f1aa59419a50ccff782f2bb0d0757796af04e | |
| parent | e36153083af08b2f853da3b82b1853774052edb1 (diff) | |
| download | gdm-c431d02b87203e837c6b79a10c8a7ade707ca08c.tar.gz | |
Fixes so code will compile with c99 compilers. Fixes bug #394421. Patch
2006-01-08 Brian Cameron <brian.cameron@sun.com>
* gui/gdmsetup.c: Fixes so code will compile with c99
compilers. Fixes bug #394421. Patch provided by
Jens Granseuer <jensgr@gmx.net>.
svn path=/trunk/; revision=4528
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/gdmsetup.c | 16 |
2 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2006-01-08 Brian Cameron <brian.cameron@sun.com> + + * gui/gdmsetup.c: Fixes so code will compile with c99 + compilers. Fixes bug #394421. Patch provided by + Jens Granseuer <jensgr@gmx.net>. + 2006-01-07 Brian Cameron <brian.cameron@sun.com> * Release 2.17.5: diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index 1afb48fc..534b3a8e 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -2849,7 +2849,7 @@ browser_move (GtkWidget *button, gpointer data) /* Hash key happens to be equal to the config entry key, se we save the value under the key and clean up */ -gboolean +static gboolean unsaved_data_from_hash_table_func (gpointer key, gpointer value, gpointer user_data) { gchar *c_key = key; @@ -3626,6 +3626,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_commands, "commands_dialog", GTK_TYPE_WINDOW); /* first get the file */ @@ -3662,12 +3668,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 @@ -3870,6 +3870,7 @@ command_button_clicked (void) GtkWidget *parent; GtkWidget *apply_command_changes_button; + gint i; xml_commands = glade_helper_load ("gdmsetup.glade", "commands_dialog", @@ -3916,7 +3917,6 @@ command_button_clicked (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); |