Mercurial > pidgin

changeset 23945:60de5d1ee482

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '038d9d36d640ed83f9df5333d57dc0cd8b9ae847' and '9aeabc8056bc8b61f63881f3f6af2b2fcbd8b99c'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 21 Aug 2008 06:46:19 +0000
parents 7cb7bc8865af (diff) 54432ea0a5ab (current diff)
children 169c1451b7e5 0943e9c59a18
files
diffstat 20 files changed, 322 insertions(+), 227 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 21 06:40:00 2008 +0000
+++ b/ChangeLog	Thu Aug 21 06:46:19 2008 +0000
@@ -1,5 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.5.1 (??/??/????):
+	libpurple:
+	* In the Join/Part plugin, add the ability to apply the rules to
+	  buddies.  By default, joins and parts for buddies are still shown.
+
 version 2.5.0 (08/18/2008):
 	libpurple:
 	* Ability to create custom smileys (currently only the MSN protocol
--- a/configure.ac	Thu Aug 21 06:40:00 2008 +0000
+++ b/configure.ac	Thu Aug 21 06:46:19 2008 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [5])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [5])
-m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [1])
+m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -55,8 +55,8 @@
 m4_define([gnt_lt_current], [5])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [5])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_micro_version], [1])
+m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/libpurple/plugins/joinpart.c	Thu Aug 21 06:40:00 2008 +0000
+++ b/libpurple/plugins/joinpart.c	Thu Aug 21 06:46:19 2008 +0000
@@ -41,6 +41,10 @@
 #define THRESHOLD_PREF "/plugins/core/joinpart/threshold"
 #define THRESHOLD_DEFAULT 20
 
+/* Hide buddies */
+#define HIDE_BUDDIES_PREF "/plugins/core/joinpart/hide_buddies"
+#define HIDE_BUDDIES_DEFAULT FALSE
+
 struct joinpart_key
 {
 	PurpleConversation *conv;
@@ -89,8 +93,8 @@
 	if (g_list_length(purple_conv_chat_get_users(chat)) < threshold)
 		return FALSE;
 
-	/* We always care about our buddies! */
-	if (purple_find_buddy(purple_conversation_get_account(conv), name))
+	if (!purple_prefs_get_bool(HIDE_BUDDIES_PREF) &&
+	    purple_find_buddy(purple_conversation_get_account(conv), name))
 		return FALSE;
 
 	/* Only show the notice if the user has spoken recently. */
@@ -233,12 +237,15 @@
 	purple_plugin_pref_set_bounds(ppref, 0, 1000);
 	purple_plugin_pref_frame_add(frame, ppref);
 
-
 	ppref = purple_plugin_pref_new_with_name_and_label(DELAY_PREF,
 	                                                 _("User Inactivity Timeout (in minutes)"));
 	purple_plugin_pref_set_bounds(ppref, 0, 8 * 60); /* 8 Hours */
 	purple_plugin_pref_frame_add(frame, ppref);
 
+	ppref = purple_plugin_pref_new_with_name_and_label(HIDE_BUDDIES_PREF,
+	                                                 _("Apply hiding rules to buddies"));
+	purple_plugin_pref_frame_add(frame, ppref);
+
 	return frame;
 }
 
@@ -300,6 +307,7 @@
 
 	purple_prefs_add_int(DELAY_PREF, DELAY_DEFAULT);
 	purple_prefs_add_int(THRESHOLD_PREF, THRESHOLD_DEFAULT);
+	purple_prefs_add_bool(HIDE_BUDDIES_PREF, HIDE_BUDDIES_DEFAULT);
 }
 
 PURPLE_INIT_PLUGIN(joinpart, init_plugin, info)
--- a/libpurple/protocols/oscar/oscar.c	Thu Aug 21 06:40:00 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu Aug 21 06:46:19 2008 +0000
@@ -824,7 +824,7 @@
 				message = oscar_encoding_to_utf8(account, tmp, userinfo->away,
 												   userinfo->away_len);
 				g_free(tmp);
-				}
+			}
 		} else {
 			/* Available message? */
 			if ((userinfo->status != NULL) && userinfo->status[0] != '\0') {
@@ -881,7 +881,7 @@
 					status_name = NULL;
 
 				tmp = g_strdup_printf("%s%s%s",
-									   status_name,
+									   status_name ? status_name : "",
 									   ((status_name && message) && *message) ? ": " : "",
 									   (message && *message) ? message : "");
 				g_free(message);
@@ -2002,6 +2002,7 @@
 		char *message = NULL;
 		char *itmsurl = NULL;
 		char *tmp;
+		const char *tmp2;
 
 		if (info->status != NULL && info->status[0] != '\0')
 			/* Grab the available message */
@@ -2013,13 +2014,13 @@
 			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
 					info->itmsurl, info->itmsurl_len);
 
-		tmp = (message ? g_markup_escape_text(message, -1) : NULL);
-
-		if (message == NULL && itmsurl != NULL)
-			message = "";
+		tmp2 = tmp = (message ? g_markup_escape_text(message, -1) : NULL);
+
+		if (tmp2 == NULL && itmsurl != NULL)
+			tmp2 = "";
 
 		purple_prpl_got_user_status(account, info->sn, status_id,
-				"message", tmp, "itmsurl", itmsurl, NULL);
+				"message", tmp2, "itmsurl", itmsurl, NULL);
 		g_free(tmp);
 
 		g_free(message);
--- a/pidgin/gtkaccount.c	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/gtkaccount.c	Thu Aug 21 06:46:19 2008 +0000
@@ -2159,7 +2159,7 @@
 						 "press <b>Add</b> again to configure them all.\n\n"
 
 						 "You can come back to this window to add, edit, or remove "
-						 "accounts from <b>Accounts->Add/Edit</b> in the Buddy "
+						 "accounts from <b>Accounts->Manage Accounts</b> in the Buddy "
 						 "List window"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME);
 	pretty = pidgin_make_pretty_arrows(tmp);
 	g_free(tmp);
--- a/pidgin/pixmaps/tray/22/scalable/tray-away.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-away.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg11816"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -104,10 +104,10 @@
        xlink:href="#linearGradient29418"
        id="linearGradient12269"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.602334,-2.502468)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
     <linearGradient
        inkscape:collect="always"
@@ -117,7 +117,8 @@
        x1="11.531433"
        y1="2.0188477"
        x2="7.6475248"
-       y2="16.513792" />
+       y2="16.513792"
+       gradientTransform="translate(-0.9999999,-0.9999997)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3276"
@@ -187,17 +188,17 @@
   </metadata>
   <path
      id="path11012"
