From edf9ab86245f3227dfdfb87abe5791824aa27339 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 29 May 2005 17:40:41 +0000
Subject: [PATCH] Fixed import.

Added compat version of GtkCombo, for older pygtk versions.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/injector/head/injector-gui@247 9f8c893c-44ee-0310-b757-c8ca8341c71e
---
 0launch-gui     |  3 +++
 combo_compat.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 trust_box.py    |  3 +--
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 combo_compat.py

diff --git a/0launch-gui b/0launch-gui
index 524bdbe..5852014 100755
--- a/0launch-gui
+++ b/0launch-gui
@@ -23,6 +23,9 @@ from zeroinstall.injector import model
 from gui import GUIPolicy
 import gui, gtk
 
+if not hasattr(gtk, 'combo_box_new_text'):
+	import combo_compat
+
 gtk.rc_parse_string('style "scrolled" { '
 		    'GtkScrolledWindow::scrollbar-spacing = 0}\n'
 		    'class "GtkScrolledWindow" style : gtk "scrolled"\n')
diff --git a/combo_compat.py b/combo_compat.py
new file mode 100644
index 0000000..1fa5a13
--- /dev/null
+++ b/combo_compat.py
@@ -0,0 +1,50 @@
+import gtk, gobject
+
+class Action(gobject.GObject):
+	__gproperties__ = {
+          'sensitive' : (gobject.TYPE_BOOLEAN,		# type
+                    'sensitive',                        # nick name
+                    'sensitive', 			# description
+                    True,                               # default value
+                    gobject.PARAM_READWRITE)            # flags
+	}
+
+	__gsignals__ = {
+	  'activate' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ())
+	}
+
+	def __init__(self, name, label, tooltip, stock_id):
+		gobject.GObject.__init__(self)
+	
+	def do_get_property(self, property):
+		return getattr(self, property.name)
+
+	def do_set_property(self, property, value):
+		return setattr(self, property.name, value)
+	
+	def connect_proxy(self, widget):
+		print "connect_proxy", widget
+
+gobject.type_register(Action)
+
+class ComboText(gtk.OptionMenu):
+	def __init__(self):
+		gtk.OptionMenu.__init__(self)
+		self.__menu = gtk.Menu()
+		self.set_menu(self.__menu)
+
+	def append_text(self, text):
+		item = gtk.MenuItem(text)
+		self.__menu.append(item)
+
+	def set_active(self, i):
+		self.set_history(i)
+	
+	def get_active(self):
+		return self.get_history()
+
+def combo_box_new_text():
+	return ComboText()
+
+gtk.combo_box_new_text = combo_box_new_text
+gtk.Action = Action
diff --git a/trust_box.py b/trust_box.py
index c3352e2..f6a3e17 100644
--- a/trust_box.py
+++ b/trust_box.py
@@ -1,10 +1,9 @@
 import gtk
 from zeroinstall.injector.model import SafeException
+from zeroinstall.injector import gpg, trust
 
 import gui
 import dialog
-import gpg
-import trust
 
 def pretty_fp(fp):
 	s = fp[0:4]
-- 
2.11.4.GIT