conduit r1666 - in trunk: . conduit/gtkui

[jstowers svn gnome org]

Author: jstowers
Date: Fri Aug 22 01:02:08 2008
New Revision: 1666
URL: http://svn.gnome.org/viewvc/conduit?rev=1666&view=rev

Log:
	* conduit/gtkui/UI.py: Remove About entry in tray icon menu.
	Fixes #547618


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/gtkui/UI.py

Modified: trunk/conduit/gtkui/UI.py
==============================================================================
--- trunk/conduit/gtkui/UI.py	(original)
+++ trunk/conduit/gtkui/UI.py	Fri Aug 22 01:02:08 2008
@@ -616,8 +616,6 @@
                <menuitem action="Sync"/>
                <menuitem action="Cancel"/>
                <menuitem action="Quit"/>
-               <separator/>
-               <menuitem action="About"/>
               </menu>
              </menubar>
             </ui>
@@ -626,14 +624,13 @@
             ('Menu',  None, 'Menu'),
             ('Sync', gtk.STOCK_EXECUTE, _("_Synchronize All"), None, _("Synchronizes All Groups"), self.on_synchronize),
             ('Cancel', gtk.STOCK_CANCEL, _("_Cancel Synchronization"), None, _("Cancels Currently Synchronizing Groups"), self.on_cancel),
-            ('Quit', gtk.STOCK_QUIT, _("_Quit"), None, _("Close Conduit"), self.on_quit),
-            ('About', gtk.STOCK_ABOUT, _("_About"), None, _("About Conduit"), self.on_about)]
+            ('Quit', gtk.STOCK_QUIT, _("_Quit"), None, _("Close Conduit"), self.on_quit)]
         ag = gtk.ActionGroup('Actions')
         ag.add_actions(actions)
         self.manager = gtk.UIManager()
         self.manager.insert_action_group(ag, 0)
         self.manager.add_ui_from_string(menu)
-        self.menu = self.manager.get_widget('/Menubar/Menu/About').props.parent
+        self.menu = self.manager.get_widget('/Menubar/Menu/Quit').props.parent
         self.cancelButton = self.manager.get_widget('/Menubar/Menu/Cancel')   
         self.connect('popup-menu', self.on_popup_menu)
         self.connect('activate', self.on_click)
@@ -709,11 +706,6 @@
     def on_quit(self, data):
         self.conduitApplication.Quit()
 
-    def on_about(self, data):
-        dialog = AboutDialog()
-        dialog.run()
-        dialog.destroy()
-        
     def on_click(self, status):
         if self.conduitApplication.HasGUI():
             if self.conduitApplication.gui.is_visible():