# HG changeset patch
# User Tomasz Mon <desowin@gmail.com>
# Date 1187284811 -7200
# Node ID 7f6787eac9aa811623272340abd13b0c5be41a76
# Parent  8e9f1b1a2d84602abc0b370b1f468f58d3c644bb
right click on textboxes without connected handler should bring up audacious menu

diff -r 8e9f1b1a2d84 -r 7f6787eac9aa src/audacious/ui_playlist.c
--- a/src/audacious/ui_playlist.c	Thu Aug 16 15:13:18 2007 +0200
+++ b/src/audacious/ui_playlist.c	Thu Aug 16 19:20:11 2007 +0200
@@ -1085,15 +1085,7 @@
             dock_move_release(GTK_WINDOW(playlistwin));
         return TRUE;
     }
-    else if (event->button == 3 &&
-               (event->y >= cfg.playlist_height - 29 &&
-                event->y < cfg.playlist_height - 11 &&
-                ((event->x >= 12 && event->x < 37) ||
-                 (event->x >= 41 && event->x < 66) ||
-                 (event->x >= 70 && event->x < 95) ||
-                 (event->x >= 99 && event->x < 124) ||
-                 (event->x >= playlistwin_get_width() - 46 &&
-                  event->x < playlistwin_get_width() - 23)))) {
+    else if (event->button == 3) {
         /*
          * Pop up the main menu a few pixels down to avoid
          * anything to be selected initially.
diff -r 8e9f1b1a2d84 -r 7f6787eac9aa src/audacious/ui_skinned_textbox.c
--- a/src/audacious/ui_skinned_textbox.c	Thu Aug 16 15:13:18 2007 +0200
+++ b/src/audacious/ui_skinned_textbox.c	Thu Aug 16 19:20:11 2007 +0200
@@ -353,7 +353,9 @@
 
     if (event->type == GDK_BUTTON_PRESS) {
         textbox = UI_SKINNED_TEXTBOX(widget);
-        if (event->button == 1) {
+        if (event->button == 3 && !g_signal_has_handler_pending(widget, textbox_signals[RIGHT_CLICKED], 0, TRUE))
+            return FALSE;
+        else if (event->button == 1) {
             if (priv->scroll_allowed) {
                 if ((priv->pixmap_width > textbox->width) && priv->is_scrollable) {
                     priv->is_dragging = TRUE;