From f787871195817c0dddf905ba3c499587c6f5f091 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon, 1 Oct 2012 03:01:28 +0200
Subject: update when registrar is available, dont set menumodel on SetFrame,
 we do that on update

---
 vcl/unx/gtk/window/gtkframe.cxx   | 1 +
 vcl/unx/gtk/window/gtksalmenu.cxx | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'vcl/unx')

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();
 }
-- 
cgit v1.2.1