summaryrefslogtreecommitdiff
path: root/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-05-05 16:41:14 +0300
committermonsta <[email protected]>2016-06-03 14:31:40 +0300
commit642e1ca894f88e3b7d113422b6bcd7506df7300f (patch)
treea864aa4e67d9af2e91d63c498a4844404d431825 /mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
parent2bedfd38c698e5b8f4b1c1c66ae26bdf6a9c1d8b (diff)
downloadmate-panel-642e1ca894f88e3b7d113422b6bcd7506df7300f.tar.bz2
mate-panel-642e1ca894f88e3b7d113422b6bcd7506df7300f.tar.xz
restore correct applet finalizing code
Revert "Cancel background settings upon MatePanelAppletFrameDBus destruction. This is an attempt to fix https://github.com/mate-desktop/mate-panel/issues/214" This reverts commit e6a14da0f7946f77e4316a05e051527b54ec1c99.
Diffstat (limited to 'mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c')
-rw-r--r--mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
index c47753b4..1308d2fd 100644
--- a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
@@ -329,7 +329,8 @@ mate_panel_applet_frame_dbus_finalize (GObject *object)
MatePanelAppletFrameDBus *frame = MATE_PANEL_APPLET_FRAME_DBUS (object);
if (frame->priv->bg_cancellable)
- g_cancellable_cancel (frame->priv->bg_cancellable);
+ g_object_unref (frame->priv->bg_cancellable);
+ frame->priv->bg_cancellable = NULL;
G_OBJECT_CLASS (mate_panel_applet_frame_dbus_parent_class)->finalize (object);
}