diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-02-17 09:45:23 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-02-17 09:45:23 +0000 |
| commit | 973aaa9d9a020e1644ce2fe45fd3613422f6ada9 (patch) | |
| tree | c12c0ecfe8e9f890b7414287cd62e5085fcf0a7d /src/trg-trackers-model.c | |
| parent | c10b672d05b8b6b68bbc1ccb92da8b5caa451c68 (diff) | |
a bunch of changes needed to facilitate changing trackers (unfinished). also tidy up general details panel a bit, fix a crash if a stats update is received after stats dialog is closed.
Diffstat (limited to 'src/trg-trackers-model.c')
| -rw-r--r-- | src/trg-trackers-model.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/trg-trackers-model.c b/src/trg-trackers-model.c index e2dc7ab..739efd6 100644 --- a/src/trg-trackers-model.c +++ b/src/trg-trackers-model.c @@ -23,11 +23,12 @@ #include "config.h" #include "torrent.h" +#include "trg-model.h" #include "trg-trackers-model.h" G_DEFINE_TYPE(TrgTrackersModel, trg_trackers_model, GTK_TYPE_LIST_STORE) -void trg_trackers_model_update(TrgTrackersModel * model, JsonObject * t) +void trg_trackers_model_update(TrgTrackersModel * model, gint64 updateSerial, JsonObject * t, gboolean first) { guint j; JsonArray *trackers; @@ -42,11 +43,13 @@ void trg_trackers_model_update(TrgTrackersModel * model, JsonObject * t) GtkTreeIter trackIter; JsonObject *tracker = json_node_get_object(json_array_get_element(trackers, j)); + gint64 trackerId = tracker_get_id(tracker); announce = tracker_get_announce(tracker); scrape = tracker_get_scrape(tracker); - gtk_list_store_append(GTK_LIST_STORE(model), &trackIter); + if (first || find_existing_model_item(GTK_TREE_MODEL(model), TRACKERCOL_ID, trackerId, &trackIter) == FALSE) + gtk_list_store_append(GTK_LIST_STORE(model), &trackIter); #ifdef DEBUG gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, @@ -57,15 +60,23 @@ void trg_trackers_model_update(TrgTrackersModel * model, JsonObject * t) TRACKERCOL_ANNOUNCE, announce, -1); gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, TRACKERCOL_SCRAPE, scrape, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, TRACKERCOL_ID, trackerId, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, TRACKERCOL_UPDATESERIAL, updateSerial, -1); #else gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, TRACKERCOL_ICON, GTK_STOCK_NETWORK, + TRACKERCOL_ID, trackerId, + TRACKERCOL_UPDATESERIAL, updateSerial, TRACKERCOL_TIER, tracker_get_tier(tracker), TRACKERCOL_ANNOUNCE, announce, TRACKERCOL_SCRAPE, scrape, -1); #endif } + + trg_model_remove_removed(GTK_LIST_STORE(model), + TRACKERCOL_UPDATESERIAL, + updateSerial); } static void @@ -81,6 +92,8 @@ static void trg_trackers_model_init(TrgTrackersModel * self) column_types[TRACKERCOL_TIER] = G_TYPE_INT64; column_types[TRACKERCOL_ANNOUNCE] = G_TYPE_STRING; column_types[TRACKERCOL_SCRAPE] = G_TYPE_STRING; + column_types[TRACKERCOL_ID] = G_TYPE_INT64; + column_types[TRACKERCOL_UPDATESERIAL] = G_TYPE_INT64; gtk_list_store_set_column_types(GTK_LIST_STORE(self), TRACKERCOL_COLUMNS, column_types); |