remove sort-by-tracker from the GTK+ client

diff --git a/gtk/actions.c b/gtk/actions.c
index aca89dd62a64f948b125626b5fb8b73107b6a4a1..7a11b5c5cb5ea9654ddbb78cae41ea62ea89605f 100644 (file)
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -57,10 +57,9 @@ static GtkRadioActionEntry sort_radio_entries[] =
     { "sort-by-progress",  NULL, N_( "Sort by _Progress" ),  NULL, NULL, 2 },
     { "sort-by-ratio",     NULL, N_( "Sort by Rati_o" ),     NULL, NULL, 3 },
     { "sort-by-state",     NULL, N_( "Sort by Stat_e" ),     NULL, NULL, 4 },
-    { "sort-by-tracker",   NULL, N_( "Sort by T_racker" ),   NULL, NULL, 5 },
-    { "sort-by-age",       NULL, N_( "Sort by A_ge" ),       NULL, NULL, 6 },
-    { "sort-by-time-left", NULL, N_( "Sort by Time _Left" ), NULL, NULL, 7 },
-    { "sort-by-size",      NULL, N_( "Sort by Si_ze" ),      NULL, NULL, 8 }
+    { "sort-by-age",       NULL, N_( "Sort by A_ge" ),       NULL, NULL, 5 },
+    { "sort-by-time-left", NULL, N_( "Sort by Time _Left" ), NULL, NULL, 6 },
+    { "sort-by-size",      NULL, N_( "Sort by Si_ze" ),      NULL, NULL, 7 }
 };
 
 static void

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index 18eb71036530999ab52b385470fa1b80ea2b9c1d..76dabb2bbcb96c549cfc1b5c67566358f1adb02e 100644 (file)
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -457,33 +457,6 @@ compareByState( GtkTreeModel * model,
     return ret;
 }
 
-static int
-compareByTracker( GtkTreeModel * model,
-                  GtkTreeIter  * a,
-                  GtkTreeIter  * b,
-                  gpointer       user_data UNUSED )
-{
-    const tr_torrent * ta;
-    const tr_torrent * tb;
-    const tr_info * aInf;
-    const tr_info * bInf;
-    const char * aTracker;
-    const char * bTracker;
-
-    gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
-    gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
-
-    aInf = tr_torrentInfo( ta );
-    bInf = tr_torrentInfo( tb );
-    aTracker = aInf->trackerCount > 0 ? aInf->trackers[0].announce : NULL;
-    bTracker = bInf->trackerCount > 0 ? bInf->trackers[0].announce : NULL;
-
-    if( !aTracker && !bTracker ) return 0;
-    if( !aTracker ) return -1;
-    if( !bTracker ) return 1;
-    return strcmp( aTracker, bTracker );
-}
-
 static void
 setSort( TrCore *     core,
          const char * mode,
@@ -508,8 +481,6 @@ setSort( TrCore *     core,
         sort_func = compareByRatio;
     else if( !strcmp( mode, "sort-by-state" ) )
         sort_func = compareByState;
-    else if( !strcmp( mode, "sort-by-tracker" ) )
-        sort_func = compareByTracker;
     else if( !strcmp( mode, "sort-by-size" ) )
         sort_func = compareBySize;
     else {

diff --git a/gtk/ui.h b/gtk/ui.h
index 590f6f4c29924f0c3f4db22fc7ec927b1e7f32e6..26bc18fec9cd29b1e3b35d444729f822bcaf7728 100644 (file)
--- a/gtk/ui.h
+++ b/gtk/ui.h
@@ -47,7 +47,6 @@ static const char * fallback_ui_file =
     "      <menuitem action='sort-by-size'/>\n"
     "      <menuitem action='sort-by-state'/>\n"
     "      <menuitem action='sort-by-time-left'/>\n"
-    "      <menuitem action='sort-by-tracker'/>\n"
     "      <separator/>\n"
     "      <menuitem action='sort-reversed'/>\n"
     "    </menu>\n"
@@ -84,7 +83,6 @@ static const char * fallback_ui_file =
     "      <menuitem action='sort-by-size'/>\n"
     "      <menuitem action='sort-by-state'/>\n"
     "      <menuitem action='sort-by-time-left'/>\n"
-    "      <menuitem action='sort-by-tracker'/>\n"
     "      <separator/>\n"
     "      <menuitem action='sort-reversed'/>\n"
     "    </menu>\n"