[POS-commit] r264 - libglade

[Johan Dahlin]

Author: jdahlin
Date: 2005-03-31 17:27:56 -0300 (Thu, 31 Mar 2005)
New Revision: 264

Modified:
   libglade/glade-xml.c
Log:
Move GtkUIManager to glade-gtk.c

Modified: libglade/glade-xml.c
===================================================================
--- libglade/glade-xml.c	2005-03-31 20:27:35 UTC (rev 263)
+++ libglade/glade-xml.c	2005-03-31 20:27:56 UTC (rev 264)
@@ -38,6 +38,8 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkuimanager.h>
+#include <gtk/gtkcelllayout.h>	    
+#include <gtk/gtkcellrenderer.h>	    
 #include <gtk/gtklabel.h>
 #include <atk/atk.h>
 
@@ -1802,20 +1804,9 @@
 	    gtk_widget_thaw_child_notify(GTK_WIDGET(child));
 	}
 
-#if 0
-	/* TODO: assert parent implements GtkCellLayout */
-	if (GTK_IS_CELL_RENDERER(child)) {
-	    for (j = 0; j < info->children[i].n_layout; j++)
-		gtk_cell_layout_add_attributes(GTK_CELL_LAYOUT(parent),
-					       GTK_CELL_RENDERER(cell),
-					       info->children[i].layout[j].name,
-					       info->children[i].layout[j].value);
-					   
-					   
-	}
-#endif	
 	g_object_unref(G_OBJECT(child));
     }
+
     g_object_unref(G_OBJECT(parent));
 }
 
@@ -2150,42 +2141,6 @@
 	data->build_children(self, object, info);
     }
 
-    if (GTK_IS_UI_MANAGER(object)) {
-	int i, merge_id;
-	gchar *filename;
-	
-	for (i = 0; i < info->n_uis; i++) {
-	    GladeUIInfo ui = info->uis[i];
-	    merge_data *data;
-	    
-	    if (ui.filename) {
-		GError *error = NULL;
-		
-		filename = glade_xml_relative_file(self, ui.filename);
-		
-		merge_id = gtk_ui_manager_add_ui_from_file(GTK_UI_MANAGER(object),
-							   filename,
-							   &error);
-		g_free(filename);
-		if (error) {
-		    g_warning("Error: %s", error->message);
-		    g_error_free(error);
-		}
-
-		data = g_new0(merge_data, 1);
-		data->merge_id = merge_id;
-		data->ui_manager = object;
-
-		g_hash_table_insert(self->priv->ui_hash,
-				    ui.id,
-				    data);
-	    }
-	}
-	
-	/* When we're done, tell the GtkUIManager to update */
-	gtk_ui_manager_ensure_update(GTK_UI_MANAGER(object));
-    }
-
     if (visible_id == 0)
 	visible_id = g_quark_from_static_string("Libglade::visible");