Fix systray Setting menu item icon. Bug reported by Sebastien Mazy and Symphorien Wanko.

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

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);