glade3 r2025 - in trunk: . gladeui plugins/gnome

[tvb svn gnome org]

Author: tvb
Date: Thu Nov 13 18:58:33 2008
New Revision: 2025
URL: http://svn.gnome.org/viewvc/glade3?rev=2025&view=rev

Log:

	* gladeui/glade-utils.c: Refixed use of uninitialized variable (bug 559678).

	* plugins/gnome/glade-gnome.c: Fixed build breakage (bug 560668).



Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-utils.c
   trunk/plugins/gnome/glade-gnome.c

Modified: trunk/gladeui/glade-utils.c
==============================================================================
--- trunk/gladeui/glade-utils.c	(original)
+++ trunk/gladeui/glade-utils.c	Thu Nov 13 18:58:33 2008
@@ -448,7 +448,7 @@
 	gchar *text;
 	gchar *ltext;
 	GList *clist;
-	gsize n;
+	gsize len;
 
 	int (*string_compare) (const char *, const char *, gsize);
 
@@ -457,14 +457,15 @@
 	else
 		string_compare = g_ascii_strncasecmp;
 
-	text = (gchar*) gtk_entry_get_text (GTK_ENTRY (combo->entry));
+	text  = (gchar*) gtk_entry_get_text (GTK_ENTRY (combo->entry));
+	len   = text ? strlen (text) : 0;
 	clist = GTK_LIST (combo->list)->children;
 
 	while (clist && clist->data) {
 		ltext = glade_util_gtk_combo_func (GTK_LIST_ITEM (clist->data));
 		if (!ltext)
 			continue;
-		if (!(*string_compare) (ltext, text, n))
+		if (!(*string_compare) (ltext, text, len))
 			return (GtkListItem *) clist->data;
 		clist = clist->next;
 	}

Modified: trunk/plugins/gnome/glade-gnome.c
==============================================================================
--- trunk/plugins/gnome/glade-gnome.c	(original)
+++ trunk/plugins/gnome/glade-gnome.c	Thu Nov 13 18:58:33 2008
@@ -824,7 +824,7 @@
 	eclass = g_type_class_ref (glade_standard_stock_get_type ());
 	if ((eval = g_enum_get_value_by_nick (eclass, stock)) != NULL)
 	{
-		glade_widget_property_set (gbutton, "glade-type", GLADEGTK_BUTTON_STOCK);
+		glade_widget_property_set (gbutton, "use-stock", TRUE);
 		glade_widget_property_set (gbutton, "stock", eval->value);
 	}
 	g_type_class_unref (eclass);