diff --git a/ChangeLog b/ChangeLog index 90e8d41197..7e7b432985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-09 Christian Persch + + * gtk/gtkuimanager.c: (gtk_ui_manager_insert_action_group), + (gtk_ui_manager_remove_action_group): Terminate + g_object_[dis]connect() calls with NULL instead of 0. + Fixes #138997. + 2004-04-09 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 90e8d41197..7e7b432985 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-04-09 Christian Persch + + * gtk/gtkuimanager.c: (gtk_ui_manager_insert_action_group), + (gtk_ui_manager_remove_action_group): Terminate + g_object_[dis]connect() calls with NULL instead of 0. + Fixes #138997. + 2004-04-09 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 90e8d41197..7e7b432985 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2004-04-09 Christian Persch + + * gtk/gtkuimanager.c: (gtk_ui_manager_insert_action_group), + (gtk_ui_manager_remove_action_group): Terminate + g_object_[dis]connect() calls with NULL instead of 0. + Fixes #138997. + 2004-04-09 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 90e8d41197..7e7b432985 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-04-09 Christian Persch + + * gtk/gtkuimanager.c: (gtk_ui_manager_insert_action_group), + (gtk_ui_manager_remove_action_group): Terminate + g_object_[dis]connect() calls with NULL instead of 0. + Fixes #138997. + 2004-04-09 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 90e8d41197..7e7b432985 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-04-09 Christian Persch + + * gtk/gtkuimanager.c: (gtk_ui_manager_insert_action_group), + (gtk_ui_manager_remove_action_group): Terminate + g_object_[dis]connect() calls with NULL instead of 0. + Fixes #138997. + 2004-04-09 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 4af675301a..a22baa51d5 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -584,7 +584,8 @@ gtk_ui_manager_insert_action_group (GtkUIManager *self, "object_signal::connect_proxy", G_CALLBACK (cb_proxy_connect_proxy), self, "object_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self, "object_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self, - "object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, 0); + "object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, + NULL); /* dirty all nodes, as action bindings may change */ dirty_all_nodes (self); @@ -619,7 +620,7 @@ gtk_ui_manager_remove_action_group (GtkUIManager *self, "any_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self, "any_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self, "any_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, - 0); + NULL); g_object_unref (action_group); /* dirty all nodes, as action bindings may change */