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

[Cris Dywan]

Enrich app error messages with filenames

[André Stösel (ivaldi)]

Looks good!

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-08-06 20:20:49 +0000
+++ extensions/apps.vala	2013-08-08 22:24:52 +0000
@@ -85,9 +85,9 @@
                     _("You can now run <b>%s</b> from your launcher or menu").printf (name));
             }
             catch (Error error) {
-                warning (_("Failed to create new launcher: %s").printf (error.message));
+                warning (_("Failed to create new launcher (%s): %s"), file.get_path (), error.message);
                 browser.send_notification (_("Error creating launcher"),
-                    _("Failed to create new launcher: %s").printf (error.message));
+                    _("Failed to create new launcher (%s): %s").printf (file.get_path (), error.message));
             }
         }
 
@@ -204,7 +204,7 @@
 #endif
                             }
                             catch (Error error) {
-                                GLib.critical (error.message);
+                                GLib.critical ("Failed to remove launcher (%s): %s", launcher.file.get_path (), error.message);
                             }
                             return true;
                         }
@@ -338,7 +338,7 @@
                 }
             }
             catch (Error error) {
-                warning ("Application changed: %s", error.message);
+                warning ("Application changed (%s): %s", file.get_path (), error.message);
             }
         }
 
@@ -369,7 +369,7 @@
                                 array.add_item (launcher);
                         }
                         catch (Error error) {
-                            warning ("Failed to parse launcher: %s", error.message);
+                            warning ("Failed to parse launcher (%s): %s", file.get_path (), error.message);
                         }
                     }
                 }