From fdea9f4074cae1b25ec0a7896502db1523d8ebfa Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 22 Nov 2009 15:07:23 +0000 Subject: [PATCH] More specific symbol-naming Organization: Straylight/Edgeware From: Richard Kettlewell --- disobedience/disobedience.h | 4 ++-- disobedience/menu.c | 4 ++-- disobedience/playlists.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 173b30b..95ab02f 100644 --- 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; -extern GtkWidget *playlists_widget; +extern GtkWidget *menu_playlists_widget; extern GtkWidget *playlists_menu; -extern GtkWidget *editplaylists_widget; +extern GtkWidget *menu_editplaylists_widget; #endif #endif /* DISOBEDIENCE_H */ diff --git a/disobedience/menu.c b/disobedience/menu.c index 0243139..f484fd6 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -405,11 +405,11 @@ GtkWidget *menubar(GtkWidget *w) { properties_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Track properties"); #if PLAYLISTS - playlists_widget = gtk_item_factory_get_item(mainmenufactory, + 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); diff --git a/disobedience/playlists.c b/disobedience/playlists.c index 50529f0..e524e43 100644 --- 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_set_sensitive(playlists_widget, + gtk_widget_set_sensitive(menu_playlists_widget, nplaylists > 0); - gtk_widget_set_sensitive(editplaylists_widget, + gtk_widget_set_sensitive(menu_editplaylists_widget, nplaylists >= 0); } -- [mdw]