-     d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
-     style="display:block;fill:url(#linearGradient12269);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient12271);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;overflow:visible"
+     d="M 16.120074,1.4999997 C 16.911234,1.4999997 17.5,2.0785204 17.5,3.0031287 L 17.5,12.290965 C 17.5,12.958536 16.974302,13.487782 16.311203,13.487782 L 7.5609012,13.487782 C 7.0308789,14.189395 6.1533459,16.327271 3.6806889,17.274119 C 4.781573,15.971634 4.5012167,13.487782 4.5012167,13.487782 L 3.0268296,13.487782 C 2.3637331,13.487782 1.5000011,12.703698 1.4999997,12.036127 L 1.4999997,2.9394191 C 1.4999997,2.2718468 2.3000235,1.4999997 2.96312,1.4999997 L 16.120074,1.4999997 z"
+     style="fill:url(#linearGradient12269);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient12271);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
      sodipodi:nodetypes="cccccccccccc" />
   <path
      sodipodi:type="inkscape:offset"
      inkscape:radius="-1.0016589"
      inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
-     style="display:block;fill:url(#linearGradient11026);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.47738689000000001;visibility:visible;overflow:visible"
+     style="fill:url(#linearGradient11026);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.47738689;visibility:visible;display:block;overflow:visible"
      id="path11014"
      d="M 3.71875,4.5 C 3.610718,4.5 3.5,4.6069976 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.393002 3.6107192,14.5 3.71875,14.5 L 5.5,14.5 C 6.0066429,14.496818 6.4358999,14.872418 6.5,15.375 C 6.5,15.375 6.5221001,16.048002 6.5,16.71875 C 6.5166237,16.698497 6.5462133,16.676539 6.5625,16.65625 C 7.0808734,16.010479 7.3500532,15.435677 7.75,14.90625 C 7.9403413,14.648762 8.2423046,14.49778 8.5625,14.5 L 17.3125,14.5 C 17.420535,14.5 17.5,14.424262 17.5,14.28125 L 17.5,4.71875 C 17.5,4.5757361 17.420537,4.5 17.3125,4.5 L 3.71875,4.5 z"
-     transform="translate(0,-1.0000002)" />
+     transform="translate(-0.9999999,-1.9999999)" />
   <path
      sodipodi:type="arc"
      style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient12879);stroke-width:2.20694971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
@@ -207,7 +208,7 @@
      sodipodi:rx="14.345175"
      sodipodi:ry="14.345175"
      d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
-     transform="matrix(0.453114,0,0,0.4531141,7.9358503,7.4909169)" />
+     transform="matrix(0.453114,0,0,0.4531141,6.9358504,6.4909172)" />
   <path
      sodipodi:type="arc"
      style="opacity:0.76704544;fill:none;fill-opacity:1;stroke:url(#linearGradient12881);stroke-width:0.95346284;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -217,7 +218,7 @@
      sodipodi:rx="5.5"
      sodipodi:ry="5"
      d="M 13,7 A 5.5,5 0 1 1 2,7 A 5.5,5 0 1 1 13,7 z"
-     transform="matrix(1,0,0,1.1,7.5000002,7.2999969)" />
+     transform="matrix(1,0,0,1.1,6.5000003,6.2999972)" />
   <path
      sodipodi:type="arc"
      style="fill:#8ab0d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -227,7 +228,7 @@
      sodipodi:rx="3.1932809"
      sodipodi:ry="3.3471739"
      d="M -0.61557221,3.303823 A 3.1932809,3.3471739 0 1 1 -7.0021341,3.303823 A 3.1932809,3.3471739 0 1 1 -0.61557221,3.303823 z"
-     transform="matrix(1.5657877,0,0,1.4933941,20.96386,10.067437)" />
+     transform="matrix(1.5657877,0,0,1.4933941,19.96386,9.0674373)" />
   <path
      sodipodi:type="arc"
      style="opacity:0.40340911;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient12883);stroke-width:3.18781281px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
@@ -237,7 +238,7 @@
      sodipodi:rx="14.345175"
      sodipodi:ry="14.345175"
      d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
-     transform="matrix(0.3136944,0,0,0.3136944,10.10943,9.8013969)" />
+     transform="matrix(0.3136944,0,0,0.3136944,9.1094301,8.8013972)" />
   <path
      sodipodi:type="arc"
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -247,22 +248,22 @@
      sodipodi:rx="1.615877"
      sodipodi:ry="1.3273276"
      d="M 7.6561793,7.5551186 A 1.615877,1.3273276 0 1 1 4.4244252,7.5551186 A 1.615877,1.3273276 0 1 1 7.6561793,7.5551186 z"
-     transform="matrix(2.4754359,0,0,3.013574,4.7620235e-2,-7.7679131)" />
+     transform="matrix(2.4754359,0,0,3.013574,-0.9523797,-8.7679128)" />
   <rect
      style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect2832"
      width="1"
      height="1"
-     x="13.999996"
-     y="-15.999987"
+     x="12.999996"
+     y="-14.999987"
      transform="matrix(0,1,-1,0,0,0)" />
   <rect
      style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect2838"
      width="2"
      height="2"
-     x="13.999996"
-     y="-15.999987"
+     x="12.999996"
+     y="-14.999987"
      rx="1"
      ry="1"
      transform="matrix(0,1,-1,0,0,0)" />
@@ -271,39 +272,39 @@
      id="rect2840"
      width="1"
      height="1"
-     x="12.999996"
-     y="-16.999987"
+     x="11.999996"
+     y="-15.999987"
      transform="matrix(0,1,-1,0,0,0)" />
   <rect
      style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect2848"
      width="1"
      height="1"
-     x="-15.999996"
-     y="-15.999987"
+     x="-14.999996"
+     y="-14.999987"
      transform="matrix(0,-1,-1,0,0,0)" />
   <rect
      style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect2850"
      width="1"
      height="1"
-     x="-16.999996"
-     y="-16.999987"
+     x="-15.999996"
+     y="-15.999987"
      transform="matrix(0,-1,-1,0,0,0)" />
   <rect
      style="fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect8869"
      width="1"
      height="1"
-     x="11.999996"
-     y="-17.999987"
+     x="10.999996"
+     y="-16.999987"
      transform="matrix(0,1,-1,0,0,0)" />
   <rect
      style="fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect8871"
      width="1"
      height="1"
