chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up picker list store properly
[disorder]
/
disobedience
/
menu.c
diff --git
a/disobedience/menu.c
b/disobedience/menu.c
index f484fd637b747cad986ea2d6e019dfc40aea5503..6a265bad93095bc0ac70f24566245bbe8e8c2620 100644
(file)
--- 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
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
#if PLAYLISTS
-GtkWidget *playlists_widget;
+GtkWidget *
menu_
playlists_widget;
GtkWidget *playlists_menu;
GtkWidget *playlists_menu;
-GtkWidget *editplaylists_widget;
+GtkWidget *
menu_
editplaylists_widget;
#endif
/** @brief Main menu widgets */
#endif
/** @brief Main menu widgets */
@@
-302,7
+302,7
@@
GtkWidget *menubar(GtkWidget *w) {
{
(char *)"/Edit/Edit playlists", /* path */
0, /* accelerator */
{
(char *)"/Edit/Edit playlists", /* path */
0, /* accelerator */
-
edit_playlists,
/* callback */
+
playlist_window_create,
/* callback */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
@@
-416,9
+416,9
@@
GtkWidget *menubar(GtkWidget *w) {
assert(selectnone_widget != 0);
assert(properties_widget != 0);
#if PLAYLISTS
assert(selectnone_widget != 0);
assert(properties_widget != 0);
#if PLAYLISTS
- assert(playlists_widget != 0);
+ assert(
menu_
playlists_widget != 0);
assert(playlists_menu != 0);
assert(playlists_menu != 0);
- assert(editplaylists_widget != 0);
+ assert(
menu_
editplaylists_widget != 0);
#endif
GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
#endif
GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,