# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1219000503 0
# Node ID d2b73439176db63d2e47d93f50eacf03281aa729
# Parent  5e7a013bb75e7414df499aebf27c929032df8e50# Parent  5dca6d7e7c1eb66052d13c2ea1c8cc9f71766e2b
merge of '6b6139039fdaaf6ab1059337085b3b6267bb474e'
     and '8eea4c055964a321a6a8f0403d8b27dcd8f0d041'

diff -r 5e7a013bb75e -r d2b73439176d libpurple/accountopt.h
--- a/libpurple/accountopt.h	Sun Aug 17 19:12:24 2008 +0000
+++ b/libpurple/accountopt.h	Sun Aug 17 19:15:03 2008 +0000
@@ -139,8 +139,10 @@
  * The list passed will be owned by the account option, and the
  * strings inside will be freed automatically.
  *
- * The list is a list of PurpleKeyValuePair items. The key is the ID stored and
- * used internally, and the <tt>(const char *)</tt> value is the label displayed.
+ * The list is a list of #PurpleKeyValuePair items. The key is the label that
+ * should be displayed to the user, and the <tt>(const char *)</tt> value is
+ * the internal ID that should be passed to purple_account_set_string() to
+ * choose that value.
  *
  * @param text      The text of the option.
  * @param pref_name The account preference name for the option.
@@ -304,7 +306,10 @@
  *
  * @param option The account option.
  *
- * @constreturn The list values.
+ * @constreturn A list of #PurpleKeyValuePair, mapping the human-readable
+ *              description of the value to the <tt>(const char *)</tt> that
+ *              should be passed to purple_account_set_string() to set the
+ *              option.
  */
 GList *purple_account_option_get_list(const PurpleAccountOption *option);
 
diff -r 5e7a013bb75e -r d2b73439176d pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun Aug 17 19:12:24 2008 +0000
+++ b/pidgin/gtkconv.c	Sun Aug 17 19:15:03 2008 +0000
@@ -4619,6 +4619,9 @@
 
 	/* Setup the label telling how many people are in the room. */
 	gtkchat->count = gtk_label_new(_("0 people in room"));
+#if GTK_CHECK_VERSION(2,6,0)
+	gtk_label_set_ellipsize(GTK_LABEL(gtkchat->count), PANGO_ELLIPSIZE_END);
+#endif
 	gtk_box_pack_start(GTK_BOX(lbox), gtkchat->count, FALSE, FALSE, 0);
 	gtk_widget_show(gtkchat->count);
 
diff -r 5e7a013bb75e -r d2b73439176d pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Sun Aug 17 19:12:24 2008 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sun Aug 17 19:15:03 2008 +0000
@@ -328,9 +328,6 @@
 
 ICONS_16 = icons/hicolor/16x16/apps/pidgin.png
 
-ICONS_22_SCALABLE = \
-		icons/hicolor/22x22/apps/scalable/pidgin.svg
-
 ICONS_22 = icons/hicolor/22x22/apps/pidgin.png
 
 ICONS_24_SCALABLE = \
diff -r 5e7a013bb75e -r d2b73439176d pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
Binary file pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png has changed
diff -r 5e7a013bb75e -r d2b73439176d pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
--- a/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg	Sun Aug 17 19:12:24 2008 +0000
+++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg	Sun Aug 17 19:15:03 2008 +0000
@@ -16,7 +16,7 @@
    inkscape:version="0.46"
    sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0/icons/24/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Bureaublad/pidgin16.png"
+   inkscape:export-filename="/home/hbons/Bureaublad/pidgin16-4.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    version="1.0"
@@ -24,6 +24,18 @@
   <defs
      id="defs4347">
     <linearGradient
+       id="linearGradient8739"
+       inkscape:collect="always">
+      <stop
+         id="stop8741"
+         offset="0"
+         style="stop-color:#602869;stop-opacity:1" />
+      <stop
+         id="stop8743"
+         offset="1"
+         style="stop-color:#3b1941;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        id="linearGradient8780">
       <stop
@@ -106,7 +118,7 @@
        inkscape:collect="always"
        id="linearGradient3116">
       <stop
-         style="stop-color:#82508e;stop-opacity:1;"
+         style="stop-color:#894599;stop-opacity:1"
          offset="0"
          id="stop3118" />
       <stop
@@ -238,11 +250,11 @@
        xlink:href="#linearGradient8989"
        id="linearGradient6512"
        x1="15.242517"
