summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@top>2005-12-28 14:20:22 +0100
committerMichael Vogt <egon@top>2005-12-28 14:20:22 +0100
commitd35fd5785f9e6fc4a0cf44da509b6b06692b0fa2 (patch)
tree8871833aafb82e9a03295a12e21df125f0a5a923
parent730b4f54e44d70bf0a410faba1dd979c89d73b96 (diff)
downloadpython-apt-d35fd5785f9e6fc4a0cf44da509b6b06692b0fa2.tar.gz
* SoftwareProperties/dialog_add.py:
- fix a problem with transient/parent window (ubuntu #21585)
-rw-r--r--SoftwareProperties/dialog_add.py7
-rw-r--r--debian/changelog8
2 files changed, 12 insertions, 3 deletions
diff --git a/SoftwareProperties/dialog_add.py b/SoftwareProperties/dialog_add.py
index 4a860680..9b384623 100644
--- a/SoftwareProperties/dialog_add.py
+++ b/SoftwareProperties/dialog_add.py
@@ -31,9 +31,9 @@ import aptsources
class dialog_add:
def __init__(self, parent, sourceslist, datadir):
- print datadir
self.sourceslist = sourceslist
-
+ self.parent = parent
+
# templates
self.templatelist = aptsources.SourceEntryTemplates(datadir)
@@ -43,7 +43,7 @@ class dialog_add:
self.gladexml = gtk.glade.XML("%s/glade/SoftwarePropertiesDialogs.glade" % datadir)
self.main = widget = self.gladexml.get_widget("dialog_add")
- self.main.set_transient_for(parent)
+ self.main.set_transient_for(self.parent)
combo = self.gladexml.get_widget("combobox_what")
self.gladexml.signal_connect("on_combobox_what_changed", self.on_combobox_what_changed, None)
@@ -84,6 +84,7 @@ class dialog_add:
# this hide here is ugly :/
self.main.hide()
dialog = self.gladexml.get_widget("dialog_add_custom")
+ dialog.set_transient_for(self.parent)
res = dialog.run()
dialog.hide()
entry = self.gladexml.get_widget("entry_source_line")
diff --git a/debian/changelog b/debian/changelog
index f5a3dd0e..b9c314d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+update-manager (0.40.2) dapper; urgency=low
+
+ * SoftwareProperties/SoftwareProperties.py:
+ - fix a problem with transient/parent window in custom apt line
+ dialog (ubuntu #21585)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Dec 2005 14:19:06 +0100
+
update-manager (0.40.1) dapper; urgency=low
* SoftwareProperties/SoftwareProperties.py: