From 9e979232b2ab005299e1ef164431431fe7e41b27 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 29 May 2005 19:07:54 +0000
Subject: [PATCH] Fixed import.

Simulate combo model.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/injector/head/injector-gui@250 9f8c893c-44ee-0310-b757-c8ca8341c71e
---
 combo_compat.py | 5 +++++
 download_box.py | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/combo_compat.py b/combo_compat.py
index 12ace6c..de93ab7 100644
--- a/combo_compat.py
+++ b/combo_compat.py
@@ -44,10 +44,12 @@ class ComboText(gtk.OptionMenu):
 	def __init__(self):
 		gtk.OptionMenu.__init__(self)
 		self.__menu = gtk.Menu()
+		self.__model = []
 		self.set_menu(self.__menu)
 
 	def append_text(self, text):
 		item = gtk.MenuItem(text)
+		self.__model.append([text])
 		self.__menu.append(item)
 
 	def set_active(self, i):
@@ -55,6 +57,9 @@ class ComboText(gtk.OptionMenu):
 	
 	def get_active(self):
 		return self.get_history()
+	
+	def get_model(self):
+		return self.__model
 
 def combo_box_new_text():
 	return ComboText()
diff --git a/download_box.py b/download_box.py
index ed62932..77072f2 100644
--- a/download_box.py
+++ b/download_box.py
@@ -2,7 +2,7 @@ import gtk
 import os
 
 from zeroinstall.injector.model import SafeException
-from zeroinstall.injector import download
+from zeroinstall.injector import download, run
 from gui import policy, pretty_size
 from dialog import Dialog
 
@@ -27,7 +27,6 @@ def download_with_gui(mainwindow, prog_args, run_afterwards):
 		if not run_afterwards:
 			mainwindow.destroy()
 			return
-		import run
 		try:
 			run.execute(policy, prog_args)
 			mainwindow.destroy()
-- 
2.11.4.GIT