glade3 r2021 - in trunk: . gladeui src

[kmaraas svn gnome org]

Author: kmaraas
Date: Sat Nov  8 11:25:37 2008
New Revision: 2021
URL: http://svn.gnome.org/viewvc/glade3?rev=2021&view=rev

Log:
2008-11-08  Kjartan Maraas  <kmaraas gnome org>

	* gladeui/glade-utils.c: (glade_utils_get_pspec_from_funcname),
	(glade_util_ui_message), (glade_util_gtk_combo_find):
	* src/glade-window.c: (confirm_close_project):
	Try to avoid using deprecated glib api.

Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-utils.c
   trunk/src/glade-window.c

Modified: trunk/gladeui/glade-utils.c
==============================================================================
--- trunk/gladeui/glade-utils.c	(original)
+++ trunk/gladeui/glade-utils.c	Sat Nov  8 11:25:37 2008
@@ -174,7 +174,7 @@
 			      (gpointer) &get_pspec)) {
 		g_warning (_("We could not find the symbol \"%s\""),
 			   funcname);
-		return FALSE;
+		return NULL;
 	}
 
 	g_assert (get_pspec);
@@ -254,6 +254,7 @@
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
 					 message_type,
 					 buttons_type,
+					 "%s",
 					 string);
 
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
@@ -447,12 +448,14 @@
 	gchar *text;
 	gchar *ltext;
 	GList *clist;
-	int (*string_compare) (const char *, const char *);
+	gsize n;
+
+	int (*string_compare) (const char *, const char *, gsize);
 
 	if (combo->case_sensitive)
-		string_compare = strcmp;
+		string_compare = strncmp;
 	else
-		string_compare = g_strcasecmp;
+		string_compare = g_ascii_strncasecmp;
 
 	text = (gchar*) gtk_entry_get_text (GTK_ENTRY (combo->entry));
 	clist = GTK_LIST (combo->list)->children;
@@ -461,7 +464,7 @@
 		ltext = glade_util_gtk_combo_func (GTK_LIST_ITEM (clist->data));
 		if (!ltext)
 			continue;
-		if (!(*string_compare) (ltext, text))
+		if (!(*string_compare) (ltext, text, n))
 			return (GtkListItem *) clist->data;
 		clist = clist->next;
 	}

Modified: trunk/src/glade-window.c
==============================================================================
--- trunk/src/glade-window.c	(original)
+++ trunk/src/glade-window.c	Sat Nov  8 11:25:37 2008
@@ -1356,6 +1356,7 @@
 					             GTK_DIALOG_MODAL,
 					             GTK_MESSAGE_WARNING,
 					             GTK_BUTTONS_NONE,
+						     "%s",
 					             msg);
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);