From 404923bb66231ee07153fc5ce59b2e31c7af0a48 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 23 Jun 2011 22:05:27 +0000
Subject: [PATCH] Fixes from audit

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1717 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/ui/AboutFrame.java         | 6 +++++-
 src/java/davmail/ui/NotificationDialog.java | 6 +++++-
 src/java/davmail/ui/SettingsFrame.java      | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/java/davmail/ui/AboutFrame.java b/src/java/davmail/ui/AboutFrame.java
index 7d7784fd..ce01d4f6 100644
--- a/src/java/davmail/ui/AboutFrame.java
+++ b/src/java/davmail/ui/AboutFrame.java
@@ -48,7 +48,11 @@ public class AboutFrame extends JFrame {
     public AboutFrame() {
         setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
         setTitle(BundleMessage.format("UI_ABOUT_DAVMAIL"));
-        setIconImage(DavGatewayTray.getFrameIcon());
+        try {
+            setIconImage(DavGatewayTray.getFrameIcon());
+        } catch (NoSuchMethodError error) {
+            DavGatewayTray.debug(new BundleMessage("LOG_UNABLE_TO_SET_ICON_IMAGE"));
+        }
         try {
             JLabel imageLabel = new JLabel();
             ClassLoader classloader = this.getClass().getClassLoader();
diff --git a/src/java/davmail/ui/NotificationDialog.java b/src/java/davmail/ui/NotificationDialog.java
index bbf28183..8c7801f2 100644
--- a/src/java/davmail/ui/NotificationDialog.java
+++ b/src/java/davmail/ui/NotificationDialog.java
@@ -67,7 +67,11 @@ public class NotificationDialog extends JDialog {
         setModal(true);
         setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
         setTitle(BundleMessage.format("UI_CALDAV_NOTIFICATION"));
-        setIconImage(DavGatewayTray.getFrameIcon());
+        try {
+            setIconImage(DavGatewayTray.getFrameIcon());
+        } catch (NoSuchMethodError error) {
+            DavGatewayTray.debug(new BundleMessage("LOG_UNABLE_TO_SET_ICON_IMAGE"));
+        }
 
         JPanel mainPanel = new JPanel();
         // add help (F1 handler)
diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java
index 1fb850d6..f488103a 100644
--- a/src/java/davmail/ui/SettingsFrame.java
+++ b/src/java/davmail/ui/SettingsFrame.java
@@ -566,7 +566,11 @@ public class SettingsFrame extends JFrame {
     public SettingsFrame() {
         setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
         setTitle(BundleMessage.format("UI_DAVMAIL_SETTINGS"));
-        setIconImage(DavGatewayTray.getFrameIcon());
+        try {
+            setIconImage(DavGatewayTray.getFrameIcon());
+        } catch (NoSuchMethodError error) {
+            DavGatewayTray.debug(new BundleMessage("LOG_UNABLE_TO_SET_ICON_IMAGE"));
+        }
 
         JTabbedPane tabbedPane = new JTabbedPane();
         // add help (F1 handler)