diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-10-01 03:01:28 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:50 +0100 |
commit | f787871195817c0dddf905ba3c499587c6f5f091 (patch) | |
tree | e144bd08736df176fb640609bbbaa148e274ca19 | |
parent | e6a191f8184ecc5afc31de2f16455d445911ef2e (diff) |
update when registrar is available, dont set menumodel on SetFrame, we do that on update
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index eaa2aa2d7b45..1c08134bb685 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -564,6 +564,7 @@ on_registrar_available (GDBusConnection * /*connection*/, pMenuBar->SetDisplayable( sal_False ); } } + pSalMenu->UpdateNativeMenu(); } return; diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 2a47a6616c01..d5c35fc0b479 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -396,8 +396,6 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame ) if(mpActionGroup) g_lo_action_group_clear( G_LO_ACTION_GROUP(mpActionGroup) ); pFrameNonConst->EnsureAppMenuWatch(); - mpMenuModel = G_MENU_MODEL( g_object_get_data( G_OBJECT( pWindow ), "g-lo-menubar" ) ); - mpActionGroup = G_ACTION_GROUP( g_object_get_data( G_OBJECT( pWindow ), "g-lo-action-group" ) ); // Generate the main menu structure. UpdateNativeMenu(); } |