aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-04-05 05:23:27 +0800
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-04-05 05:29:34 +0800
commitc34fe48f550f43c0a93e122fd0f486cc5c5eeb03 (patch)
tree266bdb0ce641d9caf850705efd3498af4a99bcc8
parentc9f46637f57ac0ca04b5b5557c5b27536305b2d6 (diff)
downloadgsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.tar
gsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.tar.gz
gsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.tar.bz2
gsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.tar.lz
gsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.tar.xz
gsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.tar.zst
gsoc2013-empathy-c34fe48f550f43c0a93e122fd0f486cc5c5eeb03.zip
EmpathyApp: clear errors in command-line initialization
-rw-r--r--src/empathy.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 4827e47a1..04533a3bf 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -211,11 +211,6 @@ new_ft_handler_cb (EmpathyFTFactory *factory,
g_object_unref (handler);
}
-static gboolean
-empathy_app_local_command_line (GApplication *app,
- gchar ***arguments,
- gint *exit_status);
-
static void
empathy_presence_manager_set_auto_away_cb (GSettings *gsettings,
const gchar *key,
@@ -406,6 +401,7 @@ empathy_app_local_command_line (GApplication *app,
if (!g_application_register (app, NULL, &error))
{
g_warning("Impossible to register empathy: %s", error->message);
+ g_clear_error (&error);
*exit_status = EXIT_FAILURE;
return retval;
}
@@ -435,6 +431,7 @@ empathy_app_local_command_line (GApplication *app,
"line options.\n",
error->message, argv[0]);
g_warning ("Error in empathy init: %s", error->message);
+ g_clear_error (&error);
*exit_status = EXIT_FAILURE;
}