Kaydet (Commit) f7878711 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

update when registrar is available, dont set menumodel on SetFrame, we do that on update

üst e6a191f8
......@@ -564,6 +564,7 @@ on_registrar_available (GDBusConnection * /*connection*/,
pMenuBar->SetDisplayable( sal_False );
}
}
pSalMenu->UpdateNativeMenu();
}
return;
......
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment