pygtk r3090 - in trunk: . examples/pygtk-demo examples/pygtk-demo/demos

[gianmt svn gnome org]

Author: gianmt
Date: Sun Feb 22 21:36:19 2009
New Revision: 3090
URL: http://svn.gnome.org/viewvc/pygtk?rev=3090&view=rev

Log:
2009-02-22  Gian Mario Tagliaretti  <gianmt gnome org>

	Bug 311008 â pygtk-demo fixes
	
	* examples/pygtk-demo/pygtk-demo.py: Apply a patch from Andi Albrecht.
	
	* examples/pygtk-demo/demos/pixbufs.py: Remove deprecation Warnings.



Modified:
   trunk/ChangeLog
   trunk/examples/pygtk-demo/demos/pixbufs.py
   trunk/examples/pygtk-demo/pygtk-demo.py

Modified: trunk/examples/pygtk-demo/demos/pixbufs.py
==============================================================================
--- trunk/examples/pygtk-demo/demos/pixbufs.py	(original)
+++ trunk/examples/pygtk-demo/demos/pixbufs.py	Sun Feb 22 21:36:19 2009
@@ -69,7 +69,7 @@
             da.connect("expose_event", self.expose_cb)
             self.add(da)
 
-            self.timeout_id = gtk.timeout_add(FRAME_DELAY, self.timeout)
+            self.timeout_id = gobject.timeout_add(FRAME_DELAY, self.timeout)
 
             self.show_all()
 
@@ -120,7 +120,7 @@
 
     def cleanup_callback(self, win):
         if self.timeout_id is not None:
-            gtk.timeout_remove(self.timeout_id)
+            gobject.source_remove(self.timeout_id)
             self.timeout_id = None
 
     def timeout(self):

Modified: trunk/examples/pygtk-demo/pygtk-demo.py
==============================================================================
--- trunk/examples/pygtk-demo/pygtk-demo.py	(original)
+++ trunk/examples/pygtk-demo/pygtk-demo.py	Sun Feb 22 21:36:19 2009
@@ -203,6 +203,8 @@
         module_name  = model.get_value(iter, MODULE_COLUMN)
         func_name    = model.get_value(iter, FUNC_COLUMN)
         italic_value = model.get_value(iter, ITALIC_COLUMN)
+        if module_name is None:  # a "category" row is activated
+            return True
         try:
             self.module_cache[module_name].present()
         except KeyError:
@@ -221,7 +223,8 @@
             return False
 
         name = model.get_value(iter, MODULE_COLUMN)
-        self.load_module(name)
+        if name is not None:
+            self.load_module(name)
 
     def window_closed_cb (self, window, model, path):
         iter = model.get_iter(path)
@@ -306,7 +309,6 @@
 
     def load_module(self, name):
         self.clear_buffers()
-        if name is None: return
         module = getattr(demos, name)
         if module.__doc__:
             self.insert_documentation(module)