From 86f93ce8902e26799f6b59cbf78733c7d65d75a9 Mon Sep 17 00:00:00 2001
From: lxnay <lxnay@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Sat, 20 Sep 2008 11:24:50 +0000
Subject: [PATCH] Entropy/Spritz: - fix voting inside PkgInfo window - fix
 random GTK freezes (thanks Joost)

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2408 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 spritz/src/dialogs.py |  3 ++-
 spritz/src/spritz.py  | 31 ++++++++++++++++++++++---------
 spritz/src/views.py   |  4 ++++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/spritz/src/dialogs.py b/spritz/src/dialogs.py
index ec2434ee0..0d767be44 100644
--- a/spritz/src/dialogs.py
+++ b/spritz/src/dialogs.py
@@ -85,7 +85,8 @@ class PkgInfoMenu(MenuSkel):
         self.pkginfo_ui.signal_autoconnect(self._getAllMethods())
         self.pkginfo_ui.pkgInfo.set_transient_for(self.window)
         self.pkginfo_ui.pkgInfo.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-        self.pkginfo_ui.pkgInfo.connect('button-press-event', self.on_button_press)
+        # noeeees! otherwise voting won't work
+        #self.pkginfo_ui.pkgInfo.connect('button-press-event', self.on_button_press)
         self.setupPkgPropertiesView()
 
     def set_pixbuf_to_cell(self, cell, path):
diff --git a/spritz/src/spritz.py b/spritz/src/spritz.py
index 30928e34e..8c3779741 100644
--- a/spritz/src/spritz.py
+++ b/spritz/src/spritz.py
@@ -1,7 +1,9 @@
 #!/usr/bin/python -tt
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
+#    It was: Yum Exteder (yumex) - A GUI for yum
 #    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Now is: Spritz (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -38,7 +40,6 @@ from entropy_i18n import _
 
 # GTK Imports
 import gtk, gobject
-gtk.gdk.threads_init()
 from etpgui.widgets import UI, Controller
 from etpgui import *
 from spritz_setup import fakeoutfile, fakeinfile, cleanMarkupString
@@ -70,7 +71,12 @@ class SpritzController(Controller):
         self.pty = pty.openpty()
         self.output = fakeoutfile(self.pty[1])
         self.input = fakeinfile(self.pty[1])
-        if "--debug" not in sys.argv:
+        self.do_debug = False
+        if "--debug" in sys.argv:
+            self.do_debug = True
+        elif os.getenv('SPRITZ_DEBUG') != None:
+            self.do_debug = True
+        if not self.do_debug:
             sys.stdout = self.output
             sys.stderr = self.output
             sys.stdin = self.input
@@ -89,16 +95,14 @@ class SpritzController(Controller):
         gtkEventThread.doQuit()
         if self.isWorking:
             self.quitNow = True
-            self.exitNow()
-        else:
-            self.exitNow()
+
+        self.exitNow()
 
     def exitNow(self):
         try:
             gtk.main_quit()       # Exit gtk
         except RuntimeError,e:
             pass
-        raise SystemExit
 
     def __getSelectedRepoIndex( self ):
         selection = self.repoView.view.get_selection()
@@ -1208,6 +1212,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
             pass
 
     def ad_rotation(self):
+
         while self.isWorking:
             time.sleep(1)
 
@@ -1243,6 +1248,8 @@ class SpritzApplication(SpritzController,SpritzGUI):
                 tries -= 1
                 continue
 
+            gtk.gdk.threads_enter()
+
             self.ui.bannerEventBox.remove(self.ad_pix)
             self.ad_pix = myadpix
             self.ui.bannerEventBox.add(self.ad_pix)
@@ -1257,6 +1264,8 @@ class SpritzApplication(SpritzController,SpritzGUI):
                         pass
             self.previous_ad_image_path = pix_tmp_path
             self.previous_ad_index = myrand
+
+            gtk.gdk.threads_leave()
             break
 
     def spawnUgcUpdate(self):
@@ -1266,6 +1275,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
             pass
 
     def ugc_update(self):
+
         while (self.spawning_ugc or self.isWorking):
             time.sleep(1)
 
@@ -1921,18 +1931,21 @@ if __name__ == "__main__":
         except gobject.GError:
             pass
         mainApp = SpritzApplication()
+        gobject.threads_init()
+        gtk.gdk.threads_enter()
         gtk.main()
+        gtk.gdk.threads_leave()
         killThreads()
     except SystemExit:
         print "Quit by User"
         gtkEventThread.doQuit()
         killThreads()
-        sys.exit(1)
+        raise SystemExit
     except KeyboardInterrupt:
         print "Quit by User (KeyboardInterrupt)"
         gtkEventThread.doQuit()
         killThreads()
-        sys.exit(1)
+        raise SystemExit
     except: # catch other exception and write it to the logger.
 
         etype = sys.exc_info()[0]
diff --git a/spritz/src/views.py b/spritz/src/views.py
index f07ac144c..f93351825 100644
--- a/spritz/src/views.py
+++ b/spritz/src/views.py
@@ -551,7 +551,9 @@ class EntropyPackageView:
             msg = "<small><span foreground='#339101'><b>%s</b></span>: %s</small>" % (_("Vote registered successfully"),obj.voted,)
         else:
             msg = "<small><span foreground='#FF0000'><b>%s</b></span>: %s</small>" % (_("Error registering vote"),err_msg,)
+        gtk.gdk.threads_enter()
         self.ui.UGCMessageLabel.set_markup(msg)
+        gtk.gdk.threads_leave()
         t = self.Equo.entropyTools.parallelTask(self.refresh_vote_info, obj)
         t.parallel_wait()
         t.start()
@@ -560,8 +562,10 @@ class EntropyPackageView:
     def refresh_vote_info(self, obj):
         time.sleep(5)
         obj.voted = 0
+        gtk.gdk.threads_enter()
         self.queueView.refresh()
         self.view.queue_draw()
+        gtk.gdk.threads_leave()
 
     def clear(self):
         self.store.clear()