-     x="16.999996"
-     y="-17.999987"
+     x="15.999996"
+     y="-16.999987"
      transform="matrix(0,1,-1,0,0,0)" />
 </svg>
--- a/pidgin/pixmaps/tray/22/scalable/tray-busy.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-busy.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg8999"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -51,16 +51,17 @@
        x1="11.531433"
        y1="2.0188477"
        x2="7.6475248"
-       y2="16.513792" />
+       y2="16.513792"
+       gradientTransform="translate(-1,-1)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient29418"
        id="linearGradient9151"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.502468)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.602334,-2.502468)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
     <filter
        height="1.2203122"
@@ -91,7 +92,7 @@
        xlink:href="#linearGradient2239"
        id="linearGradient8993"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4077791,0,0,0.4061995,8.3985887,9.5673376)"
+       gradientTransform="matrix(0.4077791,0,0,0.4061995,7.3985887,7.5061135)"
        x1="-1.5418521"
        y1="-6.2826729"
        x2="63.127094"
@@ -117,7 +118,7 @@
        y1="-4.5287623"
        x2="10.253004"
        y2="11.790199"
-       gradientTransform="matrix(0.8444696,0,0,0.8412122,8.1707406,9.3403614)" />
+       gradientTransform="matrix(0.8444696,0,0,0.8412122,7.1707406,7.2791373)" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient8192">
@@ -171,8 +172,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="15.696216"
-     inkscape:cx="7.1937074"
-     inkscape:cy="14.21622"
+     inkscape:cx="8.9775768"
+     inkscape:cy="11.795254"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -180,7 +181,7 @@
      inkscape:window-width="650"
      inkscape:window-height="669"
      inkscape:window-x="0"
-     inkscape:window-y="22"
+     inkscape:window-y="0"
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="false"
      objecttolerance="10"
@@ -208,17 +209,17 @@
      inkscape:groupmode="layer">
     <path
        id="path9137"
-       d="M 17.120074,2.4999997 C 17.911234,2.4999997 18.5,3.0785204 18.5,4.0031287 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609012,14.487782 C 8.0308789,15.189395 7.1533459,17.327271 4.6806889,18.274119 C 5.781573,16.971634 5.5012167,14.487782 5.5012167,14.487782 L 4.0268296,14.487782 C 3.3637331,14.487782 2.5000011,13.703698 2.4999997,13.036127 L 2.4999997,3.9394191 C 2.4999997,3.2718468 3.3000235,2.4999997 3.96312,2.4999997 L 17.120074,2.4999997 z"
-       style="fill:url(#linearGradient9151);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9153);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 16.120074,1.4999997 C 16.911234,1.4999997 17.5,2.0785204 17.5,3.0031287 L 17.5,12.290965 C 17.5,12.958536 16.974302,13.487782 16.311203,13.487782 L 7.5609012,13.487782 C 7.0308789,14.189395 6.1533459,16.327271 3.6806889,17.274119 C 4.781573,15.971634 4.5012167,13.487782 4.5012167,13.487782 L 3.0268296,13.487782 C 2.3637331,13.487782 1.5000011,12.703698 1.4999997,12.036127 L 1.4999997,2.9394191 C 1.4999997,2.2718468 2.3000235,1.4999997 2.96312,1.4999997 L 16.120074,1.4999997 z"
+       style="fill:url(#linearGradient9151);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9153);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
        sodipodi:nodetypes="cccccccccccc" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-0.99184585"
        inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
-       style="fill:url(#linearGradient9155);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       style="fill:url(#linearGradient9155);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
        id="path9139"
        d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
-       transform="translate(1.0197678e-7,-0.9999999)" />
+       transform="translate(-0.9999999,-1.9999999)" />
     <path
        sodipodi:type="arc"
        style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
@@ -228,7 +229,7 @@
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
-       transform="matrix(0.4103372,0,0,0.4103372,8.5779752,9.2975807)" />
+       transform="matrix(0.4103372,0,0,0.4103372,7.5779752,7.2363566)" />
     <path
        sodipodi:type="arc"
        style="fill:#f13d3d;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8997);stroke-width:2.19154143px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
@@ -238,10 +239,10 @@
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
-       transform="matrix(0.457354,0,0,0.455248,7.8089242,8.4861647)" />
+       transform="matrix(0.457354,0,0,0.455248,6.8089242,6.4249406)" />
     <path
        style="opacity:0.75;fill:url(#linearGradient8991);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8993);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 20.437485,16.061225 C 20.437485,19.097224 17.973484,21.561226 14.937484,21.561226 C 11.901484,21.561226 9.4374847,19.097224 9.4374847,16.061225 C 9.4374847,13.025226 11.901484,10.561226 14.937484,10.561226 C 17.973484,10.561226 20.437485,13.025226 20.437485,16.061225 L 20.437485,16.061225 z"
+       d="M 19.437485,14.000001 C 19.437485,17.036 16.973484,19.500002 13.937484,19.500002 C 10.901484,19.500002 8.4374847,17.036 8.4374847,14.000001 C 8.4374847,10.964002 10.901484,8.5000019 13.937484,8.5000019 C 16.973484,8.5000019 19.437485,10.964002 19.437485,14.000001 L 19.437485,14.000001 z"
        id="path2220" />
     <path
        sodipodi:type="arc"
@@ -252,14 +253,14 @@
        sodipodi:rx="1.8659533"
        sodipodi:ry="1.9428998"
        d="M 13.350222,4.7465701 A 1.8659533,1.9428998 0 1 1 9.6183158,4.7465701 A 1.8659533,1.9428998 0 1 1 13.350222,4.7465701 z"
-       transform="matrix(1.9262296,-1.1216182,0.826622,1.4439935,-12.37164,20.356286)" />
+       transform="matrix(1.9262296,-1.1216182,0.826622,1.4439935,-13.37164,18.295062)" />
     <rect
        style="fill:#eeeeec;fill-opacity:1;stroke:#a40000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3207"
        width="9"
        height="2.9999998"
-       x="10.437485"
-       y="14.561226"
+       x="9.4374847"
+       y="12.500002"
        rx="0.91377938"
        ry="0.91377938" />
   </g>
--- a/pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg7943"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -62,10 +62,10 @@
        xlink:href="#linearGradient29418"
        id="linearGradient8799"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.600259,-2.5024683)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
     <linearGradient
        inkscape:collect="always"
@@ -96,7 +96,8 @@
        y1="2.0188477"
        x2="7.6475248"
        y2="16.513792"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.0020752,-0.9999997)" />
     <linearGradient
        id="linearGradient8634"
        inkscape:collect="always">
