[Xfce4-commits] <midori:master> Handle app setup errors in midori_app_setup
Christian Dywan
noreply at xfce.org
Sun Nov 18 19:08:01 CET 2012
Updating branch refs/heads/master
to bf3fe2d5d1629c22623f2c57a056f8b4a2f4ad35 (commit)
from 7da354001f7cebfff1b61729aeacd129b7926b62 (commit)
commit bf3fe2d5d1629c22623f2c57a056f8b4a2f4ad35
Author: Christian Dywan <christian at twotoasts.de>
Date: Sun Nov 18 18:57:40 2012 +0100
Handle app setup errors in midori_app_setup
midori/main.c | 7 +------
midori/midori-app.c | 15 ++++++++-------
midori/midori-app.h | 5 ++---
midori/midori-bookmarks.c | 1 +
midori/midori.vapi | 2 +-
tests/bookmarks.c | 2 +-
tests/browser.c | 2 +-
tests/extensions.c | 2 +-
tests/magic-uri.c | 2 +-
tests/properties.c | 2 +-
10 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index dc85aab..bc34c26 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1846,12 +1846,7 @@ main (int argc,
block_uris = NULL;
inactivity_reset = 0;
error = NULL;
- if (!midori_app_setup (&argc, &argv, entries, &error))
- {
- g_print ("%s - %s\n", _("Midori"), error->message);
- g_error_free (error);
- return 1;
- }
+ midori_app_setup (&argc, &argv, entries);
/* Relative config path */
if (config && !g_path_is_absolute (config))
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 6159985..507aa99 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1352,16 +1352,16 @@ midori_app_send_notification (MidoriApp* app,
*
* Since: 0.4.2
**/
-gboolean
+void
midori_app_setup (gint *argc,
gchar** *argument_vector,
- const GOptionEntry *entries,
- GError* *error)
+ const GOptionEntry *entries)
{
GtkIconSource* icon_source;
GtkIconSet* icon_set;
GtkIconFactory* factory;
gsize i;
+ GError* error = NULL;
gboolean success;
static GtkStockItem items[] =
@@ -1438,13 +1438,13 @@ midori_app_setup (gint *argc,
#ifdef HAVE_GRANITE_CLUTTER
success = gtk_clutter_init_with_args (argc, argument_vector, _("[Addresses]"),
- (GOptionEntry*)entries, GETTEXT_PACKAGE, error);
+ (GOptionEntry*)entries, GETTEXT_PACKAGE, &error);
#elif GTK_CHECK_VERSION (3, 0, 0)
success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
- entries, GETTEXT_PACKAGE, error);
+ entries, GETTEXT_PACKAGE, &error);
#else
success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
- (GOptionEntry*)entries, GETTEXT_PACKAGE, error);
+ (GOptionEntry*)entries, GETTEXT_PACKAGE, &error);
#endif
factory = gtk_icon_factory_new ();
@@ -1462,7 +1462,8 @@ midori_app_setup (gint *argc,
gtk_icon_factory_add_default (factory);
g_object_unref (factory);
- return success;
+ if (!success)
+ g_error ("%s - %s", _("Midori"), error->message);
}
gboolean
diff --git a/midori/midori-app.h b/midori/midori-app.h
index 07af192..7a35175 100644
--- a/midori/midori-app.h
+++ b/midori/midori-app.h
@@ -82,11 +82,10 @@ midori_app_send_notification (MidoriApp* app,
const gchar* title,
const gchar* message);
-gboolean
+void
midori_app_setup (gint *argc,
gchar** *argument_vector,
- const GOptionEntry *entries,
- GError* *error);
+ const GOptionEntry *entries);
gboolean
midori_debug (const gchar* token);
diff --git a/midori/midori-bookmarks.c b/midori/midori-bookmarks.c
index be5ecd8..5e6d4f3 100644
--- a/midori/midori-bookmarks.c
+++ b/midori/midori-bookmarks.c
@@ -12,6 +12,7 @@
#include "midori-bookmarks.h"
#include "panels/midori-bookmarks.h"
+#include "midori-app.h"
#include "midori-array.h"
#include "sokoke.h"
#include "midori-core.h"
diff --git a/midori/midori.vapi b/midori/midori.vapi
index ce37fa8..195d395 100644
--- a/midori/midori.vapi
+++ b/midori/midori.vapi
@@ -8,7 +8,7 @@ namespace Midori {
[CCode (cheader_filename = "midori/midori.h")]
public class App : GLib.Object {
public App ();
- public static bool setup ([CCode (array_length_pos = 0.9)] ref unowned string[] args, [CCode (array_length = false)] GLib.OptionEntry[]? entries) throws GLib.Error;
+ public static bool setup ([CCode (array_length_pos = 0.9)] ref unowned string[] args, [CCode (array_length = false)] GLib.OptionEntry[]? entries);
public Browser create_browser ();
public GLib.List<weak Browser> get_browsers ();
diff --git a/tests/bookmarks.c b/tests/bookmarks.c
index abad9fd..7b751f0 100644
--- a/tests/bookmarks.c
+++ b/tests/bookmarks.c
@@ -192,7 +192,7 @@ main (int argc,
TestParameters default_params = { FALSE, NULL, NULL };
g_test_init (&argc, &argv, NULL);
- midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_app_setup (&argc, &argv, NULL);
midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
g_test_add ("/bookmarks/simple test",
diff --git a/tests/browser.c b/tests/browser.c
index d5da844..467fd0f 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -166,7 +166,7 @@ main (int argc,
char** argv)
{
g_test_init (&argc, &argv, NULL);
- midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_app_setup (&argc, &argv, NULL);
midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
diff --git a/tests/extensions.c b/tests/extensions.c
index 56bec50..0489ae6 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -195,7 +195,7 @@ main (int argc,
char** argv)
{
g_test_init (&argc, &argv, NULL);
- midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_app_setup (&argc, &argv, NULL);
midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
soup_session_add_feature_by_type (webkit_get_default_session (),
SOUP_TYPE_COOKIE_JAR);
diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index cf9d60f..75b7456 100644
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -391,7 +391,7 @@ main (int argc,
char** argv)
{
g_test_init (&argc, &argv, NULL);
- midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_app_setup (&argc, &argv, NULL);
g_test_add_func ("/magic-uri/uri", magic_uri_uri);
g_test_add_func ("/magic-uri/idn", magic_uri_idn);
diff --git a/tests/properties.c b/tests/properties.c
index 2613fdb..0cbe073 100644
--- a/tests/properties.c
+++ b/tests/properties.c
@@ -83,7 +83,7 @@ main (int argc,
char** argv)
{
g_test_init (&argc, &argv, NULL);
- midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_app_setup (&argc, &argv, NULL);
midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
More information about the Xfce4-commits
mailing list