-       y1="38.888657"
-       x2="15.712908"
-       y2="42.28862"
+       y1="38.066795"
+       x2="15.242517"
+       y2="42.163002"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.474981,0,0,0.4591462,-0.4294391,-3.9567446)" />
+       gradientTransform="matrix(0.474981,0,0,0.4591462,0.5705609,-3.9567446)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6817"
@@ -472,12 +484,12 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3124"
        id="linearGradient3130"
-       x1="12.027549"
-       y1="36.059811"
+       x1="12.561858"
+       y1="39.998802"
        x2="12.561858"
        y2="42.352577"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5069392,0,0,0.4907885,-1.0208175,-4.88025)" />
+       gradientTransform="matrix(0.5069392,0,0,0.4907885,-2.0817467e-2,-4.88025)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5438"
@@ -496,17 +508,17 @@
        x2="13.166923"
        y2="16.608501"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8035512,0,0,0.6654138,-1.6328324,0.3496205)" />
+       gradientTransform="matrix(0.8035512,0,0,0.6654138,-0.6991237,0.3717176)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3116"
        id="linearGradient8774"
-       x1="10.386011"
-       y1="19.281519"
+       x1="10.624538"
+       y1="19.264456"
        x2="10.624538"
-       y2="22.99383"
+       y2="23.165424"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7506322,0,0,0.7602819,-0.6385933,-1.1609868)" />
+       gradientTransform="matrix(0.7506322,0,0,0.7602819,0.3614067,-1.1609868)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8776"
@@ -516,7 +528,7 @@
        fx="11.539145"
        fy="11.774944"
        r="9.5"
-       gradientTransform="matrix(1.1492907,-3.5818508e-2,2.1662967e-2,0.7172256,-5.3193915,-6.011096e-2)"
+       gradientTransform="matrix(1.1492907,-3.5818508e-2,2.1662967e-2,0.7172256,-4.3193915,-6.011096e-2)"
        gradientUnits="userSpaceOnUse" />
     <filter
        inkscape:collect="always"
@@ -546,7 +558,7 @@
        inkscape:collect="always"
        xlink:href="#linearGradient8760"
        id="linearGradient8766"
-       x1="9.8884134"
+       x1="10.025534"
        y1="24.3125"
        x2="12.26086"
        y2="24.3125"
@@ -613,32 +625,23 @@
        y2="-0.76288843" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8780"
-       id="linearGradient8812"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7398844,0,0,2.4505335,1.5688087,-0.5586962)"
-       x1="7.8234863"
-       y1="2.0748255"
-       x2="2.3125"
-       y2="-0.76288843" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8780"
+       xlink:href="#linearGradient8739"
        id="linearGradient8816"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7398844,0,0,1.62884,-1.0384755,0.8022337)"
-       x1="5.0478606"
-       y1="0.90161163"
-       x2="2.3125"
-       y2="-0.76288843" />
-    <filter
+       gradientTransform="matrix(1.2058295,0,0,3.3872105,-0.5868595,-0.5305442)"
+       x1="6.6287227"
+       y1="0.48644698"
+       x2="0.44665223"
+       y2="1.4697748" />
+    <linearGradient
        inkscape:collect="always"
-       id="filter8854">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.17684659"
-         id="feGaussianBlur8856" />
-    </filter>
+       xlink:href="#linearGradient8760"
+       id="linearGradient8735"
+       gradientUnits="userSpaceOnUse"
+       x1="9.778717"
+       y1="24.3125"
+       x2="12.178589"
+       y2="24.3125" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -648,8 +651,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="32"
-     inkscape:cx="8.3548738"
-     inkscape:cy="8.8817845"
+     inkscape:cx="17.336548"
+     inkscape:cy="7.0248271"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -690,28 +693,23 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient8816);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.1869581,3.4999999 C 4.4758051,3.4436567 4.5270059,3.2215108 4.6086619,3.0578895 C 4.7643714,2.7356494 4.9689549,2.591483 4.8639169,2.2636146 C 3.8104529,1.2597349 1.5105298,1.1429724 0.49999997,2.5358478"
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:url(#linearGradient8816);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 7.9293116,5.0795231 C 8.4000613,4.9623562 8.4835059,4.5003986 8.6165851,4.1601444 C 8.8703534,3.4900386 8.9850242,3.2527412 8.8138379,2.5709314 C 8.2219508,0.45209022 2.1611419,-0.88447008 1.4517269,2.9807965"
        id="path8814"
        sodipodi:nodetypes="cscc" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient8812);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 6.7942423,3.5 C 7.0830893,3.4152336 7.1342901,3.0810227 7.2159461,2.8348602 C 7.3716556,2.350061 7.5762391,2.1331676 7.4712011,1.639901 C 6.4177371,0.12959869 4.117814,-0.046066419 3.1072842,2.0494664"
