summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-05-05 16:41:14 +0300
committermonsta <[email protected]>2016-06-02 18:11:54 +0300
commitd5a2a5d5bc36c3cd910bdeec8ed35a01e405022b (patch)
treea864aa4e67d9af2e91d63c498a4844404d431825
parent4decf2d9cab73997acf90e4131dd4f1cbb201dcd (diff)
downloadmate-panel-d5a2a5d5bc36c3cd910bdeec8ed35a01e405022b.tar.bz2
mate-panel-d5a2a5d5bc36c3cd910bdeec8ed35a01e405022b.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.
-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);
}