diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-10-01 08:00:36 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:52 +0100 |
| commit | 3a324cd0d8b00b7b6c28225dbba9d88d3f8ded71 (patch) | |
| tree | ff19de76f6da1ad58aa3f750e061524c4477fb01 /vcl/unx/gtk/window/gtkframe.cxx | |
| parent | 920dc60a8c019ed464634fec1657fedb167ff373 (diff) | |
move UpdateNativeMenu2 back into UpdateNativeMenu
Diffstat (limited to 'vcl/unx/gtk/window/gtkframe.cxx')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 564689c6f05e..7d7ccfafbaca 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -582,11 +582,10 @@ void on_registrar_unavailable (GDBusConnection * /*connection*/, GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pSalFrame->GetMenu() ); if ( pSalMenu ) { + pSalMenu->DisconnectFrame(); MenuBar* pMenuBar = static_cast< MenuBar* >( pSalMenu->GetMenu() ); pMenuBar->SetDisplayable( false ); } - - return; } void GtkSalFrame::EnsureAppMenuWatch() @@ -601,7 +600,7 @@ void GtkSalFrame::EnsureAppMenuWatch() on_registrar_unavailable, reinterpret_cast<gpointer>(this), NULL); - ensure_dbus_setup(GTK_WIDGET(m_pWindow)->window, this); + ensure_dbus_setup(gtk_widget_get_window(GTK_WIDGET(m_pWindow)), this); } GtkSalFrame::~GtkSalFrame() |