[empathy] EmpathyApp: clear errors in command-line initialization
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] EmpathyApp: clear errors in command-line initialization
- Date: Thu, 4 Apr 2013 21:30:02 +0000 (UTC)
commit c34fe48f550f43c0a93e122fd0f486cc5c5eeb03
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Thu Apr 4 23:23:27 2013 +0200
EmpathyApp: clear errors in command-line initialization
src/empathy.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/empathy.c b/src/empathy.c
index 4827e47..04533a3 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]