(trunk gtk) #3866 "Popup menu for file list manipulation" -- removing from the 2...

Looking over the 2.20 tickets, this one keeps sticking out. A popup menu may be useful if the "delete files" ticket is accepted in 2.30, but for this release (2.20) it doesn't really add anything new. One lesson from the 2.1x cycle was that features are a harder to remove than to add. So I'm going to hold off on adding this feature until it has a clear raison d'être.

diff --git a/gtk/file-list.c b/gtk/file-list.c
index b263433f980d159a97f2d2435f0dadac2164c2a0..2dbd6c99754b6c950f58d523247fee1a41922057 100644 (file)
--- a/gtk/file-list.c
+++ b/gtk/file-list.c
@@ -680,6 +680,7 @@ onRowActivated( GtkTreeView * view, GtkTreePath * path,
     return handled;
 }
 
+#if 0
 static void
 fileMenuSetDownload( GtkWidget * item, gpointer gdata )
 {
@@ -771,6 +772,7 @@ fileMenuPopup( GtkWidget * w, GdkEventButton * event, gpointer filedata )
                     event ? event->button : 0,
                     event ? event->time : gtk_get_current_event_time( ) );
 }
+#endif
 
 static gboolean
 onViewPathToggled( GtkTreeView       * view,
@@ -877,6 +879,7 @@ onViewButtonPressed( GtkWidget * w, GdkEventButton * event, gpointer gdata )
     {
         handled = onViewPathToggled( treeview, col, path, data );
     }
+#if 0
     else if( event->type == GDK_BUTTON_PRESS && event->button == 3
              && getAndSelectEventPath( treeview, event, &col, &path ) )
     {
@@ -887,17 +890,20 @@ onViewButtonPressed( GtkWidget * w, GdkEventButton * event, gpointer gdata )
             handled = TRUE;
         }
     }
+#endif
 
     gtk_tree_path_free( path );
     return handled;
 }
 
+#if 0
 static gboolean
 onViewPopupMenu( GtkWidget * w, gpointer gdata )
 {
     fileMenuPopup( w, NULL, gdata );
     return TRUE;
 }
+#endif
 
 GtkWidget *
 gtr_file_list_new( TrCore * core, int torrentId )
@@ -926,8 +932,10 @@ gtr_file_list_new( TrCore * core, int torrentId )
     gtk_container_set_border_width( GTK_CONTAINER( view ), GUI_PAD_BIG );
     g_signal_connect( view, "button-press-event",
                       G_CALLBACK( onViewButtonPressed ), data );
+#if 0
     g_signal_connect( view, "popup-menu",
                       G_CALLBACK( onViewPopupMenu ), data );
+#endif
     g_signal_connect( view, "row_activated",
                       G_CALLBACK( onRowActivated ), data );
     g_signal_connect( view, "button-release-event",