[POS-commit] r269 - libglade

[Johan Dahlin]

Author: jdahlin
Date: 2005-03-31 18:34:24 -0300 (Thu, 31 Mar 2005)
New Revision: 269

Modified:
   libglade/glade-gtk.c
   libglade/glade-parser.c
   libglade/glade-xml.c
Log:
Compile with -Wall

Modified: libglade/glade-gtk.c
===================================================================
--- libglade/glade-gtk.c	2005-03-31 21:28:58 UTC (rev 268)
+++ libglade/glade-gtk.c	2005-03-31 21:34:24 UTC (rev 269)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
+#include <gtk/gtkcalendar.h>
 #include "glade-build.h"
 #include "glade-xml.h"
 
@@ -53,16 +54,7 @@
     GObject *ui_manager;
 } merge_data;
 
-void _glade_init_gtk_widgets(void);
-
 static void
-custom_noop (GladeXML *xml, GObject *obj,
-	     const char *name, const char *value)
-{
-    ;
-}
-
-static void
 set_visible(GladeXML *xml, GObject *obj,
 	    const gchar *prop_name, const gchar *prop_value)
 {
@@ -127,25 +119,6 @@
 }
 
 static void
-list_item_set_label (GladeXML *xml, GObject *obj,
-		     const char *name, const char *value)
-{
-    GtkWidget *child;
-
-    child = gtk_bin_get_child (GTK_BIN (obj));
-    if (child)
-	gtk_container_remove (GTK_CONTAINER (obj), child);
-    
-    /* copied from gtk_list_item_new_with_label() */
-    child = gtk_label_new (value);
-    gtk_misc_set_alignment (GTK_MISC (child), 0.0, 0.5);
-    gtk_misc_set_padding (GTK_MISC (child), 0, 1);
-
-    gtk_container_add (GTK_CONTAINER (obj), child);
-    gtk_widget_show (child);
-}
-
-static void
 text_view_set_text (GladeXML *xml, GObject *obj,
 		    const char *name, const char *value)
 {
@@ -161,20 +134,13 @@
 calendar_set_display_options (GladeXML *xml, GObject *obj,
 			      const char *name, const char *value)
 {
-    gtk_calendar_display_options (
+    gtk_calendar_set_display_options (
 	GTK_CALENDAR (obj),
 	glade_flags_from_string (GTK_TYPE_CALENDAR_DISPLAY_OPTIONS,
 				 value));
 }
 
 static void
-check_menu_item_set_always_show_toggle (GladeXML *xml, GObject *obj,
-					const char *name, const char *value)
-{
-    gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (obj), BOOL (value));
-}
-
-static void
 radio_menu_item_set_group (GladeXML *xml, GObject *obj,
 			   const char *name, const char *value)
 {
@@ -1098,8 +1064,6 @@
 
     glade_register_custom_prop (GTK_TYPE_BUTTON, "response_id", button_set_response_id);
     glade_register_custom_prop (GTK_TYPE_CALENDAR, "display_options", calendar_set_display_options);
-    glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle",
-				check_menu_item_set_always_show_toggle);
     glade_register_custom_prop (GTK_TYPE_COMBO_BOX, "items", combo_box_set_items);
     glade_register_custom_prop (GTK_TYPE_ENTRY, "invisible_char", entry_set_invisible_char);
     glade_register_custom_prop (GTK_TYPE_LIST_STORE, "types", list_store_set_types);

Modified: libglade/glade-parser.c
===================================================================
--- libglade/glade-parser.c	2005-03-31 21:28:58 UTC (rev 268)
+++ libglade/glade-parser.c	2005-03-31 21:34:24 UTC (rev 269)
@@ -575,7 +575,7 @@
 			    GError             **error)
 {     
     int i;
-#if 0
+#ifdef DEBUG
     int line, col;
     g_markup_parse_context_get_position(context, &line, &col);
     g_message("%d <%s:%d:%d> in state %s",

Modified: libglade/glade-xml.c
===================================================================
--- libglade/glade-xml.c	2005-03-31 21:28:58 UTC (rev 268)
+++ libglade/glade-xml.c	2005-03-31 21:34:24 UTC (rev 269)
@@ -62,8 +62,6 @@
  * properties + parent properties) */
 static const gchar *glade_custom_props_cache_key = "libglade::custom-props-cache";
 static GQuark       glade_custom_props_cache_id  = 0;
-static const gchar *glade_build_parent_key   = "libglade::parent";
-static GQuark       glade_build_parent_id    = 0;
 
 struct _GladeXMLPrivate {
     GladeInterface *tree; /* the tree for this GladeXML */
@@ -145,6 +143,8 @@
 
 static GType glade_xml_real_lookup_type(GladeXML*self, const char *gtypename);
 
+extern void _glade_init_gtk_widgets(void);
+
 /**
  * glade_xml_get_type:
  *
@@ -1884,7 +1884,6 @@
     if (!strcmp(info->classname, "Custom")) {
 	ret = custom_new(self, info);
     } else if (info->constructor != NULL) {
-	GObject *constructor;
 	merge_data *data;
 	gchar *tmp;