[gnome-online-accounts] daemon: Don't try to remove non-existent GSource
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] daemon: Don't try to remove non-existent GSource
- Date: Thu, 12 Jun 2014 11:53:22 +0000 (UTC)
commit 35364f60a35c5d245699df3d070f15b4f7ca9275
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Jun 11 19:00:03 2014 +0200
daemon: Don't try to remove non-existent GSource
The GSource would have already been removed when we quit the GMainLoop.
Fixes: https://bugzilla.gnome.org/731531
src/daemon/main.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 02d5bbf..fd3242e 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -87,13 +87,11 @@ main (int argc,
GOptionContext *opt_context;
gint ret;
guint name_owner_id;
- guint sigint_id;
ret = 1;
loop = NULL;
opt_context = NULL;
name_owner_id = 0;
- sigint_id = 0;
opt_context = g_option_context_new ("GNOME Online Accounts daemon");
g_option_context_add_main_entries (opt_context, opt_entries, NULL);
@@ -109,10 +107,9 @@ main (int argc,
loop = g_main_loop_new (NULL, FALSE);
- sigint_id = 0;
if (!opt_no_sigint)
{
- sigint_id = g_unix_signal_add (SIGINT, on_sigint, NULL);
+ g_unix_signal_add (SIGINT, on_sigint, NULL);
}
name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
@@ -136,8 +133,6 @@ main (int argc,
g_object_unref (the_daemon);
if (tp_linker != NULL)
g_object_unref (tp_linker);
- if (sigint_id > 0)
- g_source_remove (sigint_id);
if (name_owner_id != 0)
g_bus_unown_name (name_owner_id);
if (loop != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]