diff options
| author | Gian Mario Tagliaretti <gianmt@gnome.org> | 2009-02-22 21:36:19 +0000 |
|---|---|---|
| committer | Gian Mario Tagliaretti <gianmt@src.gnome.org> | 2009-02-22 21:36:19 +0000 |
| commit | 265f3d9012138035cde0b2488c22da945888b81f (patch) | |
| tree | 0c2940ccb4cf563b2b9f645848c5d798ef8e8d13 /examples/pygtk-demo | |
| parent | 33d6443cb07a9fba7a150c56e398b7d452c85d69 (diff) | |
| download | pygtk-265f3d9012138035cde0b2488c22da945888b81f.tar.gz | |
Bug 311008 – pygtk-demo fixes
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.
svn path=/trunk/; revision=3090
Diffstat (limited to 'examples/pygtk-demo')
| -rw-r--r-- | examples/pygtk-demo/demos/pixbufs.py | 4 | ||||
| -rw-r--r-- | examples/pygtk-demo/pygtk-demo.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/examples/pygtk-demo/demos/pixbufs.py b/examples/pygtk-demo/demos/pixbufs.py index c29d1dd8..311f4f8a 100644 --- a/examples/pygtk-demo/demos/pixbufs.py +++ b/examples/pygtk-demo/demos/pixbufs.py @@ -69,7 +69,7 @@ class PixbufsDemo(gtk.Window): 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 @@ class PixbufsDemo(gtk.Window): 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): diff --git a/examples/pygtk-demo/pygtk-demo.py b/examples/pygtk-demo/pygtk-demo.py index 282a14d2..34cb3d30 100644 --- a/examples/pygtk-demo/pygtk-demo.py +++ b/examples/pygtk-demo/pygtk-demo.py @@ -203,6 +203,8 @@ class PyGtkDemo(gtk.Window): 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 @@ class PyGtkDemo(gtk.Window): 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 @@ class PyGtkDemo(gtk.Window): def load_module(self, name): self.clear_buffers() - if name is None: return module = getattr(demos, name) if module.__doc__: self.insert_documentation(module) |