X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..7fe2807d48006b2191dfe8b1985176cd378e80c3:/disobedience/menu.c diff --git a/disobedience/menu.c b/disobedience/menu.c index 1d50223..f0db1c2 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -24,9 +24,11 @@ static GtkWidget *selectall_widget; static GtkWidget *selectnone_widget; static GtkWidget *properties_widget; -GtkWidget *playlists_widget; +#if PLAYLISTS +GtkWidget *menu_playlists_widget; GtkWidget *playlists_menu; -GtkWidget *editplaylists_widget; +GtkWidget *menu_editplaylists_widget; +#endif /** @brief Main menu widgets */ GtkItemFactory *mainmenufactory; @@ -176,7 +178,7 @@ static void about_popup_got_version(void attribute((unused)) *v, FALSE/*fill*/, 1/*padding*/); gtk_box_pack_start(GTK_BOX(vbox), - gtk_label_new("\xC2\xA9 2004-2008 Richard Kettlewell"), + gtk_label_new("\xC2\xA9 2004-2009 Richard Kettlewell"), FALSE/*expand*/, FALSE/*fill*/, 1/*padding*/); @@ -296,6 +298,7 @@ GtkWidget *menubar(GtkWidget *w) { 0, /* item_type */ 0 /* extra_data */ }, +#if PLAYLISTS { (char *)"/Edit/Edit playlists", /* path */ 0, /* accelerator */ @@ -304,6 +307,7 @@ GtkWidget *menubar(GtkWidget *w) { 0, /* item_type */ 0 /* extra_data */ }, +#endif { @@ -346,6 +350,7 @@ GtkWidget *menubar(GtkWidget *w) { (char *)"", /* item_type */ 0 /* extra_data */ }, +#if PLAYLISTS { (char *)"/Control/Activate playlist", /* path */ 0, /* accelerator */ @@ -354,6 +359,7 @@ GtkWidget *menubar(GtkWidget *w) { (char *)"", /* item_type */ 0 /* extra_data */ }, +#endif { (char *)"/Help", /* path */ @@ -398,18 +404,22 @@ GtkWidget *menubar(GtkWidget *w) { "/Edit/Deselect all tracks"); properties_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Track properties"); - playlists_widget = gtk_item_factory_get_item(mainmenufactory, +#if PLAYLISTS + menu_playlists_widget = gtk_item_factory_get_item(mainmenufactory, "/Control/Activate playlist"); playlists_menu = gtk_item_factory_get_widget(mainmenufactory, "/Control/Activate playlist"); - editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory, + menu_editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Edit playlists"); +#endif assert(selectall_widget != 0); assert(selectnone_widget != 0); assert(properties_widget != 0); - assert(playlists_widget != 0); +#if PLAYLISTS + assert(menu_playlists_widget != 0); assert(playlists_menu != 0); - assert(editplaylists_widget != 0); + assert(menu_editplaylists_widget != 0); +#endif GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit");