# HG changeset patch # User Sadrul Habib Chowdhury # Date 1187389403 0 # Node ID 5126f14002f91afa6c0115d5cdd413cc2fd9eb43 # Parent 94635ef0d77239181f5b3728efb5483ec295ea22# Parent 8c51298db0ecc9af37c99d66efa5998758c0a32b merge of '5ac4a244750e0ddba3491a50086e9bb40bf9b732' and 'a7aa5622449cad90613e0d0a441aead98a4483f3' diff -r 94635ef0d772 -r 5126f14002f9 COPYRIGHT --- a/COPYRIGHT Fri Aug 17 20:04:44 2007 +0000 +++ b/COPYRIGHT Fri Aug 17 22:23:23 2007 +0000 @@ -301,6 +301,7 @@ Luciano Miguel Ferreira Rocha Andrew Rodland Miguel Rodríguez (migrax) +Bob Rossi Jason Roth Jean-Francois Roy Sam S. diff -r 94635ef0d772 -r 5126f14002f9 ChangeLog --- a/ChangeLog Fri Aug 17 20:04:44 2007 +0000 +++ b/ChangeLog Fri Aug 17 22:23:23 2007 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.1.1 (??/??/????): +version 2.1.1 (08/17/2007): Yahoo: * Added an account action to open your inbox in the yahoo prpl. * Added support for Unicode status messages in Yahoo. @@ -12,6 +12,10 @@ * Bonjour plugin uses native Avahi instead of Howl * Bonjour plugin supports Buddy Icons + XMPP: + * Only report conversation close when 'send typing notifications' + preference is turned on (Bob Rossi) + Pidgin: * Show current outgoing conversation formatting on the font label on the toolbar diff -r 94635ef0d772 -r 5126f14002f9 NEWS --- a/NEWS Fri Aug 17 20:04:44 2007 +0000 +++ b/NEWS Fri Aug 17 22:23:23 2007 +0000 @@ -1,6 +1,12 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul 2.1.1 (8/17/2007): + Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1 + is out. In it, we've addressed a lot of UI issues from our + experimental new changes introduced in 2.1.0, and gave a lot of + attention to Yahoo! and Bonjour. Thanks to everyone who + contributed. + Luke: We have reworked some parts of the conversation windows in response to user comments. We did not quite reach 100 tickets closed this release, so a fair few will role over again. Still, diff -r 94635ef0d772 -r 5126f14002f9 libpurple/protocols/jabber/message.c --- a/libpurple/protocols/jabber/message.c Fri Aug 17 20:04:44 2007 +0000 +++ b/libpurple/protocols/jabber/message.c Fri Aug 17 22:23:23 2007 +0000 @@ -675,7 +675,11 @@ void jabber_message_conv_closed(JabberStream *js, const char *who) { - JabberMessage *jm = g_new0(JabberMessage, 1); + JabberMessage *jm; + if (!purple_prefs_get_bool("/purple/conversations/im/send_typing")) + return; + + jm = g_new0(JabberMessage, 1); jm->js = js; jm->type = JABBER_MESSAGE_CHAT; jm->to = g_strdup(who); diff -r 94635ef0d772 -r 5126f14002f9 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/gtkconv.c Fri Aug 17 22:23:23 2007 +0000 @@ -8497,7 +8497,7 @@ gtk_notebook_set_scrollable(GTK_NOTEBOOK(win->notebook), TRUE); gtk_notebook_popup_enable(GTK_NOTEBOOK(win->notebook)); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), FALSE); - gtk_notebook_set_show_border(GTK_NOTEBOOK(win->notebook), FALSE); + gtk_notebook_set_show_border(GTK_NOTEBOOK(win->notebook), TRUE); g_signal_connect(G_OBJECT(win->notebook), "button-press-event", G_CALLBACK(right_click_menu_cb), win); @@ -8783,8 +8783,6 @@ gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); #endif gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby); - g_signal_connect(G_OBJECT(ebox), "button-press-event", - G_CALLBACK(alias_double_click_cb), gtkconv); if (gtkconv->tab_label->parent == NULL) { /* Pack if it's a new widget */ diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pidginstock.c --- a/pidgin/pidginstock.c Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pidginstock.c Fri Aug 17 22:23:23 2007 +0000 @@ -108,8 +108,8 @@ { PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL }, { PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I }, - { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, - { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE , NULL }, + { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL }, + { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL }, { PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I }, { PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_STATUS_MESSAGE, "toolbar", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/emotes/default/24/Makefile.am --- a/pidgin/pixmaps/emotes/default/24/Makefile.am Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/24/Makefile.am Fri Aug 17 22:23:23 2007 +0000 @@ -42,6 +42,7 @@ curl-lip.png \ curse.png \ cute.png \ + cyclops.png \ dance.png \ dazed.png \ desire.png \ diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/emotes/default/24/cyclops.png Binary file pidgin/pixmaps/emotes/default/24/cyclops.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/emotes/default/24/default.theme.in --- a/pidgin/pixmaps/emotes/default/24/default.theme.in Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Fri Aug 17 22:23:23 2007 +0000 @@ -24,7 +24,7 @@ shout.png >:o >:O ! skywalker.png C:-) c:-) C:) c:) ! monkey.png :-(|) :(|) - +! cyclops.png O-) o-) # Following AIM 6.1 [AIM] diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/emotes/default/24/scalable/Makefile.am --- a/pidgin/pixmaps/emotes/default/24/scalable/Makefile.am Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/24/scalable/Makefile.am Fri Aug 17 22:23:23 2007 +0000 @@ -40,6 +40,7 @@ curl-lip.svg \ curse.svg \ cute.svg \ + cyclops.svg \ dance.svg \ dazed.svg \ desire.svg \ diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/emotes/default/24/scalable/cyclops.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/24/scalable/cyclops.svg Fri Aug 17 22:23:23 2007 +0000 @@ -0,0 +1,440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/away.png Binary file pidgin/pixmaps/status/16/away.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/log-in.png Binary file pidgin/pixmaps/status/16/log-in.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/log-out.png Binary file pidgin/pixmaps/status/16/log-out.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/rtl/Makefile.am --- a/pidgin/pixmaps/status/16/rtl/Makefile.am Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pixmaps/status/16/rtl/Makefile.am Fri Aug 17 22:23:23 2007 +0000 @@ -1,4 +1,4 @@ -EXTRA_DIST = extended-away.png +EXTRA_DIST = extended-away.png log-in.png log-out.png pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/16/rtl diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/rtl/log-in.png Binary file pidgin/pixmaps/status/16/rtl/log-in.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/rtl/log-out.png Binary file pidgin/pixmaps/status/16/rtl/log-out.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/16/scalable/away.svg --- a/pidgin/pixmaps/status/16/scalable/away.svg Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pixmaps/status/16/scalable/away.svg Fri Aug 17 22:23:23 2007 +0000 @@ -18,7 +18,7 @@ inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/16/available16.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docbase="/home/hbons/Desktop/experiment/status/16/scalable" + sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/status/16/scalable" sodipodi:docname="away.svg"> @@ -122,7 +122,7 @@ showgrid="true" fill="#eeeeec" inkscape:window-width="1434" - inkscape:window-height="844" + inkscape:window-height="840" inkscape:window-x="0" inkscape:window-y="0" inkscape:object-paths="false" @@ -186,7 +186,7 @@ transform="matrix(0.383404,0,0,0.383404,2.022641,1.646167)" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/22/scalable/sign-on.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/scalable/sign-on.svg Fri Aug 17 22:23:23 2007 +0000 @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/32/log-in.png Binary file pidgin/pixmaps/status/32/log-in.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/32/log-out.png Binary file pidgin/pixmaps/status/32/log-out.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/32/rtl/Makefile.am --- a/pidgin/pixmaps/status/32/rtl/Makefile.am Fri Aug 17 20:04:44 2007 +0000 +++ b/pidgin/pixmaps/status/32/rtl/Makefile.am Fri Aug 17 22:23:23 2007 +0000 @@ -1,4 +1,4 @@ -EXTRA_DIST = extended-away.png +EXTRA_DIST = extended-away.png log-in.png log-out.png pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/32/rtl diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/32/rtl/log-in.png Binary file pidgin/pixmaps/status/32/rtl/log-in.png has changed diff -r 94635ef0d772 -r 5126f14002f9 pidgin/pixmaps/status/32/rtl/log-out.png Binary file pidgin/pixmaps/status/32/rtl/log-out.png has changed