[glade3] * gladeui/glade-signal.c: Fixed glade_signal_load() careless mistake after GObjectifying.



commit 6dcbf9449db868588741d00e8189eb3976399d68
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Jan 6 20:42:14 2011 +0900

    	* gladeui/glade-signal.c: Fixed glade_signal_load() careless mistake after GObjectifying.

 ChangeLog              |    4 ++++
 gladeui/glade-signal.c |   24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3bd5665..403b206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-06  Tristan Van Berkom <tristanvb openismus com>
 
+	* gladeui/glade-signal.c: Fixed glade_signal_load() careless mistake after GObjectifying.
+
+2011-01-06  Tristan Van Berkom <tristanvb openismus com>
+
 	* NEWS: Rolling Glade 3.9.0
 
 	* gladeui/glade-command.c: Immediately select newly added widgets.
diff --git a/gladeui/glade-signal.c b/gladeui/glade-signal.c
index abb35b6..3de8861 100644
--- a/gladeui/glade-signal.c
+++ b/gladeui/glade-signal.c
@@ -365,7 +365,7 @@ GladeSignal *
 glade_signal_read (GladeXmlNode * node)
 {
   GladeSignal *signal;
-  gchar *name, *handler;
+  gchar *name, *handler, *userdata;
 
   g_return_val_if_fail (glade_xml_node_verify_silent
                         (node, GLADE_XML_TAG_SIGNAL), NULL);
@@ -384,16 +384,18 @@ glade_signal_read (GladeXmlNode * node)
       return NULL;
     }
 
-  signal = g_new0 (GladeSignal, 1);
-  signal->priv->name = name;
-  signal->priv->handler = handler;
-  signal->priv->after =
-      glade_xml_get_property_boolean (node, GLADE_XML_TAG_AFTER, FALSE);
-  signal->priv->userdata = glade_xml_get_property_string (node, GLADE_XML_TAG_OBJECT);
-  signal->priv->swapped = glade_xml_get_property_boolean (node, GLADE_XML_TAG_SWAPPED,
-                                                    /* If a signal specifies an object, its swapped
-                                                     * by default behaviour in GtkBuilder */
-                                                    signal->priv->userdata != NULL);
+
+  userdata = glade_xml_get_property_string (node, GLADE_XML_TAG_OBJECT);
+
+  signal = 
+    glade_signal_new (name, handler, userdata,
+		      glade_xml_get_property_boolean (node, GLADE_XML_TAG_AFTER, FALSE),
+		      glade_xml_get_property_boolean (node, GLADE_XML_TAG_SWAPPED,
+						      userdata != NULL));
+
+  g_free (name);
+  g_free (handler);
+  g_free (userdata);
 
   return signal;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]