[gnome-settings-daemon/gnome-3-18] wacom: Remove weak ref from the button mapping osd window to the device

[Bastien Nocera <hadess src gnome org>]

commit c103f5dd91cda94ac6b9895e00c189822b89472e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jan 22 21:26:10 2016 +0100

    wacom: Remove weak ref from the button mapping osd window to the device
    
    It's not removed during finalization, so it's kept lingering, and called
    when the device is actually removed/destroyed.

 plugins/wacom/gsd-wacom-osd-window.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-osd-window.c b/plugins/wacom/gsd-wacom-osd-window.c
index 18f85c8..2bbb91d 100644
--- a/plugins/wacom/gsd-wacom-osd-window.c
+++ b/plugins/wacom/gsd-wacom-osd-window.c
@@ -2086,6 +2086,13 @@ gsd_wacom_osd_window_finalize (GObject *object)
        g_clear_pointer (&priv->message, g_free);
        g_clear_pointer (&priv->regular_mode_message, g_free);
        g_clear_pointer (&priv->edition_mode_message, g_free);
+
+       if (priv->pad) {
+               g_object_weak_unref (G_OBJECT(priv->pad),
+                                    (GWeakNotify) gtk_widget_destroy,
+                                    osd_window);
+       }
+
        if (priv->buttons) {
                g_list_free_full (priv->buttons, g_object_unref);
                priv->buttons = NULL;