@@ -190,13 +191,13 @@
        x2="15.640712"
        y2="10.843963"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4056313,0,0,1,-3.9850748,1.6657143)" />
+       gradientTransform="matrix(1.4056313,0,0,1,-4.98715,0.6657146)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8743"
        id="linearGradient8753"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4056313,0,0,0.9810136,-3.9850747,3.8619247)"
+       gradientTransform="matrix(1.4056313,0,0,0.9810136,-4.9871499,2.861925)"
        x1="11.372168"
        y1="10.843963"
        x2="15.640712"
@@ -206,7 +207,7 @@
        xlink:href="#linearGradient8743"
        id="linearGradient8759"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4056313,0,0,1,-3.985075,5.6657141)"
+       gradientTransform="matrix(1.4056313,0,0,1,-4.9871502,4.6657144)"
        x1="11.372168"
        y1="10.843963"
        x2="15.640712"
@@ -219,9 +220,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="31.392432"
-     inkscape:cx="20.45958"
-     inkscape:cy="11.708121"
+     inkscape:zoom="15.696216"
+     inkscape:cx="21.493979"
+     inkscape:cy="9.5517755"
      inkscape:current-layer="svg7943"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -253,17 +254,17 @@
   </metadata>
   <path
      id="path29441"
-     d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
-     style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+     d="M 16.117999,1.4999997 C 16.909159,1.4999997 17.497925,2.0785204 17.497925,3.0031287 L 17.497925,12.290965 C 17.497925,12.958536 16.972227,13.487782 16.309128,13.487782 L 7.5588259,13.487782 C 7.0288036,14.189395 6.1512706,16.327271 3.6786136,17.274119 C 4.7794977,15.971634 4.4991414,13.487782 4.4991414,13.487782 L 3.0247543,13.487782 C 2.3616578,13.487782 1.4979258,12.703698 1.4979244,12.036127 L 1.4979244,2.9394191 C 1.4979244,2.2718468 2.2979482,1.4999997 2.9610447,1.4999997 L 16.117999,1.4999997 z"
+     style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
      sodipodi:nodetypes="cccccccccccc" />
   <path
      sodipodi:type="inkscape:offset"
      inkscape:radius="-0.99184585"
      inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
-     style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+     style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
      id="path8805"
      d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
-     transform="translate(0,-1.0000002)" />
+     transform="translate(-1.0020752,-1.9999999)" />
   <path
      sodipodi:type="arc"
      style="fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7953);stroke-width:1.23057282;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -273,7 +274,7 @@
      sodipodi:rx="8"
      sodipodi:ry="8"
      d="M 16,8 A 8,8 0 1 1 0,8 A 8,8 0 1 1 16,8 z"
-     transform="matrix(0.8126297,0,0,0.8126297,8.5,8.5)" />
+     transform="matrix(0.8126297,0,0,0.8126297,7.4979248,7.5000003)" />
   <path
      sodipodi:type="arc"
      style="fill:url(#linearGradient7969);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7957);stroke-width:1.4545455;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -283,7 +284,7 @@
      sodipodi:rx="8"
      sodipodi:ry="8"
      d="M 16,8 A 8,8 0 1 1 0,8 A 8,8 0 1 1 16,8 z"
-     transform="matrix(0.6875,0,0,0.6875,9.5,9.5)" />
+     transform="matrix(0.6875,0,0,0.6875,8.4979248,8.5000003)" />
   <path
      sodipodi:type="arc"
      style="fill:url(#linearGradient7959);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -293,14 +294,14 @@
      sodipodi:rx="2.8125"
      sodipodi:ry="3.328125"
      d="M 8.71875,6.859375 A 2.8125,3.328125 0 1 1 3.09375,6.859375 A 2.8125,3.328125 0 1 1 8.71875,6.859375 z"
-     transform="matrix(1.1537276,-0.7245321,0.5022099,0.9100757,3.3913656,11.687133)" />
+     transform="matrix(1.1537276,-0.7245321,0.5022099,0.9100757,2.3892904,10.687133)" />
   <rect
      style="opacity:1;fill:url(#linearGradient8749);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
      id="rect7971"
      width="6"
      height="1.019354"
-     x="12"
-     y="12"
+     x="10.997925"
+     y="11"
      rx="0.50967699"
      ry="0.50967699" />
   <rect
@@ -308,8 +309,8 @@
      id="rect8751"
      width="6"
      height="1.0000001"
-     x="12"
-     y="14"
+     x="10.997925"
+     y="13"
      rx="0.50967699"
      ry="0.50000006" />
   <rect
@@ -317,8 +318,8 @@
      id="rect8755"
      width="6"
      height="1.019354"
-     x="12"
-     y="15.999999"
+     x="10.997925"
+     y="14.999999"
      rx="0.50967699"
      ry="0.50967699" />
 </svg>
--- a/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg11816"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -40,13 +40,13 @@
        y1="16.125008"
        x2="17.500002"
        y2="20.375008"
-       gradientTransform="translate(3.2782555e-7,-1.0327826e-5)" />
+       gradientTransform="translate(-0.9999996,-1)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3149"
        id="linearGradient12375"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3947516,0,0,0.3947515,7.9378703,8.0632097)"
+       gradientTransform="matrix(0.3947516,0,0,0.3947515,6.9378704,7.06322)"
        x1="15.498499"
        y1="9.4211226"
        x2="24.240097"
@@ -112,10 +112,10 @@
        xlink:href="#linearGradient29418"
        id="linearGradient12269"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.602334,-2.502458)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
     <linearGradient
        inkscape:collect="always"
@@ -125,7 +125,8 @@
        x1="11.531433"
        y1="2.0188477"
        x2="7.6475248"
-       y2="16.513792" />
+       y2="16.513792"
+       gradientTransform="translate(-0.9999999,-0.9999897)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -135,7 +136,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="8.7914998"
+     inkscape:cx="12.4165"
      inkscape:cy="9.1393488"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -147,8 +148,8 @@
      gridtolerance="10"
      inkscape:window-width="641"
      inkscape:window-height="669"
-     inkscape:window-x="4"
-     inkscape:window-y="22">
+     inkscape:window-x="434"
+     inkscape:window-y="61">
     <inkscape:grid
        type="xygrid"
        id="grid11826"
@@ -172,7 +173,7 @@
      inkscape:groupmode="layer">
     <path
        id="path11012"
