More specific symbol-naming

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 173b30b8a30ae41e4935573c63f84dcef6227dc7..95ab02fcbc50fc2112542266e9acb6888f5528cd 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -262,9 +262,9 @@ void edit_playlists(gpointer callback_data,
                     GtkWidget  *menu_item);
 extern char **playlists;
 extern int nplaylists;
                     GtkWidget  *menu_item);
 extern char **playlists;
 extern int nplaylists;

-extern GtkWidget *playlists_widget;
+extern GtkWidget *menu_playlists_widget;

 extern GtkWidget *playlists_menu;
 extern GtkWidget *playlists_menu;

-extern GtkWidget *editplaylists_widget;
+extern GtkWidget *menu_editplaylists_widget;

 #endif
 
 #endif /* DISOBEDIENCE_H */
 #endif
 
 #endif /* DISOBEDIENCE_H */

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 02431393b5343ff469acafc9cb4dcd3cccc01a29..f484fd637b747cad986ea2d6e019dfc40aea5503 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -405,11 +405,11 @@ GtkWidget *menubar(GtkWidget *w) {
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                  "<GdisorderMain>/Edit/Track properties");
 #if PLAYLISTS
   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");
                                                "<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);
                                                      "<GdisorderMain>/Edit/Edit playlists");
 #endif
   assert(selectall_widget != 0);

diff --git a/disobedience/playlists.c b/disobedience/playlists.c
index 50529f01846170ed0d470825bc9850e1690447d7..e524e432cc1ddc72ee004671d7a732a9d0c054c7 100644 (file)
--- a/disobedience/playlists.c
+++ b/disobedience/playlists.c
@@ -157,9 +157,9 @@ static void menu_playlists_changed(const char attribute((unused)) *event,
     gtk_widget_show(w);
     gtk_menu_shell_append(menu, w);
   }
     gtk_widget_show(w);
     gtk_menu_shell_append(menu, w);
   }

-  gtk_widget_set_sensitive(playlists_widget,
+  gtk_widget_set_sensitive(menu_playlists_widget,

                            nplaylists > 0);
                            nplaylists > 0);

-  gtk_widget_set_sensitive(editplaylists_widget,
+  gtk_widget_set_sensitive(menu_editplaylists_widget,

                            nplaylists >= 0);
 }
 
                            nplaylists >= 0);
 }