From b42308f8e3e8798ac631ccb10ba7224b2ade81c6 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 1 Dec 2011 12:18:22 -0500 Subject: [PATCH] Adapt to changes in GLib API g_application_get_menu() -> get_app_menu(). --- examples/bloatpad.c | 2 +- gtk/gtkapplicationwindow.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/bloatpad.c b/examples/bloatpad.c index 315ec12a65..2c23ea0fa0 100644 --- a/examples/bloatpad.c +++ b/examples/bloatpad.c @@ -208,7 +208,7 @@ static void bloat_pad_init (BloatPad *app) { 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 diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 58302279a6..1c473303c1 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -814,7 +814,7 @@ repopulate_menu (gpointer data) g_list_free (children); /* 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)); d->update_idle = 0; @@ -896,7 +896,7 @@ gtk_application_window_get_app_menu (GtkApplicationWindow *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) return NULL;