Changeset 7141

Timestamp:

Nov 23, 2008, 5:18:48 PM (14 years ago)

Author:

charles

Message:

(1.4x gtk) backport #1504: when the details dialog's peers list is sorted, some rows are duplicated

File:

• branches/1.4x/gtk/details.c (modified) (6 diffs)

branches/1.4x/gtk/details.c

@@ -326 +326 @@
 
 static int
-compare_peers( const void * a,
-               const void * b )
+compare_peers( const void * a, const void * b )
 {
     const tr_peer_stat * pa = a;
     const tr_peer_stat * pb = b;
 
-    return strcmp ( pa->addr, pb->addr );
+    return strcmp( pa->addr, pb->addr );
 }
 
 static int
-compare_addr_to_peer( const void * a,
-                      const void * b )
-{
-    const char *         addr = (const char *) a;
+compare_addr_to_peer( const void * addr, const void * b )
+{
     const tr_peer_stat * peer = b;
 
-    return strcmp ( addr, peer->addr );
-}
-
-static void
-peer_row_set( GtkListStore *       store,
-              GtkTreeIter *        iter,
-              const tr_peer_stat * peer )
+    return strcmp( addr, peer->addr );
+}
+
+static void
+peer_row_set( GtkListStore        * store,
+              GtkTreeIter         * iter,
+              const tr_peer_stat  * peer )
 {
     const char * client = peer->client;
@@ -389 +386 @@
                                             G_TYPE_FLOAT, /* uploadToRate */
                                             G_TYPE_STRING, /* client */
-                                            G_TYPE_INT,   /* progress [0..100]
-                                                            */
+                                            G_TYPE_INT,   /* progress [0..100] */
                                             G_TYPE_BOOLEAN, /* isEncrypted */
                                             G_TYPE_STRING ); /* flagString */
@@ -487 +483 @@
     GtkWidget *     leechers_lb;
     GtkWidget *     completed_lb;
+    GtkWidget *     peer_tree_view;
 }
 PeerData;
@@ -588 +585 @@
 
     free( peers );
+
+    gtk_widget_queue_draw( p->peer_tree_view );
 }
 
@@ -736 +735 @@
     m  = peer_model_new ( tor );
     v = GTK_WIDGET( g_object_new( GTK_TYPE_TREE_VIEW,
-                                  "model", m,
+                                  "model",  gtk_tree_model_sort_new_with_model( m ),
                                   "rules-hint", TRUE,
 #if GTK_CHECK_VERSION( 2, 12, 0 )
@@ -742 +741 @@
 #endif
                                   NULL ) );
+    p->peer_tree_view = v;
+
 #if GTK_CHECK_VERSION( 2, 12, 0 )
     g_signal_connect( v, "query-tooltip",