Updating branch refs/heads/master to be0e4aa9c86c6a51ed94b61f2d6311117b7c10d4 (commit) from bca7ae6c834c43f958e45ad50ab6d02ab85d9c8e (commit)
commit be0e4aa9c86c6a51ed94b61f2d6311117b7c10d4 Author: Christian Dywan <christ...@twotoasts.de> Date: Sat Mar 23 13:40:40 2013 +0100 Make invalid actions fail; abstract exit on error midori/midori-app.c | 18 ++++++++++++++---- midori/midori-app.h | 4 ++++ midori/midori-browser.c | 8 ++++---- midori/sokoke.c | 5 +---- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index df2a060..955f6fd 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -1439,10 +1439,20 @@ midori_app_setup (gint *argc, g_object_unref (factory); if (!success) - { - g_printerr ("%s - %s\n", _("Midori"), error->message); - exit (1); - } + midori_error (error->message); +} + +void +midori_error (const gchar* format, + ...) +{ + g_printerr ("%s - ", _("Midori")); + va_list args; + va_start (args, format); + g_vfprintf (stderr, format, args); + va_end (args); + g_printerr ("\n"); + exit (1); } gboolean diff --git a/midori/midori-app.h b/midori/midori-app.h index 3fc101e..8ec9f4b 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -96,6 +96,10 @@ midori_app_setup (gint *argc, gboolean midori_debug (const gchar* token); +void +midori_error (const gchar* format, + ...); + G_END_DECLS #endif /* __MIDORI_APP_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c8981c1..fef0009 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -559,14 +559,14 @@ _midori_browser_activate_action (MidoriBrowser* browser, if (enum_value != NULL) g_object_set (browser->settings, parts[0], enum_value->value, NULL); else - g_warning (_("Value '%s' is invalid for %s"), parts[1], parts[0]); + midori_error (_("Value '%s' is invalid for %s"), parts[1], parts[0]); } - else if (pspec != NULL) - g_warning (_("Value '%s' is invalid for %s"), parts[1], parts[0]); + else + midori_error (_("Value '%s' is invalid for %s"), parts[1], parts[0]); g_strfreev (parts); } else - g_warning (_("Unexpected action '%s'."), name); + midori_error (_("Unexpected action '%s'."), name); } static void diff --git a/midori/sokoke.c b/midori/sokoke.c index 0d76914..66636ba 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -557,10 +557,7 @@ sokoke_magic_uri (const gchar* uri, g_strfreev (parts); } if (!allow_search) - { - g_printerr ("%s - %s\n", _("Midori"), _("Invalid URI")); - exit (1); - } + midori_error (_("Invalid URI")); return NULL; } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits