Changeset 309 for trunk/uigtk.py

Timestamp:

08/03/09 11:06:45 (3 years ago)

Author:

marc

Message:

Improved spec file, removed unused images from installation, fixed a bug with secure images not being shown in ntotifications, bumped changelog, and improved debian/rules build on converting images

File:

• trunk/uigtk.py (modified) (3 diffs)

trunk/uigtk.py

@@ -1418 +1418 @@
         if self.configuration['server']['authentication']:
             self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, "itaka-secure.png"))            
+            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-secure.png'))
         else:
             self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, "itaka.png"))
-
-        self.status_icon.set_from_pixbuf(self.icon_pixbuf)
+            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka.png'))
+
         # Only run this event once
         return False
@@ -1439 +1440 @@
         """
 
-        self.log.verbose_message(_('Screenshot served to %s') % ip, _('Screenshot number %(number)d served to %(ip)s') % {'number': counter, 'ip':ip}, ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, "itaka16x16-take.png"))])
+        if self.configuration['server']['authentication']:
+            self.log.verbose_message(_('Screenshot served to %s') % ip, _('Screenshot number %(number)d served to %(ip)s') % {'number': counter, 'ip':ip}, ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, "itaka16x16-secure-take.png"))])
+        else:
+            self.log.verbose_message(_('Screenshot served to %s') % ip, _('Screenshot number %(number)d served to %(ip)s') % {'number': counter, 'ip':ip}, ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, "itaka16x16-take.png"))])
 
         self.label_served.set_text(_('<b>Served</b>: %d') % (counter))
@@ -1450 +1454 @@
         if self.configuration['server']['authentication']:
             self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-secure-take.png'))
+            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-secure-take.png'))
         else:
             self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-take.png'))
-
-        self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-take.png'))
+            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-take.png'))
+
         gobject.timeout_add(1500, self.set_standard_images)