-       d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
+       d="M 16.120074,1.5000097 C 16.911234,1.5000097 17.5,2.0785304 17.5,3.0031387 L 17.5,12.290975 C 17.5,12.958546 16.974302,13.487792 16.311203,13.487792 L 7.5609012,13.487792 C 7.0308789,14.189405 6.1533459,16.327281 3.6806889,17.274129 C 4.781573,15.971644 4.5012167,13.487792 4.5012167,13.487792 L 3.0268296,13.487792 C 2.3637331,13.487792 1.5000011,12.703708 1.4999997,12.036137 L 1.4999997,2.9394291 C 1.4999997,2.2718568 2.3000235,1.5000097 2.96312,1.5000097 L 16.120074,1.5000097 z"
        style="fill:url(#linearGradient12269);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient12271);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
        sodipodi:nodetypes="cccccccccccc" />
     <path
@@ -182,18 +183,18 @@
        style="fill:url(#linearGradient11026);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.47738689;visibility:visible;display:block;overflow:visible"
        id="path11014"
        d="M 3.71875,4.5 C 3.610718,4.5 3.5,4.6069976 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.393002 3.6107192,14.5 3.71875,14.5 L 5.5,14.5 C 6.0066429,14.496818 6.4358999,14.872418 6.5,15.375 C 6.5,15.375 6.5221001,16.048002 6.5,16.71875 C 6.5166237,16.698497 6.5462133,16.676539 6.5625,16.65625 C 7.0808734,16.010479 7.3500532,15.435677 7.75,14.90625 C 7.9403413,14.648762 8.2423046,14.49778 8.5625,14.5 L 17.3125,14.5 C 17.420535,14.5 17.5,14.424262 17.5,14.28125 L 17.5,4.71875 C 17.5,4.5757361 17.420537,4.5 17.3125,4.5 L 3.71875,4.5 z"
-       transform="translate(0,-1.0000002)" />
+       transform="translate(-0.9999999,-1.9999899)" />
     <g
        id="g11016"
        inkscape:label="Layer 1"
-       transform="translate(42.12926,5.0376345)" />
+       transform="translate(41.12926,4.0376448)" />
     <path
-       style="opacity:0.80000000000000004;fill:#c0d4ea;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient12378);stroke-width:0.99999934000000001;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 21.5,15 C 21.5,18.58799 18.588,21.49999 15.00001,21.49999 C 11.41201,21.49999 8.5000103,18.58799 8.5000103,15 C 8.5000103,11.412 11.41201,8.4999997 15.00001,8.4999997 C 18.588,8.4999997 21.5,11.412 21.5,15 z"
+       style="opacity:0.8;fill:#c0d4ea;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient12378);stroke-width:0.99999934;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 20.5,14.00001 C 20.5,17.588 17.588,20.5 14.00001,20.5 C 10.41201,20.5 7.5000104,17.588 7.5000104,14.00001 C 7.5000104,10.41201 10.41201,7.50001 14.00001,7.50001 C 17.588,7.50001 20.5,10.41201 20.5,14.00001 z"
        id="path8239" />
     <path
-       style="opacity:0.47999997999999999;fill:url(#linearGradient12375);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999875000000005;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 20.5,14.99999 C 20.5,18.03599 18.036,20.49999 15,20.49999 C 11.964,20.49999 9.5000003,18.03599 9.5000003,14.99999 C 9.5000003,11.96399 11.964,9.4999897 15,9.4999897 C 18.036,9.4999897 20.5,11.96399 20.5,14.99999 z"
+       style="opacity:0.47999998;fill:url(#linearGradient12375);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999875;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 19.5,14 C 19.5,17.036 17.036,19.5 14,19.5 C 10.964,19.5 8.5000004,17.036 8.5000004,14 C 8.5000004,10.964 10.964,8.5 14,8.5 C 17.036,8.5 19.5,10.964 19.5,14 z"
        id="path8241" />
   </g>
 </svg>
--- a/pidgin/pixmaps/tray/22/scalable/tray-message-new.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-message-new.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg7943"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -74,10 +74,10 @@
        xlink:href="#linearGradient29418"
        id="linearGradient8799"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.602334,-2.5024684)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
     <linearGradient
        inkscape:collect="always"
@@ -108,7 +108,8 @@
        y1="2.0188477"
        x2="7.6475248"
        y2="16.513792"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.9999998,-0.9999998)" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3104">
@@ -150,11 +151,11 @@
        xlink:href="#linearGradient9676"
        id="linearGradient9655"
        gradientUnits="userSpaceOnUse"
-       x1="5.0167913"
-       y1="6.0080996"
-       x2="5.9832082"
-       y2="6.9919"
-       gradientTransform="matrix(0.9659258,0.258819,-0.258819,0.9659258,8.8697318,5.7979771)" />
+       x1="4.4739528"
+       y1="5.465261"
+       x2="5.8391519"
+       y2="6.8304601"
+       gradientTransform="matrix(0.9657282,0.258819,-0.258766,0.9659258,7.8704745,4.7983866)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3104"
@@ -185,16 +186,89 @@
        cy="25.560368"
        fx="11.76924"
        fy="25.560368"
-       r="9.8412299" />
+       r="9.8412294" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient9670"
        id="linearGradient9666"
        gradientUnits="userSpaceOnUse"
-       x1="9.9935493"
-       y1="9.1751938"
-       x2="9.4590645"
-       y2="10.073978" />
+       x1="10.221361"
+       y1="8.1903381"
+       x2="9.8845415"
+       y2="9.2942877" />
+    <linearGradient
+       gradientTransform="translate(-0.9999999,-0.9999897)"
+       y2="16.513792"
+       x2="7.6475248"
+       y1="2.0188477"
+       x1="11.531433"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12271"
+       xlink:href="#linearGradient8907"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.2733"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.602334,-2.502458)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12269"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="15.010952"
+       x2="16.499542"
+       y1="2.5071414"
+       x1="6.924273"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11026"
+       xlink:href="#linearGradient8710"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientTransform="matrix(0.3947516,0,0,0.3947515,6.9378704,7.06322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12375"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-0.9999996,-1)"
+       y2="20.375008"
+       x2="17.500002"
+       y1="16.125008"
+       x1="15.562512"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12378"
+       xlink:href="#linearGradient9042"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9042">
+      <stop
+         style="stop-color:#8cb1d9;stop-opacity:1;"
+         offset="0"
+         id="stop9044" />
+      <stop
+         style="stop-color:#437fc2;stop-opacity:1"
+         offset="1"
+         id="stop9046" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -203,17 +277,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.696216"
-     inkscape:cx="19.629459"
-     inkscape:cy="13.003686"
+     inkscape:zoom="16"
+     inkscape:cx="22.9121"
+     inkscape:cy="12.498423"
      inkscape:current-layer="svg7943"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1232"
