X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/0b0fb26bbfa5a32d00cf3f234c5066648128df8e..b35f7c0fe9f70f2f2aaf442add8a27703d928e04:/disobedience/menu.c

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 0243139..6a265ba 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -25,9 +25,9 @@ static GtkWidget *selectall_widget;
 static GtkWidget *selectnone_widget;
 static GtkWidget *properties_widget;
 #if PLAYLISTS
-GtkWidget *playlists_widget;
+GtkWidget *menu_playlists_widget;
 GtkWidget *playlists_menu;
-GtkWidget *editplaylists_widget;
+GtkWidget *menu_editplaylists_widget;
 #endif
 
 /** @brief Main menu widgets */
@@ -302,7 +302,7 @@ GtkWidget *menubar(GtkWidget *w) {
     {
       (char *)"/Edit/Edit playlists",   /* path */
       0,                                /* accelerator */
-      edit_playlists,                   /* callback */
+      playlist_window_create,           /* callback */
       0,                                /* callback_action */
       0,                                /* item_type */
       0                                 /* extra_data */
@@ -405,20 +405,20 @@ GtkWidget *menubar(GtkWidget *w) {
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
 						  "<GdisorderMain>/Edit/Track properties");
 #if PLAYLISTS
-  playlists_widget = gtk_item_factory_get_item(mainmenufactory,
+  menu_playlists_widget = gtk_item_factory_get_item(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
-  editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
+  menu_editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                      "<GdisorderMain>/Edit/Edit playlists");
 #endif
   assert(selectall_widget != 0);
   assert(selectnone_widget != 0);
   assert(properties_widget != 0);
 #if PLAYLISTS
-  assert(playlists_widget != 0);
+  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,