-       id="path8778"
-       sodipodi:nodetypes="cscc" />
+       style="opacity:1;fill:url(#linearGradient8774);fill-opacity:1;stroke:url(#linearGradient3130);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.5832705,1.5 C 4.2253041,1.5 1.5,4.2484155 1.5,7.6348558 C 1.5,10.409353 1.5368298,15.204777 2.3493298,16.119387 C 2.9513142,16.119387 14.14629,17.5 15.510463,17.5 C 16.582197,17.5 15.529722,16.489173 15.529722,16.489173 C 15.529722,15.082448 14.037305,14.095385 13.065033,13.123113 C 12.31715,12.330145 13.159601,10.088797 13.159601,10.088797 C 13.484704,9.3379883 13.534521,8.6063333 13.534521,7.735143 C 13.534521,4.348703 10.941237,1.5 7.5832705,1.5 z"
+       id="path5176"
+       sodipodi:nodetypes="cccccccsc" />
     <path
-       style="opacity:1;fill:url(#linearGradient8774);fill-opacity:1;stroke:url(#linearGradient3130);stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6.5832705,1.5 C 3.2253041,1.5 0.49999997,4.2484155 0.49999997,7.6348558 C 0.49999997,10.409353 0.5203599,15.170761 2.0055798,16.650637 C 2.6075642,16.650637 13.14629,17.5 14.510463,17.5 C 15.582197,17.5 15.498472,16.489173 15.498472,16.489173 C 15.498472,16.003663 15.150137,15.547149 14.665783,15.115891 C 13.845097,14.385171 12.812918,13.91608 12.065033,13.123113 C 11.31715,12.330145 12.159601,10.088797 12.159601,10.088797 C 12.484704,9.3379883 12.534521,8.6063333 12.534521,7.735143 C 12.534521,4.348703 9.9412373,1.5 6.5832705,1.5 z"
-       id="path5176"
-       sodipodi:nodetypes="ccccsszcsc" />
-    <path
-       style="opacity:0.54300000000000004;fill:url(#radialGradient8782);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6.6952762,2.4999998 C 3.8395496,2.4999998 1.5080065,4.8304336 1.5001711,7.7371358 C 1.5001581,7.7420387 1.4997927,7.7465938 1.5001711,7.7514849 C 1.5001711,11.097502 1.4991737,14.462678 2.8618813,16.475208 C 3.7817213,16.475208 10.234965,16.461527 13.002192,16.461527 C 13.556593,16.461527 14.5,16.692971 14.5,16.020522 C 14.5,15.91871 14.405122,15.727275 14.143764,15.489634 C 13.882407,15.251993 13.491501,14.996814 13.060214,14.743522 C 11.761949,14.201252 10.86054,13.312811 10.81661,11.873858 C 10.874694,10.425059 11.718766,9.4318208 11.620458,7.8321281 C 11.620458,4.918572 9.5558183,2.4999998 6.6952762,2.4999998 z"
+       style="opacity:0.54299998999999999;fill:url(#radialGradient8782);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.6952762,2.4999998 C 4.8395496,2.4999998 2.5080065,4.8304336 2.5001711,7.7371358 C 2.5001581,7.7420387 2.4997927,7.7465938 2.5001711,7.7514849 C 2.5001711,11.097502 3.0181313,16.475208 3.0181313,16.475208 C 3.9379713,16.475208 10.734965,16.461527 13.502192,16.461527 C 14.056593,16.461527 15,16.692971 15,16.020522 C 15,15.91871 14.623872,16.133525 14.362514,15.895884 C 14.101157,15.658243 13.835251,15.059314 13.403964,14.806022 C 12.543199,14.263752 11.86054,13.312811 11.81661,11.873858 C 11.874694,10.425059 12.718766,9.4318208 12.620458,7.8321281 C 12.620458,4.918572 10.555818,2.4999998 7.6952762,2.4999998 z"
        id="path5241"
        sodipodi:nodetypes="cscccsscccc" />
     <path
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 7,7.6813065 C 7,9.0613074 5.8056217,9.9999999 4.9999997,9.9999999 C 3.896,9.9999999 3,8.8800008 3,7.4999999 C 3,6.3007578 3.6141981,4.9999999 4.718198,4.9999999 C 5.8221983,4.9999999 7,6.5910572 7,7.6813065 z"
+       d="M 7.9998599,7.6813275 C 7.9998599,9.061316 6.8055234,10 5.9999296,10 C 4.8959685,10 4,8.880011 4,7.5000225 C 4,6.3007912 4.6142095,4.9911617 5.7181378,5.0000449 C 8.059493,5.018459 7.9998599,6.5910879 7.9998599,7.6813275 z"
        id="path5157"
        sodipodi:nodetypes="csssc" />
     <path
