From 45d8c9c8bd7c53fc97629dcd353ebffbebefb558 Mon Sep 17 00:00:00 2001
From: "jminta%gmail.com" <jminta%gmail.com>
Date: Thu, 19 Jan 2006 22:57:30 +0000
Subject: [PATCH] Bug 323976 Improve alarm window creation r=dmose

---
 calendar/resources/content/calAlarmMonitor.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/calendar/resources/content/calAlarmMonitor.js b/calendar/resources/content/calAlarmMonitor.js
index 0870fe666146..c2b15fd767f8 100644
--- a/calendar/resources/content/calAlarmMonitor.js
+++ b/calendar/resources/content/calAlarmMonitor.js
@@ -65,17 +65,18 @@ var alarmServiceObserver = {
         }
 
         //Check to see if an alarm window already exists.  It not, create it.
-        var wWatcher = Components.classes[
-                       "@mozilla.org/embedcomp/window-watcher;1"]
-                       .getService( Components.interfaces.nsIWindowWatcher );
-        var gAlarmWindow = wWatcher.getWindowByName( "calendar-alarm-window", null);
+
+        var wMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                                  .getService(Components.interfaces.nsIWindowMediator);
+        var gAlarmWindow = wMediator.getMostRecentWindow("calendarAlarmWindow");
         if( !gAlarmWindow ) {
+            var wWatcher = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                                     .getService(Components.interfaces.nsIWindowWatcher);
             gAlarmWindow = wWatcher.openWindow(null,
                                                "chrome://calendar/content/calendar-alarm-dialog.xul",
                                                "_blank",
                                                "chrome,dialog=yes,all",
                                                 null);
-            gAlarmWindow.name = "calendar-alarm-window";
 
         }
         gAlarmWindow.focus();