From 03010b90d215c3525fe86cddff61c2b353a90db6 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon, 1 Oct 2012 14:01:25 +0200
Subject: revoke the watch when dying

---
 vcl/unx/gtk/window/gtkframe.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'vcl/unx')

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 592c83d16f50..df98065276bd 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -603,9 +603,9 @@ void GtkSalFrame::EnsureAppMenuWatch()
          G_BUS_NAME_WATCHER_FLAGS_NONE,
          on_registrar_available,
          on_registrar_unavailable,
-         reinterpret_cast<gpointer>(this),
+         static_cast<GtkSalFrame*>(this),
          NULL);
-    ensure_dbus_setup(gtk_widget_get_window(GTK_WIDGET(m_pWindow)), this);
+    ensure_dbus_setup(gtk_widget_get_window(GTK_WIDGET(m_pWindow)), static_cast<GtkSalFrame*>(this));
 }
 
 GtkSalFrame::~GtkSalFrame()
@@ -651,6 +651,8 @@ GtkSalFrame::~GtkSalFrame()
         gtk_widget_destroy( GTK_WIDGET( m_pFixedContainer ) );
     {
         SolarMutexGuard aGuard;
+        if(m_nWatcherId)
+            g_bus_unwatch_name(m_nWatcherId);
         if(m_pSalMenu)
             static_cast<GtkSalMenu*>(m_pSalMenu)->DisconnectFrame();
         if( m_pWindow )
-- 
cgit v1.2.1