[rhythmbox] visualizer: fix up GMenu conversion

[Jonathan Matthew <jmatthew src gnome org>]

commit d5552f33bda844fd7bfa8885beae167fb57bad90
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Mar 16 14:39:14 2013 +1000

    visualizer: fix up GMenu conversion

 plugins/visualizer/rb-visualizer-menu.c   |    8 ++++----
 plugins/visualizer/rb-visualizer-page.h   |    2 +-
 plugins/visualizer/rb-visualizer-plugin.c |    7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/plugins/visualizer/rb-visualizer-menu.c b/plugins/visualizer/rb-visualizer-menu.c
index be7018b..2bece84 100644
--- a/plugins/visualizer/rb-visualizer-menu.c
+++ b/plugins/visualizer/rb-visualizer-menu.c
@@ -56,22 +56,22 @@ vis_plugin_filter (GstPluginFeature *feature, gpointer data)
 GMenu *
 rb_visualizer_create_popup_menu (const char *fullscreen_action)
 {
+       GActionMap *map;
        GSettings *settings;
        GMenu *menu;
        GMenu *section;
        GMenu *submenu;
        GMenuItem *item;
-       GAction *quality;
-       GAction *effect;
        GList *features;
        GList *t;
        int i;
 
        menu = g_menu_new ();
 
+       map = G_ACTION_MAP (g_application_get_default ());
        settings = g_settings_new ("org.gnome.rhythmbox.plugins.visualizer");
-       quality = g_settings_create_action (settings, "vis-quality");
-       effect = g_settings_create_action (settings, "vis-plugin");
+       g_action_map_add_action (map, g_settings_create_action (settings, "vis-quality"));
+       g_action_map_add_action (map, g_settings_create_action (settings, "vis-plugin"));
 
        /* fullscreen item */
        section = g_menu_new ();
diff --git a/plugins/visualizer/rb-visualizer-page.h b/plugins/visualizer/rb-visualizer-page.h
index 044253b..9d16d53 100644
--- a/plugins/visualizer/rb-visualizer-page.h
+++ b/plugins/visualizer/rb-visualizer-page.h
@@ -53,7 +53,7 @@ struct _RBVisualizerPage
        GtkWidget *fullscreen;
        GtkWidget *fullscreen_embed;
 
-       GMenuModel *popup_menu;
+       GMenuModel *popup;
        GSimpleAction *fullscreen_action;
        gboolean setting_state;
 };
diff --git a/plugins/visualizer/rb-visualizer-plugin.c b/plugins/visualizer/rb-visualizer-plugin.c
index d810463..ca25864 100644
--- a/plugins/visualizer/rb-visualizer-plugin.c
+++ b/plugins/visualizer/rb-visualizer-plugin.c
@@ -357,6 +357,7 @@ impl_activate (PeasActivatable *activatable)
        RhythmDBEntry *entry;
        GSimpleAction *fullscreen;
        RBShell *shell;
+       GMenu *menu;
 
        g_object_get (pi, "object", &shell, NULL);
 
@@ -364,12 +365,12 @@ impl_activate (PeasActivatable *activatable)
        g_signal_connect_object (pi->settings, "changed", G_CALLBACK (settings_changed_cb), pi, 0);
 
        /* create UI actions and menus and stuff */
-       fullscreen = g_simple_action_new_stateful ("visualizer-toggle", "b", "false");
-       menu = rb_visualizer_create_popup_menu (fullscreen);
+       fullscreen = g_simple_action_new_stateful ("visualizer-toggle", G_VARIANT_TYPE_BOOLEAN, 
g_variant_new_boolean (FALSE));
+       menu = rb_visualizer_create_popup_menu ("app.visualizer-toggle");
        g_object_ref_sink (menu);
 
        /* create visualizer page */
-       pi->page = rb_visualizer_page_new (G_OBJECT (pi), shell, fullscreen, menu);
+       pi->page = rb_visualizer_page_new (G_OBJECT (pi), shell, fullscreen, G_MENU_MODEL (menu));
        g_signal_connect_object (pi->page, "start", G_CALLBACK (start_visualizer_cb), pi, 0);
        g_signal_connect_object (pi->page, "stop", G_CALLBACK (stop_visualizer_cb), pi, 0);