Merge lp:~kalikiana/midori/duplicatebrowser into lp:midori

[Cris Dywan]

Avoid declaring browser twice within the same function

Avoid declaring browser twice within the same function

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-05-31 11:58:17 +0000
+++ extensions/apps.vala	2013-06-03 20:46:27 +0000
@@ -38,11 +38,11 @@
                 Categories=Network;
                 """.printf (name, exec, PACKAGE_NAME, icon_name);
             var file = folder.get_child (filename);
+            var browser = proxy.get_toplevel () as Midori.Browser;
             try {
                 var stream = yield file.replace_async (null, false, GLib.FileCreateFlags.NONE);
                 yield stream.write_async (contents.data);
 
-                var browser = proxy.get_toplevel () as Midori.Browser;
                 browser.send_notification (_("Launcher created"),
                     _("You can now run <b>%s</b> from your launcher or menu").printf (name));
                 /* TODO: Use infobar; currently hits gtk_widget_get_realized: assertion `GTK_IS_WIDGET (widget)' failed
@@ -50,7 +50,6 @@
                     _("You can now run <b>%s</b> from your launcher or menu").printf (name), null, null, null); */
             }
             catch (Error error) {
-                var browser = proxy.get_toplevel () as Midori.Browser;
                 browser.send_notification (_("Error creating launcher"),
                     _("Failed to create new launcher: %s").printf (error.message));
             }