protogen: The bulk of the eclient code generation.

[disorder] / disobedience / playlists.c

diff --git a/disobedience/playlists.c b/disobedience/playlists.c
index 1f836ad..50e099f 100644 (file)
--- a/disobedience/playlists.c
+++ b/disobedience/playlists.c
@@ -151,12 +151,12 @@ static const struct queue_column playlist_columns[] = {
  * - select/deselect all work
  */
 static struct menuitem playlist_menuitems[] = {
-  { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 },
-  { "Play track", ql_play_activate, ql_play_sensitive, 0, 0 },
-  { "Play playlist", playlist_playall_activate, playlist_playall_sensitive, 0, 0 },
-  { "Remove track from playlist", playlist_remove_activate, playlist_remove_sensitive, 0, 0 },
-  { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
-  { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
+  { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive, 0, 0 },
+  { "Play track", GTK_STOCK_MEDIA_PLAY, ql_play_activate, ql_play_sensitive, 0, 0 },
+  { "Play playlist", NULL, playlist_playall_activate, playlist_playall_sensitive, 0, 0 },
+  { "Remove track from playlist", GTK_STOCK_DELETE, playlist_remove_activate, playlist_remove_sensitive, 0, 0 },
+  { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
+  { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
 };
 
 static const GtkTargetEntry playlist_targets[] = {
@@ -253,7 +253,8 @@ static int playlistcmp(const void *ap, const void *bp) {
 /* Playlists menu ----------------------------------------------------------- */
 
 static void playlist_menu_playing(void attribute((unused)) *v,
-                                  const char *err) {
+                                  const char *err,
+                                  const char attribute((unused)) *id) {
   if(err)
     popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err);
 }
@@ -270,7 +271,7 @@ static void playlist_menu_received_content(void attribute((unused)) *v,
     return;
   }
   for(int n = 0; n < nvec; ++n)
-    disorder_eclient_play(client, vec[n], playlist_menu_playing, NULL);
+    disorder_eclient_play(client, playlist_menu_playing, vec[n], NULL);
 }
 
 /** @brief Called to activate a playlist
@@ -601,7 +602,7 @@ static void playlist_new_details(char **namep,
   if(privatep) *privatep = private;
   if(namep) *namep = name;
   if(fullnamep) {
-    if(*sharedp) *fullnamep = *namep;
+    if(shared) *fullnamep = name;
     else byte_xasprintf(fullnamep, "%s.%s", config->username, name);
   }
 }
@@ -995,6 +996,7 @@ static int playlist_picker_remove_sensitive(void *extra) {
 static struct menuitem playlist_picker_menuitems[] = {
   {
     "Select playlist",
+    NULL,
     playlist_picker_select_activate,
     playlist_picker_select_sensitive,
     0,
@@ -1002,6 +1004,7 @@ static struct menuitem playlist_picker_menuitems[] = {
   },
   {
     "Play playlist",
+    GTK_STOCK_MEDIA_PLAY, 
     playlist_picker_play_activate,
     playlist_picker_play_sensitive,
     0,
@@ -1009,6 +1012,7 @@ static struct menuitem playlist_picker_menuitems[] = {
   },
   {
     "Remove playlist",
+    GTK_STOCK_DELETE,
     playlist_picker_remove_activate,
     playlist_picker_remove_sensitive,
     0,