fix for total number of torrents count

5 files changed, 17 insertions, 22 deletions

diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 885db40..eb16d8d 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -923,12 +923,12 @@ on_torrent_get(JsonObject * response, int mode, int status, gpointer data)
     stats.seeding = 0;
     stats.down = 0;
     stats.paused = 0;
+    stats.count = 0;
 
     client->updateSerial++;
 
     trg_torrent_model_update(priv->torrentModel, priv->client,
                              response, &stats, mode);
-    trg_torrent_model_stats_scan(priv->torrentModel, &stats);
 
     update_selected_torrent_notebook(TRG_MAIN_WINDOW(data), mode);
 
@@ -977,8 +977,8 @@ static gboolean trg_update_torrents_timerfunc(gpointer data)
     if (priv->client->session)
         dispatch_async(priv->client,
                        torrent_get(priv->client->activeOnlyUpdate),
-                       priv->
-                       client->activeOnlyUpdate ? on_torrent_get_active :
+                       priv->client->
+                       activeOnlyUpdate ? on_torrent_get_active :
                        on_torrent_get_update, data);
 
     return FALSE;
diff --git a/src/trg-torrent-add-dialog.c b/src/trg-torrent-add-dialog.c
index d0eaefd..3c0ffc9 100644
--- a/src/trg-torrent-add-dialog.c
+++ b/src/trg-torrent-add-dialog.c
@@ -885,8 +885,8 @@ static GObject *trg_torrent_add_dialog_constructor(GType type,
     priv->paused_check =
         gtk_check_button_new_with_mnemonic(_("Start _paused"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->paused_check),
-                                 pref_get_start_paused(priv->
-                                                       client->gconf));
+                                 pref_get_start_paused(priv->client->
+                                                       gconf));
 
     priv->priority_combo = gtr_priority_combo_new();
     gtk_combo_box_set_active(GTK_COMBO_BOX(priv->priority_combo), 1);
diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c
index 120c932..2f1859b 100644
--- a/src/trg-torrent-model.c
+++ b/src/trg-torrent-model.c
@@ -224,15 +224,10 @@ trg_torrent_model_stats_scan_foreachfunc(GtkTreeModel * model,
         stats->down++;
     else if (flags & TORRENT_FLAG_PAUSED)
         stats->paused++;
-    return FALSE;
-}
 
-void trg_torrent_model_stats_scan(TrgTorrentModel * model,
-                                  trg_torrent_model_update_stats * stats)
-{
-    gtk_tree_model_foreach(GTK_TREE_MODEL(model),
-                           trg_torrent_model_stats_scan_foreachfunc,
-                           stats);
+    stats->count++;
+
+    return FALSE;
 }
 
 static void
@@ -398,9 +393,10 @@ void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc,
 
     JsonObject *args, *t;
     GList *li;
+    GList *newTorrents;
     gint64 id;
     gint64 *idCopy;
-    JsonArray *newTorrents, *removedTorrents;
+    JsonArray *removedTorrents;
     GtkTreeIter iter;
     GtkTreePath *path;
     GtkTreeRowReference *rr;
@@ -408,9 +404,8 @@ void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc,
     gboolean addRemove = FALSE;
 
     args = get_arguments(response);
-    newTorrents = get_torrents(args);
 
-    for (li = json_array_get_elements(newTorrents); li;
+    for (li = json_array_get_elements(get_torrents(args)); li;
          li = g_list_next(li)) {
         t = json_node_get_object((JsonNode *) li->data);
         id = torrent_get_id(t);
@@ -475,4 +470,8 @@ void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc,
 
     if (addRemove)
         g_signal_emit(model, signals[TMODEL_TORRENT_ADDREMOVE], 0);
+
+    gtk_tree_model_foreach(GTK_TREE_MODEL(model),
+                           trg_torrent_model_stats_scan_foreachfunc,
+                           stats);
 }
diff --git a/src/trg-torrent-model.h b/src/trg-torrent-model.h
index 72467da..7b6d7dc 100644
--- a/src/trg-torrent-model.h
+++ b/src/trg-torrent-model.h
@@ -75,8 +75,6 @@ void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc,
                               trg_torrent_model_update_stats * stats,
                               gint mode);
 
-void trg_torrent_model_stats_scan(TrgTorrentModel * model,
-                                  trg_torrent_model_update_stats * stats);
 GHashTable *get_torrent_table(TrgTorrentModel * model);
 
 enum {
diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c
index 2851b7c..bf9f096 100644
--- a/src/trg-torrent-props-dialog.c
+++ b/src/trg-torrent-props-dialog.c
@@ -138,12 +138,10 @@ trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id,
                                     (priv->seedRatioLimit), args);
     json_object_set_int_member(args, FIELD_SEED_RATIO_MODE,
                                gtk_combo_box_get_active(GTK_COMBO_BOX
-                                                        (priv->
-                                                         seedRatioMode)));
+                                                        (priv->seedRatioMode)));
     json_object_set_int_member(args, FIELD_BANDWIDTH_PRIORITY,
                                gtk_combo_box_get_active(GTK_COMBO_BOX
-                                                        (priv->
-                                                         bandwidthPriorityCombo))
+                                                        (priv->bandwidthPriorityCombo))
                                - 1);
 
     gtk_spin_button_json_int_out(GTK_SPIN_BUTTON