Changeset 309 for branches/release/0.2/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:

• branches/release/0.2/uigtk.py (modified) (4 diffs)

branches/release/0.2/uigtk.py

@@ -318 +318 @@
         else:
             self.statusIcon.set_from_pixbuf(self.icon_pixbuf)
+
         self.statusIcon.set_tooltip('Itaka')
         self.statusIcon.set_visible(True)
@@ -1291 +1292 @@
         if self.configuration['server']['authentication']:
             self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, "itaka-secure.png"))            
+            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-secure.png'))
         else:
             self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, "itaka.png"))
-
-        self.statusIcon.set_from_pixbuf(self.icon_pixbuf)
+            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka.png'))
+
         # Only run this event once
         return False
@@ -1317 +1319 @@
         self.time = time
 
-        self.log.detailed_message('Screenshot served to %s' % (self.ip), 'Screenshot number %d served to %s' % (self.counter, self.ip), ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itakaglobals.image_dir, "itaka16x16-take.png"))])
+        if self.configuration['server']['authentication']:
+            self.log.detailed_message('Screenshot served to %s' % (self.ip), 'Screenshot number %d served to %s' % (self.counter, self.ip), ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itakaglobals.image_dir, "itaka16x16-secure-take.png"))])
+        else:
+            self.log.detailed_message('Screenshot served to %s' % (self.ip), 'Screenshot number %d served to %s' % (self.counter, self.ip), ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itakaglobals.image_dir, "itaka16x16-take.png"))])
 
         self.labelServed.set_text('<b>Served</b>: %d' % (self.counter))
@@ -1328 +1333 @@
         if self.configuration['server']['authentication']:
             self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-secure-take.png'))
+            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-secure-take.png'))
         else:
             self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-take.png'))
-        self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-take.png'))
+            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-take.png'))
         gobject.timeout_add(1500, self.set_standard_images)