[POS-commit] r279 - libglade

[Johan Dahlin]

Author: jdahlin
Date: 2005-03-31 19:40:49 -0300 (Thu, 31 Mar 2005)
New Revision: 279

Modified:
   libglade/glade-gtk.c
Log:
And implement them in here

Modified: libglade/glade-gtk.c
===================================================================
--- libglade/glade-gtk.c	2005-03-31 22:40:36 UTC (rev 278)
+++ libglade/glade-gtk.c	2005-03-31 22:40:49 UTC (rev 279)
@@ -404,7 +404,7 @@
     gint merge_id;
     gchar *filename;
 
-    if (info->n_children == 0 !! info->n_uis == 0)
+    if (info->n_children == 0 || info->n_uis == 0)
 	return;
     
     g_object_ref(obj);
@@ -678,6 +678,8 @@
 tree_view_column_build_children (GladeXML *xml, GObject *obj, GladeObjectInfo *info)
 {
     int i, j;
+    int expand = TRUE;
+    int pack_start = TRUE;
     
     if (info->n_children == 0)
 	return;
@@ -688,12 +690,31 @@
 	GladeObjectInfo *childinfo = info->children[i].child;
 
 	child = glade_xml_build_object(xml, childinfo);
-	/* TODO: packing properties */
-	gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(obj),
-					GTK_CELL_RENDERER(child),
-					TRUE);
 
 	
+	for (j = 0; j < info->children[i].n_properties; j++) {
+	    const gchar *name = info->children[i].properties[j].name;
+	    const gchar *value = info->children[i].properties[j].value;
+	    
+	    if (!strcmp(name, "expand"))
+		expand = BOOL(value);
+	    else if (!strcmp(name, "pack_start"))
+		pack_start = BOOL(value);
+	    else
+		g_warning("unknown child packing property %s for GtkTreeViewColumn",
+			  name);
+	}
+
+	if (pack_start)
+	    gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(obj),
+					    GTK_CELL_RENDERER(child),
+					    expand);
+	else
+	    gtk_tree_view_column_pack_end(GTK_TREE_VIEW_COLUMN(obj),
+					  GTK_CELL_RENDERER(child),
+					  expand);
+	    
+	
 	for (j = 0; j < childinfo->n_layout_props; j++)
 	{
 	    int value;