[389-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.29, 1.30 GenericAuth.xul, 1.6, 1.7 hiddenWindow.xul, 1.1, 1.2

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/src/app/xul/esc/chrome/content/esc

Modified Files:
	ESC.js GenericAuth.xul hiddenWindow.xul 
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.


Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ESC.js	15 Mar 2010 20:51:27 -0000	1.29
+++ ESC.js	17 Mar 2010 00:43:52 -0000	1.30
@@ -4793,3 +4793,11 @@
 
 
 }
+
+function QuitApplication()
+{
+    Components
+        .classes['@mozilla.org/toolkit/app-startup;1']
+        .getService(Components.interfaces.nsIAppStartup)
+        .quit(Components.interfaces.nsIAppStartup.eForceQuit);
+}


Index: GenericAuth.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GenericAuth.xul	18 Apr 2009 23:25:15 -0000	1.6
+++ GenericAuth.xul	17 Mar 2010 00:43:53 -0000	1.7
@@ -24,7 +24,7 @@
     id="esc-window"
     title="&genericAuthTitle;"
     width="400"
-    height="240"
+    height="260"
     onload="UiLoad();"
     onunload="UiUnload();"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">


Index: hiddenWindow.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/hiddenWindow.xul,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hiddenWindow.xul	13 Sep 2006 17:59:41 -0000	1.1
+++ hiddenWindow.xul	17 Mar 2010 00:43:53 -0000	1.2
@@ -17,10 +17,27 @@
 <!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
 <window
     id="esc-window"
-    title="&escTitle;"
+    title=""
     onload="hiddenWindowStartup();"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
 <script src="TRAY.js"/>
- <script src="ESC.js"/>
+<script src="ESC.js"/>
+
+ <toolbox hidden="true">
+    <menubar>
+      <menuseparator/>
+      <menu id="menu_FilePopup" label="&macmenu.go;">
+        <menupopup id="go_menu">
+          <menuitem id="menu_go" label="&administerKeys;" oncommand="NotifyESCOfTrayEvent();"/>
+          <menuitem id="menu_mac_services" label="&macmenu.services;"/>
+          <menuitem id="menu_mac_hide_app" label="&macmenu.hide;" key="key_hideThisApp"/>
+          <menuitem id="menu_mac_hide_others" label="&macmenu.hideothers;" key="key_hideOtherApps"/>
+          <menuitem id="menu_mac_show_all" label="&macmenu.showall;"/>
+          <menuitem id="menu_FileQuitItem" label="&macmenu.quit;" key="key_quit" oncommand="QuitApplication();" />
+
+        </menupopup>
+     </menu>
+    </menubar>
+  </toolbox>
 </window>