summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Monnerat <[email protected]>2014-11-26 17:33:40 +0100
committerStefano Karapetsas <[email protected]>2015-04-09 20:34:41 +0200
commite6a14da0f7946f77e4316a05e051527b54ec1c99 (patch)
tree8dae33cd03a385a308e483e234585131f99d938e
parent3f9eb20c55856f23cc841a75ac6d4fe5fba9bb9c (diff)
downloadmate-panel-e6a14da0f7946f77e4316a05e051527b54ec1c99.tar.bz2
mate-panel-e6a14da0f7946f77e4316a05e051527b54ec1c99.tar.xz
Cancel background settings upon MatePanelAppletFrameDBus destruction. This is an attempt to fix https://github.com/mate-desktop/mate-panel/issues/214
-rw-r--r--mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
index a74e1883..ca70915e 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
@@ -330,8 +330,7 @@ mate_panel_applet_frame_dbus_finalize (GObject *object)
MatePanelAppletFrameDBus *frame = MATE_PANEL_APPLET_FRAME_DBUS (object);
if (frame->priv->bg_cancellable)
- g_object_unref (frame->priv->bg_cancellable);
- frame->priv->bg_cancellable = NULL;
+ g_cancellable_cancel (frame->priv->bg_cancellable);
G_OBJECT_CLASS (mate_panel_applet_frame_dbus_parent_class)->finalize (object);
}