[gnome-applets] modem-lights: fix crash removing applet from panel
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] modem-lights: fix crash removing applet from panel
- Date: Tue, 11 Apr 2017 07:45:12 +0000 (UTC)
commit adec55c8e48166134b47eb0f6fa55c6b998c598c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Apr 11 10:44:11 2017 +0300
modem-lights: fix crash removing applet from panel
https://bugzilla.gnome.org/show_bug.cgi?id=780902
modem-lights/src/modem-applet.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/modem-lights/src/modem-applet.c b/modem-lights/src/modem-applet.c
index bebd11e..aa39562 100644
--- a/modem-lights/src/modem-applet.c
+++ b/modem-lights/src/modem-applet.c
@@ -203,6 +203,18 @@ modem_applet_finalize (GObject *object)
if (priv)
{
+ if (priv->directives_id > 0)
+ {
+ g_source_remove (priv->directives_id);
+ priv->directives_id = 0;
+ }
+
+ if (priv->tooltip_id)
+ {
+ g_source_remove (priv->tooltip_id);
+ priv->tooltip_id = 0;
+ }
+
shutdown_backend (MODEM_APPLET (object), TRUE, TRUE);
gtk_widget_destroy (priv->auth_dialog);
@@ -552,12 +564,6 @@ shutdown_backend (ModemApplet *applet, gboolean backend_alive, gboolean already_
priv->timeout_id = 0;
}
- if (priv->tooltip_id)
- {
- g_source_remove (priv->tooltip_id);
- priv->tooltip_id = 0;
- }
-
if (backend_alive)
kill (priv->pid, 9);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]