diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2008-11-08 11:25:37 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2008-11-08 11:25:37 +0000 |
| commit | 69ef04b0361ce5f7625e0a5811803ec4df5f9e6d (patch) | |
| tree | 922d65d808dccc19bcaada6edf8820e8ef7379ea | |
| parent | 07e09d7236f63bdc2cb177d4d4646cd47b19dec8 (diff) | |
| download | glade-69ef04b0361ce5f7625e0a5811803ec4df5f9e6d.tar.gz | |
Try to avoid using deprecated glib api.
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.
svn path=/trunk/; revision=2021
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gladeui/glade-utils.c | 13 | ||||
| -rw-r--r-- | src/glade-window.c | 1 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,10 @@ +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. + 2008-11-07 Juan Pablo Ugarte <juanpablougarte@gmail.com> * gladeui/glade-widget.c, gladeui/glade-widget-adaptor.c: moved signal and diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c index b4460f98..485f70a0 100644 --- a/gladeui/glade-utils.c +++ b/gladeui/glade-utils.c @@ -174,7 +174,7 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname) (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 @@ glade_util_ui_message (GtkWidget *parent, GTK_DIALOG_DESTROY_WITH_PARENT, message_type, buttons_type, + "%s", string); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); @@ -447,12 +448,14 @@ glade_util_gtk_combo_find (GtkCombo * combo) 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 @@ glade_util_gtk_combo_find (GtkCombo * combo) 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; } diff --git a/src/glade-window.c b/src/glade-window.c index f7c6018e..55ce8617 100644 --- a/src/glade-window.c +++ b/src/glade-window.c @@ -1356,6 +1356,7 @@ confirm_close_project (GladeWindow *window, GladeProject *project) GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, + "%s", msg); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); |