Merge lp:~stefan-schwarzburg/qreator/fixes_1173709 into lp:qreator

[Schwarzburg]

This branch fixes a stupid mistake: I used return as a function "return()" instead of a statement "return ".
Somehow this resulted in problems with the Gtk code: the function "_shorten_and_display" was started via "idle_add", which either expects "False" (do not run again) or "True" (run again). Calling "return " seems to count as "False", however "return()", which returns an empty list, does not count as "False", but also not as "True". This somehow caused Gtk to crash.

[David Planella (dpm)]

Thanks for looking into this! An easy error to fix, but it must have been a hard one to catch.

review: Approve

=== modified file 'qreator/qrcodes/QRCodeURLGtk.py'
--- qreator/qrcodes/QRCodeURLGtk.py	2013-05-08 18:21:38 +0000
+++ qreator/qrcodes/QRCodeURLGtk.py	2013-05-09 07:37:27 +0000
@@ -179,7 +179,7 @@
                 _("A network connection error occured: {0}".format(e)))
             self.messagedialog.show()
             GObject.idle_add(self._reset_shortener)
-            return()
+            return
         except Exception as e:
             # TRANSLATORS: leave '{0}' as it is, it will be replaced by the
             # exception's error message
@@ -187,7 +187,7 @@
                 _("An error occured while trying to shorten the URL: {0}".format(e)))   # pylint: disable=E0501
             self.messagedialog.show()
             GObject.idle_add(self._reset_shortener)
-            return()
+            return
         self.entry.set_tooltip_text(self.long_address)
         self.entry.set_has_tooltip(True)
         self.entry.set_text(self.short_address)