-     inkscape:window-height="718"
-     inkscape:window-x="68"
-     inkscape:window-y="65"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="false"
      objecttolerance="10"
@@ -237,118 +311,118 @@
   </metadata>
   <path
      id="path29441"
-     d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
-     style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+     d="M 16.120074,1.4999996 C 16.911234,1.4999996 17.5,2.0785203 17.5,3.0031286 L 17.5,12.290965 C 17.5,12.958536 16.974302,13.487782 16.311203,13.487782 L 7.5609013,13.487782 C 7.030879,14.189395 6.153346,16.327271 3.680689,17.274119 C 4.7815731,15.971634 4.5012168,13.487782 4.5012168,13.487782 L 3.0268297,13.487782 C 2.3637332,13.487782 1.5000012,12.703698 1.4999998,12.036127 L 1.4999998,2.939419 C 1.4999998,2.2718467 2.3000236,1.4999996 2.9631201,1.4999996 L 16.120074,1.4999996 z"
+     style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
      sodipodi:nodetypes="cccccccccccc" />
   <path
      sodipodi:type="inkscape:offset"
      inkscape:radius="-0.99184585"
      inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
-     style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+     style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
      id="path8805"
      d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
-     transform="translate(0,-1.0000002)" />
+     transform="translate(-0.9999998,-2)" />
   <path
      sodipodi:type="arc"
-     style="fill:#edd400;fill-opacity:1;stroke:url(#linearGradient9662);stroke-width:1.42882562000000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#edd400;fill-opacity:1;stroke:url(#linearGradient9662);stroke-width:1.53875625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path3317"
      sodipodi:cx="11.806158"
      sodipodi:cy="10.983024"
      sodipodi:rx="9.975256"
      sodipodi:ry="9.975256"
      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.701612,0,0,0.701612,6.2166577,6.7941787)" />
+     transform="matrix(0.651488,0,0,0.651488,6.3084299,6.8446921)" />
   <path
      sodipodi:type="arc"
-     style="opacity:0.64044948999999995;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.66254269999999993;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.81368279;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path3321"
      sodipodi:cx="11.806158"
      sodipodi:cy="10.983024"
      sodipodi:rx="9.975256"
      sodipodi:ry="9.975256"
      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.6014884,0,0,0.6014884,7.3987337,7.8938395)" />
+     transform="matrix(0.5513644,0,0,0.5513644,7.4905059,7.9443529)" />
   <path
      sodipodi:type="arc"
-     style="opacity:0.79545456000000003;fill:url(#radialGradient9660);fill-opacity:1;stroke:none;stroke-width:1.05274069000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="opacity:0.79545456;fill:url(#radialGradient9660);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path3319"
      sodipodi:cx="11.806158"
      sodipodi:cy="10.983024"
      sodipodi:rx="9.975256"
      sodipodi:ry="9.975256"
      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.6516124,0,0,0.6516124,6.8069615,7.3433261)" />
+     transform="matrix(0.6014884,0,0,0.6014884,6.8987337,7.3938394)" />
   <path
-     style="fill:#eeeeec;fill-opacity:1;stroke:url(#linearGradient9655);stroke-width:0.99999987999999995;stroke-miterlimit:4;stroke-opacity:1"
-     d="M 14.431852,14.017638 C 14.146115,15.08402 13.048744,15.717588 11.982362,15.431852 C 10.91598,15.146115 10.282412,14.048744 10.568148,12.982362 C 10.853885,11.91598 11.951256,11.282412 13.017638,11.568148 C 14.08402,11.853885 14.717588,12.951256 14.431852,14.017638 z"
+     style="fill:#eeeeec;fill-opacity:1;stroke:url(#linearGradient9655);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1"
+     d="M 13.431456,13.018048 C 13.145778,14.08443 12.048631,14.717998 10.982467,14.432262 C 9.9163047,14.146525 9.2828659,13.049154 9.568544,11.982772 C 9.854222,10.91639 10.951368,10.282822 12.017531,10.568558 C 13.083695,10.854295 13.717134,11.951666 13.431456,13.018048 z"
      id="path3154" />
   <path
      sodipodi:type="arc"
-     style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640185999999996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#eeeeec;fill-opacity:1;stroke:url(#linearGradient9666);stroke-width:0.70564491;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path3152"
+     sodipodi:cx="9.7069349"
+     sodipodi:cy="9.6526775"
+     sodipodi:rx="1.0259361"
+     sodipodi:ry="1.9413869"
+     d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
+     transform="matrix(1.949439,0,0,1.0301914,-3.4230773,2.5558948)" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:0.75;fill:none;fill-opacity:1;stroke:#ce5c00;stroke-width:0.85073608;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path2259"
+     sodipodi:cx="8.3258924"
+     sodipodi:cy="9.2232141"
+     sodipodi:rx="1.2276785"
+     sodipodi:ry="1.7410715"
+     d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+     transform="matrix(1.4017773,0.3494647,-0.2648498,0.9196421,5.6361975,-1.2342213)"
+     sodipodi:start="3.5782199"
+     sodipodi:end="5.6135639"
+     sodipodi:open="true" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:0.75;fill:none;fill-opacity:1;stroke:#ce5c00;stroke-width:0.786129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path2261"
+     sodipodi:cx="8.3258924"
+     sodipodi:cy="9.2232141"
+     sodipodi:rx="1.2276785"
+     sodipodi:ry="1.7410715"
+     d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+     transform="matrix(-1.6416529,0.3494645,0.3101714,0.9196416,21.709478,-1.2342154)"
+     sodipodi:start="3.5782199"
+     sodipodi:end="5.6135639"
+     sodipodi:open="true" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path3346"
+     sodipodi:cx="9.7069349"
+     sodipodi:cy="9.6526775"
+     sodipodi:rx="1.0259361"
+     sodipodi:ry="1.9413869"
+     d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
+     transform="matrix(-0.9747196,0,0,0.5150957,24.46154,8.0279474)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;fill-opacity:1;stroke:url(#radialGradient9664);stroke-width:2.55228639;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path3367"
+     sodipodi:cx="11.806158"
+     sodipodi:cy="10.983024"
+     sodipodi:rx="9.975256"
+     sodipodi:ry="9.975256"
+     d="M 20.502108,15.870372 A 9.975256,9.975256 0 0 1 3.0363724,15.736611"
+     transform="matrix(0.4007848,0,0,0.3830275,9.2830681,9.4724452)"
+     sodipodi:start="0.51202919"
+     sodipodi:end="2.6448802"
+     sodipodi:open="true" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path2172"
      sodipodi:cx="9.7069349"
      sodipodi:cy="9.6526775"
      sodipodi:rx="1.0259361"
      sodipodi:ry="1.9413869"
      d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
