Adapt to changes in GLib API
g_application_get_menu() -> get_app_menu().
This commit is contained in:
@ -208,7 +208,7 @@ static void
|
|||||||
bloat_pad_init (BloatPad *app)
|
bloat_pad_init (BloatPad *app)
|
||||||
{
|
{
|
||||||
g_application_set_action_group (G_APPLICATION (app), get_actions ());
|
g_application_set_action_group (G_APPLICATION (app), get_actions ());
|
||||||
g_application_set_menu (G_APPLICATION (app), get_menu ());
|
g_application_set_app_menu (G_APPLICATION (app), get_menu ());
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -814,7 +814,7 @@ repopulate_menu (gpointer data)
|
|||||||
g_list_free (children);
|
g_list_free (children);
|
||||||
|
|
||||||
/* repopulate */
|
/* repopulate */
|
||||||
model = g_application_get_menu (G_APPLICATION (d->application));
|
model = g_application_get_app_menu (G_APPLICATION (d->application));
|
||||||
populate_menu_from_model (d->menu, model, G_ACTION_GROUP (d->application));
|
populate_menu_from_model (d->menu, model, G_ACTION_GROUP (d->application));
|
||||||
|
|
||||||
d->update_idle = 0;
|
d->update_idle = 0;
|
||||||
@ -896,7 +896,7 @@ gtk_application_window_get_app_menu (GtkApplicationWindow *window)
|
|||||||
|
|
||||||
application = gtk_window_get_application (GTK_WINDOW (window));
|
application = gtk_window_get_application (GTK_WINDOW (window));
|
||||||
|
|
||||||
model = g_application_get_menu (G_APPLICATION (application));
|
model = g_application_get_app_menu (G_APPLICATION (application));
|
||||||
|
|
||||||
if (!model)
|
if (!model)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Reference in New Issue
Block a user