mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-27 07:56:14 +01:00
GApplication: menu can change after registration
Allow the menu to be changed after registration. This is quite useful for setting up the menus from the ::startup handler instead of having to do it before registration because it lets you skip the work if you're not the primary instance.
This commit is contained in:
parent
f7886d6adb
commit
a9f03596fa
@ -472,9 +472,6 @@ g_application_set_action_group (GApplication *application,
|
|||||||
* If supported, the application menu will be rendered by the desktop
|
* If supported, the application menu will be rendered by the desktop
|
||||||
* environment.
|
* environment.
|
||||||
*
|
*
|
||||||
* It is an error to call this function after the application has been
|
|
||||||
* registered.
|
|
||||||
*
|
|
||||||
* Since: 2.32
|
* Since: 2.32
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
@ -482,7 +479,6 @@ g_application_set_app_menu (GApplication *application,
|
|||||||
GMenuModel *app_menu)
|
GMenuModel *app_menu)
|
||||||
{
|
{
|
||||||
g_return_if_fail (G_IS_APPLICATION (application));
|
g_return_if_fail (G_IS_APPLICATION (application));
|
||||||
g_return_if_fail (!application->priv->is_registered);
|
|
||||||
|
|
||||||
if (app_menu != application->priv->app_menu)
|
if (app_menu != application->priv->app_menu)
|
||||||
{
|
{
|
||||||
@ -534,9 +530,6 @@ g_application_get_app_menu (GApplication *application)
|
|||||||
* example, the application menu may be rendered by the desktop shell
|
* example, the application menu may be rendered by the desktop shell
|
||||||
* while the menubar (if set) remains in each individual window.
|
* while the menubar (if set) remains in each individual window.
|
||||||
*
|
*
|
||||||
* It is an error to call this function after the application has been
|
|
||||||
* registered.
|
|
||||||
*
|
|
||||||
* Since: 2.32
|
* Since: 2.32
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
@ -544,7 +537,6 @@ g_application_set_menubar (GApplication *application,
|
|||||||
GMenuModel *menubar)
|
GMenuModel *menubar)
|
||||||
{
|
{
|
||||||
g_return_if_fail (G_IS_APPLICATION (application));
|
g_return_if_fail (G_IS_APPLICATION (application));
|
||||||
g_return_if_fail (!application->priv->is_registered);
|
|
||||||
|
|
||||||
if (menubar != application->priv->menubar)
|
if (menubar != application->priv->menubar)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user