-     transform="matrix(0.9747194,0,0,0.5150957,3.5384624,9.0279469)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#eeeeec;fill-opacity:1;stroke:url(#linearGradient9666);stroke-width:0.70564497000000004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path3152"
-     sodipodi:cx="9.7069349"
-     sodipodi:cy="9.6526775"
-     sodipodi:rx="1.0259361"
-     sodipodi:ry="1.9413869"
-     d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
-     transform="matrix(1.9494389,0,0,1.0301914,-2.4230764,3.5558945)" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:0.75000000000000000;fill:none;fill-opacity:1;stroke:#ce5c00;stroke-width:0.85073602000000004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path2259"
-     sodipodi:cx="8.3258924"
-     sodipodi:cy="9.2232141"
-     sodipodi:rx="1.2276785"
-     sodipodi:ry="1.7410715"
-     d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
-     transform="matrix(1.4017776,0.3494647,-0.2648498,0.9196421,7.6361947,-0.2342213)"
-     sodipodi:start="3.5782199"
-     sodipodi:end="5.6135639"
-     sodipodi:open="true" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:0.75000000000000000;fill:none;fill-opacity:1;stroke:#ce5c00;stroke-width:0.85073620000000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path2261"
-     sodipodi:cx="8.3258924"
-     sodipodi:cy="9.2232141"
-     sodipodi:rx="1.2276785"
-     sodipodi:ry="1.7410715"
-     d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
-     transform="matrix(-1.4017777,0.3494645,0.2648498,0.9196416,21.85044,-0.2342154)"
-     sodipodi:start="3.5782199"
-     sodipodi:end="5.6135639"
-     sodipodi:open="true" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640185999999996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path3346"
-     sodipodi:cx="9.7069349"
-     sodipodi:cy="9.6526775"
-     sodipodi:rx="1.0259361"
-     sodipodi:ry="1.9413869"
-     d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
-     transform="matrix(0.9747195,0,0,0.5150957,6.5384613,9.0279471)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:none;fill-opacity:1;stroke:url(#radialGradient9664);stroke-width:2.38744544999999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path3367"
-     sodipodi:cx="11.806158"
-     sodipodi:cy="10.983024"
-     sodipodi:rx="9.975256"
-     sodipodi:ry="9.975256"
-     d="M 20.502108,15.870372 A 9.975256,9.975256 0 0 1 3.0363724,15.736611"
-     transform="matrix(0.4580397,0,0,0.3830275,9.1092209,10.472445)"
-     sodipodi:start="0.51202919"
-     sodipodi:end="2.6448802"
-     sodipodi:open="true" />
+     transform="matrix(0.9747196,0,0,0.5150957,2.5384607,8.0279472)" />
 </svg>
--- a/pidgin/pixmaps/tray/22/scalable/tray-offline.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-offline.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg7943"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -50,10 +50,10 @@
        xlink:href="#linearGradient29418"
        id="linearGradient8799"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.602334,-2.5024683)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
     <linearGradient
        inkscape:collect="always"
@@ -84,7 +84,8 @@
        y1="2.0188477"
        x2="7.6475248"
        y2="16.513792"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.9999999,-0.9999997)" />
     <linearGradient
        id="linearGradient3275"
        inkscape:collect="always">
@@ -130,7 +131,7 @@
        y1="3.565635"
        x2="12.060304"
        y2="13.821809"
-       gradientTransform="matrix(0.8705935,0,0,0.8662612,8.0664838,8.0686285)" />
+       gradientTransform="matrix(0.8705935,0,0,0.8662612,7.0664839,7.0686288)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3275"
@@ -140,7 +141,7 @@
        y1="14.69435"
        x2="6.8097677"
        y2="4.3450422"
-       gradientTransform="matrix(0.8705935,0,0,0.8662612,8.0664838,8.0686285)" />
+       gradientTransform="matrix(0.8705935,0,0,0.8662612,7.0664839,7.0686288)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3303"
@@ -159,8 +160,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="15.739764"
-     inkscape:cy="11.526219"
+     inkscape:cx="17.419143"
+     inkscape:cy="12.631073"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -172,7 +173,8 @@
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="false"
      objecttolerance="10"
-     gridtolerance="10">
+     gridtolerance="10"
+     inkscape:showpageshadow="false">
     <inkscape:grid
        type="xygrid"
        id="grid7872"
@@ -196,38 +198,38 @@
      inkscape:groupmode="layer">
     <path
        id="path29441"
-       d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
-       style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 16.120074,1.4999997 C 16.911234,1.4999997 17.5,2.0785204 17.5,3.0031287 L 17.5,12.290965 C 17.5,12.958536 16.974302,13.487782 16.311203,13.487782 L 7.5609012,13.487782 C 7.0308789,14.189395 6.1533459,16.327271 3.6806889,17.274119 C 4.781573,15.971634 4.5012167,13.487782 4.5012167,13.487782 L 3.0268296,13.487782 C 2.3637331,13.487782 1.5000011,12.703698 1.4999997,12.036127 L 1.4999997,2.9394191 C 1.4999997,2.2718468 2.3000235,1.4999997 2.96312,1.4999997 L 16.120074,1.4999997 z"
+       style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
        sodipodi:nodetypes="cccccccccccc" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-0.99184585"
        inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
-       style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
        id="path8805"
        d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
-       transform="translate(0,-1.0000002)" />
+       transform="translate(-0.9999999,-1.9999999)" />
     <g
        id="g2057"
        inkscape:label="Layer 1"
-       transform="translate(42.12926,5.0376345)" />
+       transform="translate(41.12926,4.0376348)" />
     <path
        style="fill:url(#linearGradient8231);fill-opacity:1;stroke:url(#linearGradient8233);stroke-width:0.99999833;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 19.651536,19.596035 C 17.100596,22.134283 12.96037,22.134712 10.409961,19.596995 C 7.8595522,17.059275 7.8599841,12.939651 10.410925,10.401404 C 12.961866,7.8631562 17.102091,7.8627263 19.6525,10.400445 C 22.202909,12.938163 22.202478,17.057788 19.651536,19.596035 z"
+       d="M 18.651536,18.596035 C 16.100596,21.134283 11.96037,21.134712 9.4099611,18.596995 C 6.8595523,16.059275 6.8599842,11.939651 9.4109251,9.4014043 C 11.961866,6.8631565 16.102091,6.8627266 18.6525,9.4004453 C 21.202909,11.938163 21.202478,16.057788 18.651536,18.596035 z"
        id="path2187" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-1.0137641"
-       inkscape:original="M 15.03125 8.5 C 13.358525 8.5001736 11.681721 9.1371259 10.40625 10.40625 C 7.8553091 12.944497 7.8558415 17.056031 10.40625 19.59375 C 12.956659 22.131467 17.105309 22.131998 19.65625 19.59375 C 22.207192 17.055503 22.206659 12.943968 19.65625 10.40625 C 18.381045 9.1373906 16.703975 8.4998264 15.03125 8.5 z "
+       inkscape:original="M 14.03125 7.5 C 12.358525 7.5001736 10.681721 8.1371261 9.40625 9.40625 C 6.8553091 11.944497 6.8558416 16.056031 9.40625 18.59375 C 11.956659 21.131467 16.105309 21.131998 18.65625 18.59375 C 21.207192 16.055503 21.206659 11.943968 18.65625 9.40625 C 17.381045 8.1373906 15.703975 7.4998264 14.03125 7.5 z "
        xlink:href="#path2187"
        style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient8236);stroke-width:1.00200045;stroke-miterlimit:4;stroke-opacity:1"
        id="path2215"
        inkscape:href="#path2187"
-       d="M 15.03125,9.5 C 13.615807,9.5001469 12.205781,10.049597 11.125,11.125 C 8.9621217,13.277115 8.9626347,16.723393 11.125,18.875 C 13.285811,21.025058 16.776176,21.02557 18.9375,18.875 C 21.100379,16.722885 21.099866,13.276605 18.9375,11.125 C 17.85696,10.049837 16.446305,9.4998531 15.03125,9.5 z"
-       transform="matrix(-0.9948961,0,0,-1.0011165,29.954532,30.010608)" />
+       d="M 14.03125,8.5 C 12.615807,8.5001469 11.205781,9.0495975 10.125,10.125 C 7.9621217,12.277115 7.9626348,15.723393 10.125,17.875 C 12.285811,20.025058 15.776176,20.02557 17.9375,17.875 C 20.100379,15.722885 20.099866,12.276605 17.9375,10.125 C 16.85696,9.0498372 15.446305,8.4998531 14.03125,8.5 z"
+       transform="matrix(-0.9948961,0,0,-1.0011165,27.959636,28.009493)" />
     <path
        style="fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 18.389146,11.620482 C 17.839918,11.072738 17.23793,10.863672 16.688702,11.411416 L 15.036388,13.059262 L 13.384074,11.411416 C 12.834845,10.863672 12.197152,11.142764 11.647923,11.690508 C 11.098694,12.238251 10.852068,12.841088 11.401297,13.388831 L 13.053611,15.036678 L 11.401297,16.684524 C 10.852068,17.232268 11.096483,17.934576 11.645712,18.482321 C 12.194941,19.030063 12.834845,19.209683 13.384074,18.66194 L 15.036388,17.014093 L 16.688702,18.66194 C 17.23793,19.209683 17.910224,19.0331 18.459452,18.485357 C 19.008681,17.937612 19.220707,17.232268 18.671478,16.684524 L 17.019165,15.036678 L 18.671478,13.388832 C 19.220707,12.841088 18.938375,12.168226 18.389146,11.620482 z"
+       d="M 17.389146,10.620482 C 16.839918,10.072738 16.23793,9.8636723 15.688702,10.411416 L 14.036388,12.059262 L 12.384074,10.411416 C 11.834845,9.8636723 11.197152,10.142764 10.647923,10.690508 C 10.098694,11.238251 9.8520681,11.841088 10.401297,12.388831 L 12.053611,14.036678 L 10.401297,15.684524 C 9.8520681,16.232268 10.096483,16.934576 10.645712,17.482321 C 11.194941,18.030063 11.834845,18.209683 12.384074,17.66194 L 14.036388,16.014093 L 15.688702,17.66194 C 16.23793,18.209683 16.910224,18.0331 17.459452,17.485357 C 18.008681,16.937612 18.220707,16.232268 17.671478,15.684524 L 16.019165,14.036678 L 17.671478,12.388832 C 18.220707,11.841088 17.938375,11.168226 17.389146,10.620482 z"
        id="rect2920"
        sodipodi:nodetypes="ccccscccscccscccc" />
   </g>
--- a/pidgin/pixmaps/tray/22/scalable/tray-online.svg	Thu Aug 21 06:40:00 2008 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-online.svg	Thu Aug 21 06:46:19 2008 +0000
@@ -9,8 +9,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="22"
+   height="22"
    id="svg11816"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -157,7 +157,7 @@
        gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
        x1="35.003674"
        y1="10.957423"
-       x2="27.273300"
+       x2="27.2733"
        y2="24.143761" />
   </defs>
   <sodipodi:namedview
@@ -168,8 +168,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="8.7914998"
-     inkscape:cy="14.139349"
+     inkscape:cx="8.1664998"
+     inkscape:cy="10.889349"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -178,7 +178,7 @@
      inkscape:snap-nodes="false"
      objecttolerance="10"
      gridtolerance="10"
-     inkscape:window-width="641"
+     inkscape:window-width="871"
      inkscape:window-height="669"
      inkscape:window-x="4"
      inkscape:window-y="22">
@@ -205,7 +205,8 @@
      inkscape:groupmode="layer">
     <g
        inkscape:label="Layer 1"
-       id="g11010">
+       id="g11010"
+       transform="translate(-0.9999999,-1.0023017)">
       <path
          sodipodi:nodetypes="cccccccccccc"
          style="fill:url(#linearGradient11022);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient11024);stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
Binary file pidgin/pixmaps/tray/22/tray-away.png has changed
Binary file pidgin/pixmaps/tray/22/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/22/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/22/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/22/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/22/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/22/tray-online.png has changed
--- a/po/nl.po	Thu Aug 21 06:40:00 2008 +0000
+++ b/po/nl.po	Thu Aug 21 06:46:19 2008 +0000
@@ -13734,7 +13734,7 @@
 #: ../libpurple/proxy.c:694
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Kan antwoord van HTTP-proxy niet parsen: %S\n"
+msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n"
 
 #: ../libpurple/proxy.c:734
 #: ../libpurple/proxy.c:783