From ee95cc59eb2d0f2efd39b281cd20028770427299 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Fri, 20 Feb 2009 10:17:20 +0000
Subject: [PATCH] Fix systray Setting menu item icon. Bug reported by Sebastien
 Mazy and Symphorien Wanko.

---
 resources/images/images.properties            |   1 +
 .../images/impl/gui/common/configureIcon.png  | Bin 0 -> 1036 bytes
 .../impl/systray/jdic/TrayMenuFactory.java    |  21 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 resources/images/impl/gui/common/configureIcon.png

diff --git a/resources/images/images.properties b/resources/images/images.properties
index f4fd97e3e..7ebd0e236 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -204,6 +204,7 @@ service.systray.MESSAGE_ICON=resources/images/impl/systray/envelope.png
 service.systray.MESSAGE_ICON_WINDOWS=resources/images/impl/systray/envelopeWindows.png
 service.systray.MESSAGE_ICON_MACOSX=resources/images/impl/systray/envelopeMacOSX.png
 service.systray.MESSAGE_ICON_MACOSX_WHITE=resources/images/impl/systray/envelopeMacOSXWhite.png
+service.systray.CONFIGURE_ICON=resources/images/impl/gui/common/configureIcon.png
 
 # dict protocol icons
 service.protocol.dict.PROTOCOL_ICON=resources/images/protocol/dict/dict-16x16.png
diff --git a/resources/images/impl/gui/common/configureIcon.png b/resources/images/impl/gui/common/configureIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..82fbd1df8cc9cb27b8a77c1c09f9de7c80be6410
GIT binary patch
literal 1036
zcmV+n1oQieP)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI100004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$To=HSOR5*=w
zQe8}21r+{zd%5ksx9z2+9hXtiSb~g5u-XT<geHU_D4Io$Y$RroS+kW<B|&iy^98$X
z(-#J*4!Q@JhM&1%&<HaohB%5fOEinNtXuJClp;TENl8n)-rnnrU9i(HIS=Q{`Mz^<
z&VeLJ$c4>jQ`Eow_H@Imj`Mr@z0uv>E!&&RBuN4Qyneh(y_!%>+>OxBi9$wRS(F&7
z)Ft0^yWLs*gOQPuLseB(=Lmv`27|#1ot>Rt5&(|b-qJ_2`msn>Q^(So^lqA<{@9j|
zath%a08;=kK0e;w+}!+$!C>G>l0-6@^a1b^ohN%slLaMXyVU+_mR6(~no4O|V*7w$
z_w<+JuBlvip6A=OS}g|vi9|y1`~6=703lNp+My~dW0i_DLl+1ooSd*2Gb1-92L^Lu
zr_))+^Sl)Rve_)WUhj83Jv~1F06`Ms7Nb<88JbEPRG@4x9?<okJo3uu=;-4B;BYud
zi^Vd`^E?-e#dhZA=02L8oo&sT6LK-N!6*yT4EZ3T&aOHQTKbkoqp7Z~t(|bWTt!x^
zb=Yh+KOc|BQ}grleQj-ReM3V-!b1Zolk`(UM5L0xUvyvmz~%G#j;^e%1oV1+U3q!A
z*J81B3W6YcJf5MBj*d&n10iOTcZ67QXk?&&3IObO`)^B2OYJ_NFJ>~CDkzE~78Vw+
zd%fQG^2Go^y4~&+fY0}mJCSgOuBJw&QmGIK1fbDqww~n0rvUu&$OQSs^qJ=O>zSXg
zXw<60Kp+sJX*y+K(kEJKi0`KcyPnRkfB1<2Fmw7)YrP?SO~)50?~%3HZ}02-_siB_
zYB6nClsW@~ac<3XSG0EYx`K~PFxl7eOr2`^lCF?ag4JSWSLNw?_rw16&3MboUzsqX
zAylwiB?q4nuMVF-#sAB|{mu(zb+rFVu~u#btHYfn?^(PjwgSM33tvQThtRYhj^0N!
zgi6(>`JhR>Ht0OX0f1Z`|5e?<-kz@H;udf`*5u`X-dx-Fn&XUXE!U;G@!014%xC^$
zV(YL{_CQgrmda&H_Swr5H?GS28>LCJa=95Ck2qsYcp}C(j`R#K<}a(V@%Zx1nXy<Y
zvC%?8AWFHcNv3402`#Z>0;@%aF2avd<JrTG%U}K1y#b)<?5$yMm>Uoyt3Wh_eOOnM
z%R<@5Br^8Z_+vjcIX*r2f8rdj?^ydX(qfp|mNS72HTgFRe~)+jb<aQm0000<MNUMn
GLSTXwMfckP

literal 0
HcmV?d00001

diff --git a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenuFactory.java b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenuFactory.java
index 26ecc3557..3e3efc88a 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenuFactory.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenuFactory.java
@@ -62,12 +62,9 @@ else if (itemName.equals("addContact"))
             if (dialog != null)
                 dialog.setVisible(true);
             else
-                SystrayActivator
-                    .getUIService()
-                    .getPopupDialog()
-                    .showMessagePopupDialog(
-                        Resources
-                            .getString("impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG"));
+                SystrayActivator.getUIService().getPopupDialog()
+                    .showMessagePopupDialog(Resources.getString(
+                        "impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG"));
         }
     }
 
@@ -94,7 +91,8 @@ private static void addSeparator(Object trayMenu)
             ((PopupMenu) trayMenu).addSeparator();
     }
 
-    public static Object createTrayMenu(SystrayServiceJdicImpl tray, boolean swing)
+    public static Object createTrayMenu(SystrayServiceJdicImpl tray,
+                                        boolean swing)
     {
     	swing = true;
         JPopupMenu trayMenu = new JPopupMenu();
@@ -107,7 +105,7 @@ public void actionPerformed(ActionEvent event)
         };
 
         add(trayMenu, createTrayMenuItem("settings", "service.gui.SETTINGS",
-            "service.gui.icons.QUICK_MENU_CONFIGURE_ICON", listener, swing));
+            "service.systray.CONFIGURE_ICON", listener, swing));
         add(trayMenu, createTrayMenuItem("addContact",
             "service.gui.ADD_CONTACT",
             "service.gui.icons.ADD_CONTACT_16x16_ICON", listener, swing));
@@ -121,8 +119,11 @@ public void actionPerformed(ActionEvent event)
         return trayMenu;
     }
 
-    private static Object createTrayMenuItem(String name, String textID, String iconID,
-        ActionListener listener, boolean swing)
+    private static Object createTrayMenuItem(   String name,
+                                                String textID,
+                                                String iconID,
+                                                ActionListener listener,
+                                                boolean swing)
     {
         String text = Resources.getString(textID);