diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rwxr-xr-x | gui.py | 10 | ||||
| -rw-r--r-- | iw/checklist.py | 2 | ||||
| -rw-r--r-- | iw/datacombo.py | 2 | ||||
| -rw-r--r-- | iw/ipwidget.py | 2 | ||||
| -rw-r--r-- | iw/pixmapRadioButtonGroup_gui.py | 2 | ||||
| -rw-r--r-- | iw/release_notes.py | 2 |
7 files changed, 18 insertions, 16 deletions
@@ -1,3 +1,17 @@ +2006-05-19 David Cantrell <dcantrell@redhat.com> + + * gui.py (handleRenderCallback): Sure would be nice if I could keep + indentation correct when modifying functions. Discontinue use of + gtk.gdk.threads_init() and use gobject.threads_init() because of our + use of callbacks. Remove threads_enter/leave wrapper around gtk.main() + + * iw/checklist.py: Remove threads_enter/leave wrapper around gtk.main() + since we're using gobject.threads_init() now. + * iw/datacombo.py: Likewise. + * iw/ipwidget.py: Likewise. + * iw/pixmapRadioButtonGroup.py: Likewise. + * iw/release_notes.py: Likewise. + 2006-05-18 Jeremy Katz <katzj@redhat.com> * anaconda.spec: Bump version. @@ -50,7 +50,7 @@ from release_notes import ReleaseNotesViewer import logging log = logging.getLogger("anaconda") -gtk.gdk.threads_init() +gobject.threads_init() isys.bind_textdomain_codeset("redhat-dist", "UTF-8") @@ -915,9 +915,9 @@ class InstallControlWindow: processEvents() time.sleep(1) takeScreenShot() - self.nextClicked() - else: - gobject.source_remove(self.handle) + self.nextClicked() + else: + gobject.source_remove(self.handle) def setScreen (self): (step, anaconda) = self.dispatch.currentStep() @@ -1071,9 +1071,7 @@ class InstallControlWindow: def run (self, runres): self.setup_window(runres) - gtk.threads_enter() gtk.main() - gtk.threads_leave() class InstallControlState: def __init__ (self, cw): diff --git a/iw/checklist.py b/iw/checklist.py index 1356ceafd..6e0dcfcdc 100644 --- a/iw/checklist.py +++ b/iw/checklist.py @@ -175,9 +175,7 @@ def main(): win.set_size_request(250, 250) win.show_all() - gtk.threads_enter() gtk.main() - gtk.threads_leave() if __name__ == "__main__": main() diff --git a/iw/datacombo.py b/iw/datacombo.py index 8f227c8ec..d33f53088 100644 --- a/iw/datacombo.py +++ b/iw/datacombo.py @@ -82,7 +82,5 @@ if __name__ == "__main__": win.add(cb) win.show_all() - gtk.threads_enter() gtk.main() - gtk.threads_leave() diff --git a/iw/ipwidget.py b/iw/ipwidget.py index eac92ac97..eab91da77 100644 --- a/iw/ipwidget.py +++ b/iw/ipwidget.py @@ -147,6 +147,4 @@ if __name__ == "__main__": win.add(vbox) win.show_all() - gtk.threads_enter() gtk.main() - gtk.threads_leave() diff --git a/iw/pixmapRadioButtonGroup_gui.py b/iw/pixmapRadioButtonGroup_gui.py index 95d066935..a62d6dca0 100644 --- a/iw/pixmapRadioButtonGroup_gui.py +++ b/iw/pixmapRadioButtonGroup_gui.py @@ -240,6 +240,4 @@ if __name__ == "__main__": win.add(vbox) win.show_all() - gtk.threads_enter() gtk.main() - gtk.threads_leave() diff --git a/iw/release_notes.py b/iw/release_notes.py index 632687eba..b191f2fca 100644 --- a/iw/release_notes.py +++ b/iw/release_notes.py @@ -242,9 +242,7 @@ class ReleaseNotesViewer(threading.Thread): cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) root.set_cursor(cursor) - gtk.threads_enter() gtk.main() - gtk.threads_leave() def resolveURI(self, link): parts = urlparse.urlparse(link) |