Mercurial > pidgin.yaz
diff pidgin/gtkprefs.c @ 20407:1122d47583a1
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e'
to branch 'im.pidgin.cpw.khc.msnp14'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 02 May 2007 05:25:27 +0000 |
parents | 0973688f4b74 |
children | 4999bbc52881 be098f796b32 |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Sun Apr 15 20:12:06 2007 +0000 +++ b/pidgin/gtkprefs.c Wed May 02 05:25:27 2007 +0000 @@ -1,6 +1,6 @@ /** * @file gtkprefs.c GTK+ Preferences - * @ingroup gtkui + * @ingroup pidgin * * pidgin * @@ -415,7 +415,7 @@ gtk_tree_row_reference_free(previous_smiley_row); previous_smiley_row = NULL; - pidginthemes_smiley_theme_probe(); + pidgin_themes_smiley_theme_probe(); if (!(themes = smiley_themes)) return NULL; @@ -610,7 +610,7 @@ ret = 1; } else { /* Neither string is "none", default to normal sort */ - ret = g_utf8_collate(name1,name2); + ret = purple_utf8_strcasecmp(name1,name2); } g_free(name1); @@ -925,7 +925,7 @@ vbox = pidgin_make_frame(ret, _("Default Formatting")); frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL); - gtk_widget_set_name(imhtml, "pidginprefs_font_imhtml"); + gtk_widget_set_name(imhtml, "pidgin_prefs_font_imhtml"); gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE); gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_BOLD | @@ -2018,7 +2018,7 @@ for (themes = smiley_themes; themes; themes = themes->next) { struct smiley_theme *smile = themes->data; if (smile->name && strcmp(themename, smile->name) == 0) { - pidginthemes_load_smiley_theme(smile->path, TRUE); + pidgin_themes_load_smiley_theme(smile->path, TRUE); break; } }