Call g_signal_new() correctly and initialize the signal fields. Fixes

2004-05-03  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkuimanager.c (gtk_ui_manager_class_init): Call
	g_signal_new() correctly and initialize the signal fields.  Fixes
	#141749; patch based on Michael Natterer's.

diff --git a/ChangeLog b/ChangeLog
index 82d5f73b93127a3c8ba94c54c1148624bb85ec43..860089450cf319066da651bc8bbaf9413861e5ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Call
+       g_signal_new() correctly and initialize the signal fields.  Fixes
+       #141749; patch based on Michael Natterer's.
+
 u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkselection.c (_gtk_selection_request): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 82d5f73b93127a3c8ba94c54c1148624bb85ec43..860089450cf319066da651bc8bbaf9413861e5ff 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-05-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Call
+       g_signal_new() correctly and initialize the signal fields.  Fixes
+       #141749; patch based on Michael Natterer's.
+
 u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkselection.c (_gtk_selection_request): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 82d5f73b93127a3c8ba94c54c1148624bb85ec43..860089450cf319066da651bc8bbaf9413861e5ff 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-05-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Call
+       g_signal_new() correctly and initialize the signal fields.  Fixes
+       #141749; patch based on Michael Natterer's.
+
 u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkselection.c (_gtk_selection_request): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 82d5f73b93127a3c8ba94c54c1148624bb85ec43..860089450cf319066da651bc8bbaf9413861e5ff 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-05-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Call
+       g_signal_new() correctly and initialize the signal fields.  Fixes
+       #141749; patch based on Michael Natterer's.
+
 u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkselection.c (_gtk_selection_request): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 82d5f73b93127a3c8ba94c54c1148624bb85ec43..860089450cf319066da651bc8bbaf9413861e5ff 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-05-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Call
+       g_signal_new() correctly and initialize the signal fields.  Fixes
+       #141749; patch based on Michael Natterer's.
+
 u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkselection.c (_gtk_selection_request): Fix

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index d7b6c6f6c4e6bd54b3f06c9fa971d6e40b6df8b3..559cb694a04041834cbbdcd2aa69a7e09d93e901 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -246,7 +246,8 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
     g_signal_new ("add_widget",
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
-                 G_STRUCT_OFFSET (GtkUIManagerClass, add_widget), NULL, NULL,
+                 G_STRUCT_OFFSET (GtkUIManagerClass, add_widget),
+                 NULL, NULL,
                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1, 
                  GTK_TYPE_WIDGET);
@@ -287,12 +288,13 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
   ui_manager_signals[CONNECT_PROXY] =
     g_signal_new ("connect_proxy",
                  G_OBJECT_CLASS_TYPE (klass),
-                 0, 
-                 G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy),  
+                 G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
+                 G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy),
                  NULL, NULL,
                  _gtk_marshal_VOID__OBJECT_OBJECT,
                  G_TYPE_NONE, 2, 
-                 GTK_TYPE_ACTION, GTK_TYPE_WIDGET);
+                 GTK_TYPE_ACTION,
+                 GTK_TYPE_WIDGET);
 
   /**
    * GtkUIManager::disconnect_proxy:
@@ -308,11 +310,13 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
   ui_manager_signals[DISCONNECT_PROXY] =
     g_signal_new ("disconnect_proxy",
                  G_OBJECT_CLASS_TYPE (klass),
-                 G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy),  
-                 0, NULL, NULL,
+                 G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
+                 G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy),
+                 NULL, NULL,
                  _gtk_marshal_VOID__OBJECT_OBJECT,
-                 G_TYPE_NONE, 2, 
-                 GTK_TYPE_ACTION, GTK_TYPE_WIDGET);
+                 G_TYPE_NONE, 2,
+                 GTK_TYPE_ACTION,
+                 GTK_TYPE_WIDGET);
 
   /**
    * GtkUIManager::pre_activate:
@@ -330,10 +334,11 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
   ui_manager_signals[PRE_ACTIVATE] =
     g_signal_new ("pre_activate",
                  G_OBJECT_CLASS_TYPE (klass),
-                 G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate),  
-                 0, NULL, NULL,
+                 G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
+                 G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate),
+                 NULL, NULL,
                  _gtk_marshal_VOID__OBJECT,
-                 G_TYPE_NONE, 1, 
+                 G_TYPE_NONE, 1,
                  GTK_TYPE_ACTION);
 
   /**
@@ -352,12 +357,20 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
   ui_manager_signals[POST_ACTIVATE] =
     g_signal_new ("post_activate",
                  G_OBJECT_CLASS_TYPE (klass),
-                 G_STRUCT_OFFSET (GtkUIManagerClass, post_activate),  
-                 0, NULL, NULL,
+                 G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
+                 G_STRUCT_OFFSET (GtkUIManagerClass, post_activate),
+                 NULL, NULL,
                  _gtk_marshal_VOID__OBJECT,
-                 G_TYPE_NONE, 1, 
+                 G_TYPE_NONE, 1,
                  GTK_TYPE_ACTION);
 
+  klass->add_widget = NULL;
+  klass->actions_changed = NULL;
+  klass->connect_proxy = NULL;
+  klass->disconnect_proxy = NULL;
+  klass->pre_activate = NULL;
+  klass->post_activate = NULL;
+
   g_type_class_add_private (gobject_class, sizeof (GtkUIManagerPrivate));
 }