changeset 3365:b4ff4ef0211f trunk

make queue on click on playlist with GDK_MOD1_MASK working again
author Tomasz Mon <desowin@gmail.com>
date Sun, 19 Aug 2007 10:21:56 +0200
parents 38d5745b3b93
children ac752b5db631
files src/audacious/ui_playlist.c src/audacious/ui_skinned_playlist.c
diffstat 2 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/ui_playlist.c	Sat Aug 18 14:18:26 2007 -0500
+++ b/src/audacious/ui_playlist.c	Sun Aug 19 10:21:56 2007 +0200
@@ -999,8 +999,6 @@
 {
     gint xpos, ypos;
     GtkRequisition req;
-    Playlist *playlist = playlist_get_active();
-    gint idx = 0;
 
     gtk_window_get_position(GTK_WINDOW(playlistwin), &xpos, &ypos);
 
@@ -1093,18 +1091,6 @@
         ui_manager_popup_menu_show(GTK_MENU(mainwin_general_menu), event->x_root,
                                 event->y_root + 2, 3, event->time);
     }
-    else if (event->button == 1 && (event->state & GDK_MOD1_MASK))
-    {
-        GList *node;
-
-        node = playlist_get_selected(playlist);
-
-        if (node != NULL)
-        {
-            idx = GPOINTER_TO_INT(playlist_get_selected(playlist)->data);
-            playlist_queue_position(playlist, idx);
-        }
-    }
 
     return FALSE;
 }
--- a/src/audacious/ui_skinned_playlist.c	Sat Aug 18 14:18:26 2007 -0500
+++ b/src/audacious/ui_skinned_playlist.c	Sun Aug 19 10:21:56 2007 +0200
@@ -821,6 +821,9 @@
         if (!(event->state & GDK_CONTROL_MASK))
             playlist_select_all(playlist, FALSE);
 
+        if ((event->state & GDK_MOD1_MASK))
+            playlist_queue_position(playlist, nr);
+
         if (event->state & GDK_SHIFT_MASK && pl->prev_selected != -1) {
             playlist_select_range(playlist, pl->prev_selected, nr, TRUE);
             pl->prev_min = pl->prev_selected;