Mercurial > pidgin
changeset 23284:af23a35234b9
merge of '5e69fb5f354ed74d6deb6f4d1f6aff46afd8a072'
and '6560ae1eff40239f99f3ea8c8e93c28572295399'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 04 Jun 2008 22:50:40 +0000 |
| parents | ea998456c3bd (diff) a601807bae2b (current diff) |
| children | eb27ae817284 |
| files | |
| diffstat | 9 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c Wed Jun 04 22:49:23 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Wed Jun 04 22:50:40 2008 +0000 @@ -777,6 +777,7 @@ list = g_slist_append(list, im); im->from = pair->value; im->time = time(NULL); + im->utf8 = TRUE; } if (pair->key == 97) if (im)
--- a/pidgin/gtkblist.c Wed Jun 04 22:49:23 2008 +0000 +++ b/pidgin/gtkblist.c Wed Jun 04 22:50:40 2008 +0000 @@ -3270,7 +3270,7 @@ { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, + { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL }, { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
--- a/pidgin/gtkconv.c Wed Jun 04 22:49:23 2008 +0000 +++ b/pidgin/gtkconv.c Wed Jun 04 22:50:40 2008 +0000 @@ -3156,7 +3156,8 @@ PurpleAccount *account = purple_conversation_get_account(conv); PurplePlugin *prpl = purple_find_prpl(purple_account_get_protocol_id(account)); PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); - if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_info_defaults)) { + if (purple_account_get_connection(account) != NULL && + PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_info_defaults)) { components = prpl_info->chat_info_defaults(purple_account_get_connection(account), purple_conversation_get_name(conv)); } else {
--- a/pidgin/pidginstock.c Wed Jun 04 22:49:23 2008 +0000 +++ b/pidgin/pidginstock.c Wed Jun 04 22:50:40 2008 +0000 @@ -168,6 +168,7 @@ { PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, + { PIDGIN_STOCK_TOOLBAR_TRANSFER, "toolbar", "transfer.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
--- a/pidgin/pidginstock.h Wed Jun 04 22:49:23 2008 +0000 +++ b/pidgin/pidginstock.h Wed Jun 04 22:50:40 2008 +0000 @@ -129,6 +129,7 @@ #define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock" #define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar" #define PIDGIN_STOCK_TOOLBAR_SEND_FILE "pidgin-send-file" +#define PIDGIN_STOCK_TOOLBAR_TRANSFER "pidgin-transfer" /* Tray icons */ #define PIDGIN_STOCK_TRAY_AVAILABLE "pidgin-tray-available"
--- a/pidgin/pixmaps/Makefile.am Wed Jun 04 22:49:23 2008 +0000 +++ b/pidgin/pixmaps/Makefile.am Wed Jun 04 22:50:40 2008 +0000 @@ -565,6 +565,7 @@ toolbar/16/message-new.png \ toolbar/16/plugins.png \ toolbar/16/send-file.png \ + toolbar/16/transfer.png \ toolbar/16/unblock.png TOOLBAR_22_SCALABLE = \
--- a/po/en_AU.po Wed Jun 04 22:49:23 2008 +0000 +++ b/po/en_AU.po Wed Jun 04 22:50:40 2008 +0000 @@ -14896,7 +14896,7 @@ msgid "%d person in room" msgid_plural "%d people in room" msgstr[0] "%d person in room" -msgstr[1] "%d person in room" +msgstr[1] "%d people in room" #: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660 #, fuzzy