Mercurial > pidgin
changeset 16521:ff7a7fe88049
merge of '66dbfed4928f15efc83fab8cd71b27c9ee2670f6'
and 'db5f4be77a5427a5c673de8b2d6babfff06b3f9d'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 27 Apr 2007 14:37:15 +0000 |
| parents | e340dc515178 (current diff) e7d820a42bf8 (diff) |
| children | 0b49b01e9482 fe6fd0568d04 |
| files | |
| diffstat | 11 files changed, 134 insertions(+), 153 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntwm.c Fri Apr 27 14:36:42 2007 +0000 +++ b/finch/libgnt/gntwm.c Fri Apr 27 14:37:15 2007 +0000 @@ -905,6 +905,32 @@ return FALSE; } +static gboolean +toggle_clipboard(GntBindable *bindable, GList *n) +{ + static GntWidget *clip; + gchar *text; + int maxx, maxy; + if (clip) { + gnt_widget_destroy(clip); + clip = NULL; + return TRUE; + } + getmaxyx(stdscr, maxy, maxx); + text = gnt_get_clipboard_string(); + clip = gnt_hwindow_new(FALSE); + GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT); + GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER); + gnt_box_set_pad(GNT_BOX(clip), 0); + gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" ")); + gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text)); + gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" ")); + gnt_widget_set_position(clip, 0, 0); + gnt_widget_draw(clip); + g_free(text); + return TRUE; +} + static void gnt_wm_class_init(GntWMClass *klass) { @@ -1039,6 +1065,8 @@ "\033" GNT_KEY_CTRL_K, NULL); gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "help-for-widget", help_for_widget, "\033" "/", NULL); + gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-clipboard", + toggle_clipboard, "\033" "C", NULL); gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
--- a/finch/libgnt/wms/s.c Fri Apr 27 14:36:42 2007 +0000 +++ b/finch/libgnt/wms/s.c Fri Apr 27 14:37:15 2007 +0000 @@ -168,32 +168,6 @@ return TRUE; } -static gboolean -toggle_clipboard(GntBindable *bindable, GList *n) -{ - static GntWidget *clip; - gchar *text; - int maxx, maxy; - if (clip) { - gnt_widget_destroy(clip); - clip = NULL; - return TRUE; - } - getmaxyx(stdscr, maxy, maxx); - text = gnt_get_clipboard_string(); - clip = gnt_hwindow_new(FALSE); - GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT); - GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER); - gnt_box_set_pad(GNT_BOX(clip), 0); - gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" ")); - gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text)); - gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" ")); - gnt_widget_set_position(clip, 0, 0); - gnt_widget_draw(clip); - g_free(text); - return TRUE; -} - static void s_class_init(SClass *klass) { @@ -208,8 +182,6 @@ gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-buddylist", toggle_buddylist, "\033" "b", NULL); - gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-clipboard", - toggle_clipboard, "\033" "C", NULL); gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass)); GNTDEBUG; }
--- a/libpurple/blist.c Fri Apr 27 14:36:42 2007 +0000 +++ b/libpurple/blist.c Fri Apr 27 14:37:15 2007 +0000 @@ -2334,7 +2334,6 @@ buddy = (PurpleBuddy *)bnode; if (account == buddy->account) { PurplePresence *presence; - recompute = TRUE; presence = purple_buddy_get_presence(buddy); @@ -2354,8 +2353,14 @@ if (!g_list_find(list, presence)) list = g_list_prepend(list, presence); - if (ops && ops->remove) + if (contact->priority == buddy) + purple_contact_invalidate_priority_buddy(contact); + else + recompute = TRUE; + + if (ops && ops->remove) { ops->remove(purplebuddylist, bnode); + } } } if (recompute) {
--- a/libpurple/status.c Fri Apr 27 14:36:42 2007 +0000 +++ b/libpurple/status.c Fri Apr 27 14:37:15 2007 +0000 @@ -637,9 +637,6 @@ g_free(tmp); } - - if (ops != NULL && ops->update != NULL) - ops->update(purple_get_blist(), (PurpleBlistNode*)buddy); } static void
--- a/pidgin/pixmaps/emblems/16/scalable/secure.svg Fri Apr 27 14:36:42 2007 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/secure.svg Fri Apr 27 14:37:15 2007 +0000 @@ -7,96 +7,81 @@ 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/scalable" + inkscape:version="0.44.1" + sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/emblems/16/scalable" sodipodi:docname="secure.svg" - inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emblems/secure.png" + inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/emblems/16/secure.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <defs - id="defs4"> + id="defs4222"> <linearGradient inkscape:collect="always" - id="linearGradient2193"> - <stop - style="stop-color:#555753;stop-opacity:1;" - offset="0" - id="stop2195" /> - <stop - style="stop-color:#555753;stop-opacity:0;" - offset="1" - id="stop2197" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient2351"> + id="linearGradient5170"> <stop style="stop-color:#eeeeec;stop-opacity:1;" offset="0" - id="stop2353" /> + id="stop5172" /> <stop style="stop-color:#eeeeec;stop-opacity:0;" offset="1" - id="stop2355" /> + id="stop5174" /> + </linearGradient> + <linearGradient + id="linearGradient5160"> + <stop + style="stop-color:#c4a000;stop-opacity:1;" + offset="0" + id="stop5162" /> + <stop + style="stop-color:#c4a000;stop-opacity:0;" + offset="1" + id="stop5164" /> </linearGradient> <linearGradient inkscape:collect="always" - id="linearGradient2343"> + id="linearGradient5127"> <stop - style="stop-color:#babdb6;stop-opacity:1;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop2345" /> + id="stop5129" /> <stop - style="stop-color:#babdb6;stop-opacity:0;" + style="stop-color:white;stop-opacity:0;" offset="1" - id="stop2347" /> - </linearGradient> - <linearGradient - id="linearGradient2276"> - <stop - style="stop-color:#f57900;stop-opacity:1;" - offset="0" - id="stop2278" /> - <stop - style="stop-color:#fcaf3e;stop-opacity:1;" - offset="1" - id="stop2280" /> + id="stop5131" /> </linearGradient> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient2343" - id="linearGradient2349" - x1="12.515625" - y1="8.7261219" - x2="12.515625" - y2="0.68458056" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.661626,0,0,0.669831,0.220067,-0.15079)" /> + xlink:href="#linearGradient5127" + id="linearGradient5133" + x1="-8.5730524" + y1="8.1949167" + x2="-8.5730524" + y2="14.091002" + gradientUnits="userSpaceOnUse" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient2351" - id="linearGradient2357" - x1="12.488563" - y1="5.8544211" - x2="12.488563" - y2="19.066195" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.571617,0,0,0.664095,1.361509,-0.130758)" /> + xlink:href="#linearGradient5160" + id="linearGradient5166" + x1="-5.2575259" + y1="14.311456" + x2="-10.187596" + y2="11.560035" + gradientUnits="userSpaceOnUse" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient2193" - id="linearGradient2199" - x1="8.5" - y1="11.038469" - x2="8.5" - y2="13" + xlink:href="#linearGradient5170" + id="linearGradient5176" + x1="-7.5400991" + y1="0.79740471" + x2="-7.5400991" + y2="4.7783289" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview @@ -106,20 +91,21 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="39.000666" - inkscape:cx="12.56383" - inkscape:cy="9.2861054" - inkscape:document-units="px" + inkscape:zoom="22.197802" + inkscape:cx="8.5405941" + inkscape:cy="8.0965274" inkscape:current-layer="layer1" showgrid="true" - fill="#eeeeec" - inkscape:window-width="1268" - inkscape:window-height="972" - inkscape:window-x="6" - inkscape:window-y="21" - inkscape:grid-points="true" /> + inkscape:grid-bbox="true" + inkscape:document-units="px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="872" + inkscape:window-height="625" + inkscape:window-x="47" + inkscape:window-y="150" /> <metadata - id="metadata7"> + id="metadata4225"> <rdf:RDF> <cc:Work rdf:about=""> @@ -130,47 +116,46 @@ </rdf:RDF> </metadata> <g + id="layer1" inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <path - style="fill:url(#linearGradient2349);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 6.1333463,1.5028569 C 5.2074147,1.597488 4.4999578,2.402644 4.4999578,3.3658261 L 4.4999578,7.656935 C 4.4999578,8.6843293 5.3046208,9.4989715 6.3194286,9.4989715 L 10.661348,9.4989715 C 11.676156,9.4989715 12.501495,8.6843293 12.501495,7.656935 L 12.501495,3.3658261 C 12.501495,2.3384316 11.676156,1.5028569 10.661348,1.5028569 L 6.3194286,1.5028569 C 6.256003,1.5028569 6.1950751,1.496548 6.1333463,1.5028569 z M 7.2911913,3.5332839 C 7.3292999,3.5284078 7.3757891,3.5332839 7.4152465,3.5332839 L 9.5862055,3.5332839 C 9.8150574,3.5332839 10.026054,3.623525 10.185805,3.7635385 C 10.201979,3.7784151 10.232757,3.8103245 10.247831,3.8263353 C 10.272321,3.8536261 10.309391,3.9008527 10.330534,3.9309964 C 10.428638,4.0782548 10.49594,4.2625583 10.49594,4.4543024 L 10.49594,6.5893908 C 10.49594,7.1007088 10.091261,7.5104093 9.5862055,7.5104093 L 7.4152465,7.5104093 C 7.1232614,7.5104093 6.8582226,7.3694453 6.691593,7.1545613 C 6.5780448,7.000656 6.5055108,6.7971136 6.5055108,6.5893908 L 6.5055108,4.4543024 C 6.5055108,4.2625583 6.5728119,4.0782548 6.6709171,3.9309964 C 6.7301189,3.8465936 6.8149822,3.7606775 6.8983509,3.7007419 C 7.0135024,3.6221117 7.1463786,3.5518132 7.2911913,3.5332839 z " - id="rect1437" /> + inkscape:groupmode="layer"> <rect - style="fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.97247171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect1435" - width="10.030794" - height="8.0158854" - x="3.4845238" - y="6.4937477" - ry="2.1756756" - rx="2.1756771" /> + style="opacity:1;fill:#fce94f;fill-opacity:1;stroke:#c4a000;stroke-width:0.52907252;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4238" + width="5.7297029" + height="6.3509903" + x="-6" + y="6" + transform="matrix(2.268879,0,0,1.574557,15.11327,-3.947338)" + rx="0.44198585" + ry="0.60082906" /> <rect - style="opacity:0.4;fill:url(#linearGradient2357);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect2312" - width="8.0056992" - height="5.982585" - x="4.4973445" - y="7.5063467" - ry="1.1603612" - rx="1.1603615" /> + style="opacity:1;fill:url(#linearGradient5166);fill-opacity:1.0;stroke:url(#linearGradient5133);stroke-width:0.50402278;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5125" + width="5.6391087" + height="2.9732673" + x="-11" + y="10.458911" + transform="matrix(1.950662,0,0,2.017983,23.95729,-12.6059)" /> + <rect + style="opacity:0.56331877;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5156" + width="5.1252475" + height="2.6569307" + x="-14" + y="6" + transform="matrix(2.34135,0,0,0.752748,34.7789,1.48351)" /> <path - sodipodi:type="arc" - style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:0.86272454;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path2325" - sodipodi:cx="12.265541" - sodipodi:cy="14" - sodipodi:rx="0.73445857" - sodipodi:ry="1" - d="M 13 14 A 0.73445857 1 0 1 1 11.531083,14 A 0.73445857 1 0 1 1 13 14 z" - transform="matrix(2.042319,0,0,1.5,-16.55015,-11.5)" /> - <rect - style="fill:url(#linearGradient2199);fill-opacity:1.0;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect2333" - width="1" - height="3" - x="8" - y="10" /> + transform="translate(15,0)" + style="fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" + d="M -9.4188119,0.5 C -10.500938,0.5 -11.5,1.4812151 -11.5,2.4460396 L -11.5,7.5 L -9.5,7.5 L -9.4549505,4.0089109 C -9.4549505,2.4726571 -9.4588865,2.5 -8.1034653,2.5 L -5.9866337,2.5 C -4.4993176,2.5 -4.5,2.5177763 -4.5,4.0539604 L -4.5,7.5 L -2.5,7.5 L -2.5,2.4910891 C -2.5,1.6080661 -3.5388679,0.54504951 -4.4460396,0.54504951 L -9.4188119,0.5 z " + id="path5168" + sodipodi:nodetypes="ccccccccccccc" /> + <path + transform="translate(15,0)" + style="fill:url(#linearGradient5176);fill-opacity:1.0;stroke:#888a85;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" + d="M -9.4188119,0.5 C -10.500938,0.5 -11.5,1.4812151 -11.5,2.4460396 L -11.5,6.4638614 C -11.5,7.8729886 -9.5,7.6557806 -9.5,6.5089109 L -9.4549505,4.0089109 C -9.4549505,2.4726571 -9.4588865,2.5 -8.1034653,2.5 L -5.9866337,2.5 C -4.4993176,2.5 -4.5,2.5177763 -4.5,4.0539604 L -4.5,6.5539604 C -4.5450495,7.8163699 -2.5,7.594009 -2.5,6.5539604 L -2.5,2.4910891 C -2.5,1.6080661 -3.5388679,0.54504951 -4.4460396,0.54504951 L -9.4188119,0.5 z " + id="rect5149" + sodipodi:nodetypes="ccccccccccccc" /> </g> </svg>
--- a/pidgin/pixmaps/icons/32/scalable/pidgin.svg Fri Apr 27 14:36:42 2007 +0000 +++ b/pidgin/pixmaps/icons/32/scalable/pidgin.svg Fri Apr 27 14:37:15 2007 +0000 @@ -14,9 +14,9 @@ id="svg4345" sodipodi:version="0.32" inkscape:version="0.44.1" - sodipodi:docbase="/home/hbons/Desktop/icons/32/scalable" + sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/icons/32/scalable" sodipodi:docname="pidgin.svg" - inkscape:export-filename="/home/hbons/Desktop/pidgin32.png" + inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/icons/32/pidgin.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" version="1.0"> @@ -231,7 +231,7 @@ inkscape:pageshadow="2" inkscape:zoom="21.220032" inkscape:cx="25.558911" - inkscape:cy="16.938593" + inkscape:cy="16.91503" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" @@ -398,12 +398,6 @@ id="rect5189" sodipodi:nodetypes="cccc" /> <path - transform="matrix(0.798987,0,0,0.495994,22.79842,2.215302)" - style="fill:url(#linearGradient6569);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1" - d="M -0.99929609,42.004237 C 3.5188333,45.348102 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 6.1724645,45.375511 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z " - id="path6561" - sodipodi:nodetypes="czczc" /> - <path transform="matrix(0.798987,0,0,0.495994,8.99846,-1.319104)" style="fill:url(#linearGradient6823);fill-opacity:1.0;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1" d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "