From bb8f864104bcd8f798925efd8a4cdc3c3b3a7010 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Fri, 7 Dec 2001 17:38:07 +0000 Subject: [PATCH] Terminate the parameter list passed to g_object_new with NULL 2001-12-07 Bradford Hovinen * gconf-property-editor.c (gconf_peditor_new_*): Terminate the parameter list passed to g_object_new with NULL --- capplets/common/ChangeLog | 2 ++ capplets/common/gconf-property-editor.c | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 26fec454c..f831a8e5a 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -2,6 +2,8 @@ * gconf-property-editor.c (gconf_property_editor_class_init): Use correct ordering of setup + (gconf_peditor_new_*): Terminate the parameter list passed to + g_object_new with NULL 2001-11-03 Bradford Hovinen diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c index 891948f1f..2ac54c2ac 100644 --- a/capplets/common/gconf-property-editor.c +++ b/capplets/common/gconf-property-editor.c @@ -275,7 +275,9 @@ gconf_peditor_new_boolean (GConfChangeSet *changeset, gchar *key, GtkWidget *che "key", key, "callback", peditor_boolean_value_changed, "changeset", changeset, - "object", checkbox); + "object", checkbox, + NULL); + g_signal_connect_swapped (G_OBJECT (checkbox), "toggled", (GCallback) peditor_boolean_widget_changed, peditor); g_object_set_data (peditor, "toggle-button", checkbox); @@ -324,7 +326,9 @@ gconf_peditor_new_string (GConfChangeSet *changeset, gchar *key, GtkWidget *entr "key", key, "callback", peditor_string_value_changed, "changeset", changeset, - "object", entry); + "object", entry, + NULL); + g_signal_connect_swapped (G_OBJECT (entry), "insert_at_cursor", (GCallback) peditor_string_widget_changed, peditor); g_signal_connect_swapped (G_OBJECT (entry), "delete_from_cursor", @@ -392,7 +396,9 @@ gconf_peditor_new_color (GConfChangeSet *changeset, gchar *key, GtkWidget *cp) "key", key, "callback", peditor_color_value_changed, "changeset", changeset, - "object", cp); + "object", cp, + NULL); + g_signal_connect_swapped (G_OBJECT (cp), "color_set", (GCallback) peditor_color_widget_changed, peditor); g_object_set_data (peditor, "cp", cp); @@ -453,7 +459,8 @@ gconf_peditor_new_select_menu (GConfChangeSet *changeset, gchar *key, GtkWidget "key", key, "callback", peditor_select_menu_value_changed, "changeset", changeset, - "object", option_menu); + "object", option_menu, + NULL); menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu))); @@ -513,7 +520,8 @@ gconf_peditor_new_select_radio (GConfChangeSet *changeset, gchar *key, GSList *r "key", key, "callback", peditor_select_radio_value_changed, "changeset", changeset, - "object", radio_group); + "object", radio_group, + NULL); for (item = radio_group; item != NULL; item = item->next) g_signal_connect_swapped (G_OBJECT (item->data), "toggled",