# HG changeset patch # User Yoshiki Yazawa # Date 1184131570 0 # Node ID 1e92ac5586d9566822c3a13e6926d762e23e9d64 # Parent d4eebb5c3dbb1a75f45cf621045ed71dcc513790# Parent 58aeac6930faab0e7a5b1016b7da64940ffc7d77 propagate from branch 'im.pidgin.pidgin' (head b195e262642015df66e36d33e9dd16ecae5df9d5) to branch 'im.pidgin.pidgin.yaz' (head 1ad0829f976f1cce3dce20aa96a958e97caaa748) diff -r d4eebb5c3dbb -r 1e92ac5586d9 finch/gntdebug.c --- a/finch/gntdebug.c Mon Jul 09 06:14:27 2007 +0000 +++ b/finch/gntdebug.c Wed Jul 11 05:26:10 2007 +0000 @@ -302,7 +302,8 @@ REGISTER_G_LOG_HANDLER("GThread"); g_set_print_handler(print_stderr); /* Redirect the debug messages to stderr */ - g_set_printerr_handler(suppress_error_messages); + if (!purple_debug_is_enabled()) + g_set_printerr_handler(suppress_error_messages); purple_prefs_add_none(PREF_ROOT); purple_prefs_add_string(PREF_ROOT "/filter", ""); diff -r d4eebb5c3dbb -r 1e92ac5586d9 finch/libgnt/gntwm.c --- a/finch/libgnt/gntwm.c Mon Jul 09 06:14:27 2007 +0000 +++ b/finch/libgnt/gntwm.c Wed Jul 11 05:26:10 2007 +0000 @@ -1918,8 +1918,11 @@ while (widget->parent) widget = widget->parent; - if (!GNT_IS_MENU(widget)) + if (!GNT_IS_MENU(widget)) { + if (!GNT_IS_BOX(widget)) + return; gnt_box_sync_children(GNT_BOX(widget)); + } ws = gnt_wm_widget_find_workspace(wm, widget); node = g_hash_table_lookup(wm->nodes, widget); @@ -1932,7 +1935,7 @@ gnt_wm_copy_win(widget, node); update_screen(wm); gnt_ws_draw_taskbar(wm->cws, FALSE); - } else if (ws != wm->cws && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT)) { + } else if (ws && ws != wm->cws && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT)) { if (!act || (act && !g_list_find(act, ws))) act = g_list_prepend(act, ws); update_act_msg(); diff -r d4eebb5c3dbb -r 1e92ac5586d9 libpurple/blist.h --- a/libpurple/blist.h Mon Jul 09 06:14:27 2007 +0000 +++ b/libpurple/blist.h Wed Jul 11 05:26:10 2007 +0000 @@ -635,7 +635,7 @@ /** * Finds a group by name * - * @param name The groups name + * @param name The group's name * @return The group or NULL if the group does not exist */ PurpleGroup *purple_find_group(const char *name); diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/eggtrayicon.c --- a/pidgin/eggtrayicon.c Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/eggtrayicon.c Wed Jul 11 05:26:10 2007 +0000 @@ -543,7 +543,7 @@ xdisplay = egg_tray_icon_get_x_display(icon); if (xdisplay == NULL) - return; + return 0; ev.type = ClientMessage; ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/gtkaccount.c Wed Jul 11 05:26:10 2007 +0000 @@ -2088,7 +2088,6 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook),1); set_account(accounts_window->model, &iter, account, global_buddyicon); - gtk_window_present(GTK_WINDOW(pidgin_blist_get_default_gtk_blist()->window)); } static gboolean diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/gtkconv.c Wed Jul 11 05:26:10 2007 +0000 @@ -188,7 +188,6 @@ static void pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields); static void focus_out_from_menubar(GtkWidget *wid, PidginWindow *win); static void pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv); -static gboolean infopane_release_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv); static gboolean infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv); static GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name) { @@ -4439,8 +4438,6 @@ GDK_BUTTON1_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); g_signal_connect(G_OBJECT(event_box), "button_press_event", G_CALLBACK(infopane_press_cb), gtkconv); - g_signal_connect(G_OBJECT(event_box), "button_release_event", - G_CALLBACK(infopane_release_cb), gtkconv); gtkconv->infopane = gtk_cell_view_new(); @@ -7807,12 +7804,6 @@ } static gboolean -infopane_release_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkconv) -{ - return FALSE; -} - -static gboolean notebook_release_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win) { PidginWindow *dest_win; diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/gtkutils.c --- a/pidgin/gtkutils.c Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/gtkutils.c Wed Jul 11 05:26:10 2007 +0000 @@ -676,6 +676,12 @@ return aop_option_menu_new(create_protocols_menu(id), cb, user_data); } +const char * +pidgin_protocol_option_menu_get_selected(GtkWidget *optmenu) +{ + return (const char *)aop_option_menu_get_selected(optmenu, NULL); +} + PurpleAccount * pidgin_account_option_menu_get_selected(GtkWidget *optmenu) { diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/gtkutils.h --- a/pidgin/gtkutils.h Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/gtkutils.h Wed Jul 11 05:26:10 2007 +0000 @@ -236,6 +236,15 @@ gpointer user_data); /** + * Gets the currently selected protocol from a protocol drop down box. + * + * @param optmenu The drop-down option menu created by + * pidgin_account_option_menu_new. + * @return Returns the protocol ID that is currently selected. + */ +const char *pidgin_protocol_option_menu_get_selected(GtkWidget *optmenu); + +/** * Creates a drop-down option menu filled with accounts. * * @param default_account The account to select by default. @@ -255,7 +264,7 @@ /** * Gets the currently selected account from an account drop down box. * - * @param optmenu The GtkOptionMenu created by + * @param optmenu The drop-down option menu created by * pidgin_account_option_menu_new. * @return Returns the PurpleAccount that is currently selected. */ diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/edit.png Binary file pidgin/pixmaps/edit.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emblems/16/aol-client.png Binary file pidgin/pixmaps/emblems/16/aol-client.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emblems/16/blocked.png Binary file pidgin/pixmaps/emblems/16/blocked.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emblems/16/scalable/aol-client.svg --- a/pidgin/pixmaps/emblems/16/scalable/aol-client.svg Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/aol-client.svg Wed Jul 11 05:26:10 2007 +0000 @@ -6,16 +6,16 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" height="16px" id="svg1307" sodipodi:version="0.32" - inkscape:version="0.43" - sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emblems" + inkscape:version="0.44.1" + sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0/emblems/16/scalable" sodipodi:docname="aol-client.svg" - inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emblems/aol-client.png" + inkscape:export-filename="/home/hbons/Desktop/aol-client.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + inkscape:window-y="0" /> @@ -58,24 +58,8 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> - - + d="M 2 1 L 2 15 L 14 8 L 2 1 z M 6 4 C 8.1805207 4 10 5.7762679 10 8 C 10 10.223732 8.1805205 12 6 12 C 3.8194795 11.999999 2.0312501 10.223732 2.03125 8 C 2.03125 5.7762679 3.8194791 4.0000001 6 4 z M 6 5.125 C 4.3921597 5.125 3.1249999 6.4360487 3.125 8 C 3.125 9.5639514 4.3921593 10.84375 6 10.84375 C 7.6078403 10.84375 8.875 9.5639514 8.875 8 C 8.875 6.4360487 7.6078401 5.1249999 6 5.125 z " + id="rect2229" /> diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emblems/16/scalable/blocked.svg --- a/pidgin/pixmaps/emblems/16/scalable/blocked.svg Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/blocked.svg Wed Jul 11 05:26:10 2007 +0000 @@ -7,63 +7,154 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16" - height="16" - id="svg2" + width="16px" + height="16px" + id="svg4220" sodipodi:version="0.32" - inkscape:version="0.43" - version="1.0" - sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emblems" - sodipodi:docname="blocked.svg" - inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emblems/blocked.png" + inkscape:version="0.44.1" + sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0/toolbars/16/scalable" + sodipodi:docname="block.svg" + inkscape:export-filename="/home/hbons/Desktop/block.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + id="defs4222"> + id="linearGradient2835"> + id="stop2837" /> + id="stop2839" /> + + + + + + + + + + + + + + + - - - + xlink:href="#linearGradient2241" + id="linearGradient2816" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.669301,0,0,0.866653,-15.19698,-2.399762)" + x1="19.003813" + y1="9.3585329" + x2="15.520383" + y2="14.406374" /> + + + + xlink:href="#linearGradient2835" + id="linearGradient2847" + gradientUnits="userSpaceOnUse" + x1="4.4093828" + y1="8.8709669" + x2="5.0730915" + y2="6.2707229" + gradientTransform="translate(4.490962,-16.76051)" /> + inkscape:guide-bbox="true" /> + id="metadata4225"> @@ -97,21 +190,61 @@ - + inkscape:groupmode="layer"> + + + sodipodi:type="arc" + style="fill:#fecb81;fill-opacity:1;stroke:none;stroke-width:2.03035927;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path2215" + sodipodi:cx="17.607706" + sodipodi:cy="10.679387" + sodipodi:rx="0.80383009" + sodipodi:ry="0.80383009" + d="M 18.411536 10.679387 A 0.80383009 0.80383009 0 1 1 16.803876,10.679387 A 0.80383009 0.80383009 0 1 1 18.411536 10.679387 z" + transform="matrix(-1.244046,0,0,1.245728,26.90479,-6.302258)" /> + + + diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emotes/default/22/at-wits-end.png Binary file pidgin/pixmaps/emotes/default/22/at-wits-end.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emotes/default/22/female-fighter.png Binary file pidgin/pixmaps/emotes/default/22/female-fighter.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emotes/default/22/on-the-phone.png Binary file pidgin/pixmaps/emotes/default/22/on-the-phone.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emotes/default/22/scalable/smile-big.svg --- a/pidgin/pixmaps/emotes/default/22/scalable/smile-big.svg Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/smile-big.svg Wed Jul 11 05:26:10 2007 +0000 @@ -7,23 +7,47 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" id="svg2" sodipodi:version="0.32" - inkscape:version="0.43" + inkscape:version="0.44.1" version="1.0" - sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emotes" - sodipodi:docname="face-smile-big.svg" - inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/face-smile-big.png" + sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0" + sodipodi:docname="smile-big.svg" + inkscape:export-filename="/home/hbons/Desktop/smile-big.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + + + + + + + + + + + + inkscape:window-width="1434" + inkscape:window-height="841" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:grid-points="true" /> @@ -163,25 +216,15 @@ d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1 1.8309021,10.983024 A 9.975256 9.975256 0 1 1 21.781414 10.983024 z" transform="matrix(0.8019,0,0,0.801938,2.532654,3.191833)" /> - - + transform="matrix(0.852176,0,0,0.852216,1.939749,2.639019)" /> + style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#f57900;stroke-width:0.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 4.4999974,13.499993 C 4.4999974,17.423224 8.1971909,20.499996 11.999997,20.499996 C 15.802804,20.499996 19.499997,17.538156 19.499997,13.499993 L 4.4999974,13.499993 z " + id="path2785" + sodipodi:nodetypes="cscc" /> + + + + diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emotes/default/22/smile-big.png Binary file pidgin/pixmaps/emotes/default/22/smile-big.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/emotes/default/22/time-out.png Binary file pidgin/pixmaps/emotes/default/22/time-out.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/icons/16/scalable/pidgin.svg --- a/pidgin/pixmaps/icons/16/scalable/pidgin.svg Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/pixmaps/icons/16/scalable/pidgin.svg Wed Jul 11 05:26:10 2007 +0000 @@ -664,8 +664,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="30.009658" - inkscape:cx="12.410351" - inkscape:cy="9.6914614" + inkscape:cx="15.476031" + inkscape:cy="9.174961" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" @@ -743,7 +743,7 @@ sodipodi:rx="1.2410715" sodipodi:ry="1.2946428" d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1 8.928571,24.3125 A 1.2410715 1.2946428 0 1 1 11.410714 24.3125 z" - transform="matrix(1.208634,0,0,1.158623,-8.791372,-20.66902)" /> + transform="matrix(0.805757,0,0,1.158623,-4.194263,-20.66902)" /> + transform="matrix(0.805754,0,0,1.158626,0.805772,-20.66909)" /> + y2="43.206608" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.660903,0,0,0.627207,-0.293224,-4.361383)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.660903,0,0,0.627207,-0.293224,-4.361383)" /> + y2="43.249905" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.67692,0,0,0.646801,-0.560381,-4.949693)" /> + y2="43.105652" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.67692,0,0,0.646801,-0.560381,-4.949693)" /> + - - + sodipodi:nodetypes="ccccszcsc" /> + transform="matrix(1.208633,0,0,1.158621,-5.825637,-16.66897)" /> - + transform="matrix(1.153827,0,0,1.158621,4.558885,-16.66895)" /> diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/pixmaps/toolbar/16/unblock.png Binary file pidgin/pixmaps/toolbar/16/unblock.png has changed diff -r d4eebb5c3dbb -r 1e92ac5586d9 pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi Mon Jul 09 06:14:27 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed Jul 11 05:26:10 2007 +0000 @@ -1168,6 +1168,35 @@ ;Preselect the URI handlers as appropriate Call SelectURIHandlerSelections + ;Preselect the "shortcuts" checkboxes according to the previous installation + ClearErrors + ;Make sure that there was a previous installation + ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "Installer Language" + IfErrors done_preselecting_shortcuts + ;Does the Desktop shortcut exist? + GetFileTime "$DESKTOP\Pidgin.lnk" $R0 $R0 + IfErrors +1 +4 + ClearErrors + SetShellVarContext "all" + GetFileTime "$DESKTOP\Pidgin.lnk" $R0 $R0 + IfErrors preselect_startmenu_shortcut ;Desktop Shortcut if off by default + !insertmacro SelectSection ${SecDesktopShortcut} + preselect_startmenu_shortcut: + ;Reset ShellVarContext because we may have changed it + SetShellVarContext "current" + ClearErrors + ;Does the StartMenu shortcut exist? + GetFileTime "$SMPROGRAMS\Pidgin.lnk" $R0 $R0 + IfErrors +1 done_preselecting_shortcuts ;StartMenu Shortcut is on by default + ClearErrors + SetShellVarContext "all" + GetFileTime "$SMPROGRAMS\Pidgin.lnk" $R0 $R0 + IfErrors +1 done_preselecting_shortcuts ;StartMenu Shortcut is on by default + !insertmacro UnselectSection ${SecStartMenuShortcut} + done_preselecting_shortcuts: + ;Reset ShellVarContext because we may have changed it + SetShellVarContext "current" + StrCpy $ISSILENT "/NOUI" ; GTK installer has two silent states.. one with Message boxes, one without @@ -1305,7 +1334,7 @@ !ifndef WITH_GTK ; If this installer dosn't have GTK, check whether we need it. - ; We do this here an not in .onInit because language change in + ; We do this here and not in .onInit because language change in ; .onInit doesn't take effect until it is finished. Call DoWeNeedGtk Pop $R0