From: Stu T. <nos...@us...> - 2004-11-10 17:08:41
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4750/src Modified Files: gtkdialogs.c gtkpounce.c gtkprefs.c Log Message: Some stuff - fix a crash removing chats from the buddy list, escape aliases in buddy pounce popups and the state notifications from the state notify plugin, and fix a corner-case crash in smiley theme sorting. Index: gtkdialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -p -r1.20 -r1.21 --- gtkdialogs.c 4 Nov 2004 03:39:29 -0000 1.20 +++ gtkdialogs.c 10 Nov 2004 17:08:32 -0000 1.21 @@ -870,15 +870,18 @@ static void gaim_gtkdialogs_remove_chat_cb(GaimChat *chat) { char *name = NULL; + GaimAccount *account; GaimConversation *conv = NULL; - if (GAIM_PLUGIN_PROTOCOL_INFO(chat->account->gc->prpl)->get_chat_name != NULL) - name = GAIM_PLUGIN_PROTOCOL_INFO(chat->account->gc->prpl)->get_chat_name(chat->components); + account = chat->account; + + if (GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl)->get_chat_name != NULL) + name = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl)->get_chat_name(chat->components); gaim_blist_remove_chat(chat); if (name != NULL) { - conv = gaim_find_conversation_with_account(name, chat->account); + conv = gaim_find_conversation_with_account(name, account); g_free(name); } Index: gtkpounce.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkpounce.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -p -r1.61 -r1.62 --- gtkpounce.c 4 Sep 2004 04:27:05 -0000 1.61 +++ gtkpounce.c 10 Nov 2004 17:08:32 -0000 1.62 @@ -949,6 +949,9 @@ pounce_cb(GaimPounce *pounce, GaimPounce { char tmp[1024]; const char *name_shown; + char *escaped; + + escaped = g_markup_escape_text(alias, -1); /* * Here we place the protocol name in the pounce dialog to lessen @@ -972,7 +975,9 @@ pounce_cb(GaimPounce *pounce, GaimPounce (events & GAIM_POUNCE_AWAY) ? _("%s has gone away. (%s)") : _("Unknown pounce event. Please report this!"), - alias, gaim_account_get_protocol_name(account)); + escaped, gaim_account_get_protocol_name(account)); + + g_free(escaped); /* * Ok here is where I change the second argument, title, from Index: gtkprefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v retrieving revision 1.223 retrieving revision 1.224 diff -u -d -p -r1.223 -r1.224 --- gtkprefs.c 9 Nov 2004 05:36:06 -0000 1.223 +++ gtkprefs.c 10 Nov 2004 17:08:32 -0000 1.224 @@ -608,8 +608,11 @@ gint gaim_sort_smileys (GtkTreeModel *mo if (!(name1 == NULL && name2 == NULL)) ret = (name1 == NULL) ? -1: 1; } else if (!g_ascii_strcasecmp(name1, "none")) { - /* Sort name1 first */ - ret = -1; + if (!g_utf8_collate(name1, name2)) + ret = 0; + else + /* Sort name1 first */ + ret = -1; } else if (!g_ascii_strcasecmp(name2, "none")) { /* Sort name2 first */ ret = 1; |