@@ -723,22 +721,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(0.8057553,0,0,0.7927385,-3.1942432,-11.247142)" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.540313,5.5410017 C 10.882307,4.725799 9.8118332,4.9429841 9.391689,5.4635022 C 8.8159353,6.1768043 8.8826912,7.4173296 9.5406975,8.2325333 C 10.112514,8.9409561 11.05305,9.3125098 11.628804,8.599209 C 12.204558,7.8859064 12.060161,6.1850412 11.540313,5.5410017 z"
-       id="path3134"
-       sodipodi:nodetypes="csssc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3136"
-       sodipodi:cx="10.169642"
-       sodipodi:cy="24.3125"
-       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(0.8057555,0,0,0.7724139,1.8057544,-10.779314)" />
+       transform="matrix(0.8057553,0,0,0.7927385,-2.1942434,-11.247142)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="0.63276428"
@@ -746,23 +729,39 @@
        style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9040)"
        id="path8998"
        d="M 10.5,13.375 C 9.8833937,13.375 9.375,13.883394 9.375,14.5 C 9.375,15.116606 9.8833937,15.625 10.5,15.625 L 11.5,15.625 C 11.997417,15.625 12.351557,15.26606 12.5,14.8125 C 12.648443,15.26606 13.002583,15.625 13.5,15.625 L 14.5,15.625 C 15.116606,15.625 15.625,15.116606 15.625,14.5 C 15.625,13.883394 15.116606,13.375 14.5,13.375 L 13.5,13.375 C 13.002583,13.375 12.648443,13.73394 12.5,14.1875 C 12.351557,13.73394 11.997417,13.375 11.5,13.375 L 10.5,13.375 z"
-       transform="matrix(0.7360213,0,0,0.7376927,-0.5003328,-1.1368693)" />
+       transform="matrix(0.7360213,0,0,0.7376927,0.4333759,-1.1147722)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="0.58151811"
        inkscape:original="M 8.5 9 C 7.5744947 9 8.0888797 12.372263 4 10.3125 C 5.6494162 12.565197 8.197109 13 8.96875 13 C 9.7318012 13 11.759773 11.940619 12.03125 9.96875 C 9.8826905 12.168839 9.3373684 9 8.5 9 z "
        style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter8756)"
        id="path7960"
