Merge lp:~evfool/update-manager/fix817785 into lp:update-manager

[Robert Roth]

Fix for a crash appearing, when distUpgrade is waiting for input for a yes/no question and should forward it to the VteTerminal.
The feed_child method used in this case takes two parameters, the string to send and the length of the string. [1]
With the old python bindings, feed_child had the second parameter default to -1 (that is why it was working until now) [2], but the GObject introspection based bindings do not support the default parameter value annotation yet [3], so until it gets implemented, we have to specify the -1 value to let the function calculate the length of the string (must be null-terminated) [4].

[1] http://developer.gnome.org/vte/unstable/VteTerminal.html#vte-terminal-feed-child
[2] http://git.gnome.org/browse/vte/tree/python/vte.defs#n109
[3] https://bugzilla.gnome.org/show_bug.cgi?id=558620
[4] http://git.gnome.org/browse/vte/tree/src/vte.c#n4868

=== modified file 'DistUpgrade/DistUpgradeViewGtk.py'
--- DistUpgrade/DistUpgradeViewGtk.py	2011-07-27 08:52:35 +0000
+++ DistUpgrade/DistUpgradeViewGtk.py	2011-08-09 08:41:36 +0000
@@ -253,9 +253,9 @@
         self.time_ui += time.time() - start
         # if replace, send this to the terminal
         if res == gtk.RESPONSE_YES:
-          self.term.feed_child("y\n")
+          self.term.feed_child("y\n", -1)
         else:
-          self.term.feed_child("n\n")
+          self.term.feed_child("n\n", -1)
         
     def fork(self):
         pid = self.term.forkpty(envv=self.env)

=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
--- DistUpgrade/DistUpgradeViewGtk3.py	2011-07-27 08:52:35 +0000
+++ DistUpgrade/DistUpgradeViewGtk3.py	2011-08-09 08:41:36 +0000
@@ -256,9 +256,9 @@
         self.time_ui += time.time() - start
         # if replace, send this to the terminal
         if res == Gtk.ResponseType.YES:
-            self.term.feed_child("y\n")
+            self.term.feed_child("y\n", -1)
         else:
-            self.term.feed_child("n\n")
+            self.term.feed_child("n\n", -1)
 
     def fork(self):
         pty = Vte.Pty.new(Vte.PtyFlags.DEFAULT)