X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fplayer.c;h=a35423bd978665ebc547f670273f01a77d36aaa4;hb=25a7dce7786ce3c8514bd67313048e4f6d19816a;hp=2b29bea514b359f57af41eee6789f178b2f51fc5;hpb=6d5ea65196e82ca4d06f6b78c1a0979749d73604;p=projects%2Fchimara%2Fchimara.git diff --git a/player/player.c b/player/player.c index 2b29bea..a35423b 100644 --- a/player/player.c +++ b/player/player.c @@ -3,6 +3,7 @@ #include #include "player.h" #include "error.h" +#include "app.h" typedef struct _ChimaraPlayerPrivate { int dummy; @@ -159,10 +160,13 @@ chimara_player_init(ChimaraPlayer *self) "buffer.normal { font-family: 'Comic Sans MS'; }");*/ GtkBox *vbox = GTK_BOX(load_object(builder, "vbox")); - + + ChimaraApp *theapp = chimara_app_get(); + gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0); - GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar"); - self->toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar"); + gtk_ui_manager_insert_action_group(uimanager, chimara_app_get_action_group(theapp), 1); + GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/player_menu"); + self->toolbar = gtk_ui_manager_get_widget(uimanager, "/player_toolbar"); gtk_widget_set_no_show_all(self->toolbar, TRUE); if(gtk_toggle_action_get_active(toolbar_action)) gtk_widget_show(self->toolbar); @@ -196,4 +200,4 @@ chimara_player_new(void) return GTK_WIDGET(g_object_new(CHIMARA_TYPE_PLAYER, "type", GTK_WINDOW_TOPLEVEL, NULL)); -} \ No newline at end of file +}