-       d="M 8.5,8.40625 C 8.2077387,8.40625 7.9340555,8.5866498 7.78125,8.75 C 7.6284445,8.9133502 7.5498385,9.0608344 7.46875,9.21875 C 7.3065731,9.5345811 7.172643,9.8595724 7,10.0625 C 6.827357,10.265428 6.671609,10.387141 6.28125,10.40625 C 5.890891,10.425359 5.2196564,10.269712 4.25,9.78125 C 4.0077291,9.6621096 3.7153231,9.7253647 3.5439557,9.9339859 C 3.3725882,10.142607 3.3673262,10.44173 3.53125,10.65625 C 4.4297328,11.883357 5.5774976,12.609102 6.59375,13.03125 C 7.6100024,13.453398 8.4737052,13.59375 8.96875,13.59375 C 9.6193922,13.59375 10.340813,13.267437 11.0625,12.6875 C 11.784187,12.107563 12.433247,11.228313 12.59375,10.0625 C 12.622923,9.8212663 12.499043,9.5873227 12.283116,9.4758765 C 12.067189,9.3644302 11.804734,9.3989754 11.625,9.5625 C 11.145204,10.053803 10.811541,10.151032 10.65625,10.15625 C 10.500959,10.161468 10.384244,10.105939 10.1875,9.90625 C 9.9907556,9.7065608 9.7866869,9.3846583 9.5625,9.09375 C 9.4504065,8.9482959 9.3464815,8.8194169 9.1875,8.6875 C 9.0285185,8.5555831 8.7880568,8.40625 8.5,8.40625 z" />
+       d="M 8.5,8.40625 C 8.2077387,8.40625 7.9340555,8.5866498 7.78125,8.75 C 7.6284445,8.9133502 7.5498385,9.0608344 7.46875,9.21875 C 7.3065731,9.5345811 7.172643,9.8595724 7,10.0625 C 6.827357,10.265428 6.671609,10.387141 6.28125,10.40625 C 5.890891,10.425359 5.2196564,10.269712 4.25,9.78125 C 4.0077291,9.6621096 3.7153231,9.7253647 3.5439557,9.9339859 C 3.3725882,10.142607 3.3673262,10.44173 3.53125,10.65625 C 4.4297328,11.883357 5.5774976,12.609102 6.59375,13.03125 C 7.6100024,13.453398 8.4737052,13.59375 8.96875,13.59375 C 9.6193922,13.59375 10.340813,13.267437 11.0625,12.6875 C 11.784187,12.107563 12.433247,11.228313 12.59375,10.0625 C 12.622923,9.8212663 12.499043,9.5873227 12.283116,9.4758765 C 12.067189,9.3644302 11.804734,9.3989754 11.625,9.5625 C 11.145204,10.053803 10.811541,10.151032 10.65625,10.15625 C 10.500959,10.161468 10.384244,10.105939 10.1875,9.90625 C 9.9907556,9.7065608 9.7866869,9.3846583 9.5625,9.09375 C 9.4504065,8.9482959 9.3464815,8.8194169 9.1875,8.6875 C 9.0285185,8.5555831 8.7880568,8.40625 8.5,8.40625 z"
+       transform="translate(0.9337088,2.2097087e-2)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.665364,5.6592388 C 12.000973,4.6508398 10.81971,4.941345 10.39549,5.5852216 C 9.8141493,6.4675705 9.881553,8.00209 10.545944,9.0104902 C 11.123309,9.8868033 12.156638,10.433807 12.737979,9.551461 C 13.319319,8.6691115 13.190256,6.4559104 12.665364,5.6592388 z"
+       id="path3134"
+       sodipodi:nodetypes="csssc" />
     <path
        style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 7,8.9999999 C 7,8.9999999 7,9.9999999 7,9.9999999 L 7.8944098,9.9999999 C 8.0595775,9.9999999 8.1925465,9.7769993 8.1925465,9.4999994 C 8.1925465,9.2229998 8.0595775,8.9999999 7.8944098,8.9999999 L 7,8.9999999 z M 9.0869564,8.9999999 C 8.9217887,8.9999999 8.7888198,9.2229998 8.7888198,9.4999994 C 8.7888198,9.7769993 8.9217887,9.9999999 9.0869564,9.9999999 L 10,9.9999999 C 10,9.9999999 10,9.1680138 10,8.9999999 L 9.0869564,8.9999999 z"
+       d="M 8,9 C 8,9 8,10 8,10 L 8.8944098,10 C 9.0595775,10 9.1925465,9.7769994 9.1925465,9.4999995 C 9.1925465,9.2229999 9.0595775,9 8.8944098,9 L 8,9 z M 10.086956,9 C 9.9217887,9 9.7888198,9.2229999 9.7888198,9.4999995 C 9.7888198,9.7769994 9.9217887,10 10.086956,10 L 11,10 C 11,10 11,9.1680139 11,9 L 10.086956,9 z"
        id="rect3140"
        sodipodi:nodetypes="cccscccscccc" />
     <path
        style="fill:url(#linearGradient8726);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 4,10.044836 C 7.9482547,12.604599 7.5624388,8.9999999 8.4879441,8.9999999 C 9.325312,8.9999999 9.8735375,12.174215 12.022097,9.9741258 C 11.75062,11.945995 9.7246757,13 8.9616245,13 C 8.1899831,13 5.6337912,12.860033 4,10.044836 z"
+       d="M 4.9337087,10.066933 C 8.8819634,12.626696 8.4961475,9.022097 9.4216528,9.022097 C 10.259021,9.022097 10.807246,12.196312 12.955806,9.9962228 C 12.684329,11.968092 10.658384,13.022097 9.8953332,13.022097 C 9.1236918,13.022097 6.5674999,12.88213 4.9337087,10.066933 z"
        id="path3142"
        sodipodi:nodetypes="czczc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#linearGradient8735);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8733"
+       sodipodi:cx="10.169642"
+       sodipodi:cy="24.3125"
+       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(0.8057555,0,0,0.7724141,2.8057548,-10.779318)" />
   </g>
 </svg>