conduit r1676 - in trunk: . conduit/gtkui

[jstowers svn gnome org]

Author: jstowers
Date: Fri Aug 22 14:33:32 2008
New Revision: 1676
URL: http://svn.gnome.org/viewvc/conduit?rev=1676&view=rev

Log:
	* conduit/gtkui/UI.py: Set a default window icon.
	Fixes #548974


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 14:33:32 2008
@@ -80,8 +80,6 @@
         """
         gnome.ui.authentication_manager_init()        
 
-        self.conduitApplication = conduitApplication
-
         #add some additional dirs to the icon theme search path so that
         #modules can provider their own icons
         icon_dirs = [
@@ -92,7 +90,9 @@
                     ]
         for i in icon_dirs:                    
             gtk.icon_theme_get_default().prepend_search_path(i)
+        gtk.window_set_default_icon_name("conduit")
 
+        self.conduitApplication = conduitApplication
         self.gladeFile = os.path.join(conduit.SHARED_DATA_DIR, "conduit.glade")
         self.widgets = gtk.glade.XML(self.gladeFile, "MainWindow")
         
@@ -123,7 +123,6 @@
             if colormap:
                 gtk.widget_set_default_colormap(colormap)
         self.mainWindow.set_position(gtk.WIN_POS_CENTER)
-        self.mainWindow.set_icon_name("conduit")
         title = "Conduit"
         if conduit.IS_DEVELOPMENT_VERSION:
             title = title + " - %s (Development Version)" % conduit.VERSION