glade3 r2049 - in trunk: . gladeui plugins/gtk+

[tvb svn gnome org]

Author: tvb
Date: Tue Nov 25 05:29:43 2008
New Revision: 2049
URL: http://svn.gnome.org/viewvc/glade3?rev=2049&view=rev

Log:

	* gladeui/glade-command.c: Fixed check for wrapperless objects returned by adaptor_get_children().



Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-command.c
   trunk/plugins/gtk+/gtk+.xml.in

Modified: trunk/gladeui/glade-command.c
==============================================================================
--- trunk/gladeui/glade-command.c	(original)
+++ trunk/gladeui/glade-command.c	Tue Nov 25 05:29:43 2008
@@ -941,9 +941,9 @@
 
 	for (l = children; l; l = l->next)
 	{
-		child = glade_widget_get_from_gobject (l->data);
-		if ((list = glade_widget_get_parentless_reffed_widgets (child)) != NULL)
-			reffed = g_list_concat (reffed, list);
+		if ((child = glade_widget_get_from_gobject (l->data)) != NULL)
+			if ((list = glade_widget_get_parentless_reffed_widgets (child)) != NULL)
+				reffed = g_list_concat (reffed, list);
 
 		reffed = get_all_parentless_reffed_widgets (reffed, child);
 	}

Modified: trunk/plugins/gtk+/gtk+.xml.in
==============================================================================
--- trunk/plugins/gtk+/gtk+.xml.in	(original)
+++ trunk/plugins/gtk+/gtk+.xml.in	Tue Nov 25 05:29:43 2008
@@ -3032,6 +3032,11 @@
     <glade-widget-class-ref name="GtkComboBoxEntry"/>
     <glade-widget-class-ref name="GtkProgressBar"/>
 
+    <glade-widget-class-ref name="GtkTextView"/>
+
+    <glade-widget-class-ref name="GtkTreeView"/>
+    <glade-widget-class-ref name="GtkIconView"/>
+
     <glade-widget-class-ref name="GtkHandleBox"/>
     <glade-widget-class-ref name="GtkStatusbar"/>
 
@@ -3073,28 +3078,10 @@
     <glade-widget-class-ref name="GtkTreeSelection"/>
   </glade-widget-group>
 
-  <glade-widget-group name="gtk-view" title="Tree View">
-
-    <default-palette-state expanded="False"/>
-
-    <glade-widget-class-ref name="GtkTreeView"/>
-    <glade-widget-class-ref name="GtkIconView"/>
-    <glade-widget-class-ref name="GtkTreeViewColumn"/>
-    <glade-widget-class-ref name="GtkCellRendererText"/>
-    <glade-widget-class-ref name="GtkCellRendererAccel"/>
-    <glade-widget-class-ref name="GtkCellRendererCombo"/>
-    <glade-widget-class-ref name="GtkCellRendererSpin"/>
-    <glade-widget-class-ref name="GtkCellRendererPixbuf"/>
-    <glade-widget-class-ref name="GtkCellRendererProgress"/>
-    <glade-widget-class-ref name="GtkCellRendererToggle"/>
-  </glade-widget-group>
-
-
-  <glade-widget-group name="gtk-text" _title="Text Manipulation">
+  <glade-widget-group name="gtk-text" _title="Text Buffers">
 
     <default-palette-state expanded="False"/>
 
-    <glade-widget-class-ref name="GtkTextView"/>
     <glade-widget-class-ref name="GtkTextBuffer"/>
     <glade-widget-class-ref name="GtkTextTag"/>
     <glade-widget-class-ref name="GtkTextTagTable"/>