diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-01-30 18:19:39 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-01-30 18:19:39 +0000 |
| commit | e7a008aeed65e06d9e17dcc5e98121012540e3a2 (patch) | |
| tree | b54983e0616177da866935dc715b9002fcfe079c /src | |
| parent | 59d2f5a49f4e309ddf7088d46f034eec1e58e169 (diff) | |
client in peers treeview
Diffstat (limited to 'src')
| -rw-r--r-- | src/tpeer.h | 2 | ||||
| -rw-r--r-- | src/trg-peers-model.c | 28 | ||||
| -rw-r--r-- | src/trg-peers-model.h | 1 | ||||
| -rw-r--r-- | src/trg-peers-tree-view.c | 3 |
4 files changed, 22 insertions, 12 deletions
diff --git a/src/tpeer.h b/src/tpeer.h index a232f2f..90b9f8c 100644 --- a/src/tpeer.h +++ b/src/tpeer.h @@ -24,7 +24,7 @@ #include <json-glib/json-glib.h> #define TPEER_ADDRESS "address" -#define TPEER_CLIENT_NAME "client_name" +#define TPEER_CLIENT_NAME "clientName" #define TPEER_PROGRESS "progress" #define TPEER_RATE_TO_CLIENT "rateToClient" #define TPEER_RATE_TO_PEER "rateToPeer" diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c index dc05672..2f0300d 100644 --- a/src/trg-peers-model.c +++ b/src/trg-peers-model.c @@ -134,24 +134,29 @@ void trg_peers_model_update(TrgPeersModel * model, gint64 updateSerial, if (first == TRUE || find_existing_peer_item(model, peer, &peerIter) == FALSE) { gtk_list_store_append(GTK_LIST_STORE(model), &peerIter); + + address = peer_get_address(peer); +#if HAVE_GEOIP + if ((gi = g_object_get_data(G_OBJECT(model), "geoip")) != NULL) + country = GeoIP_country_name_by_addr(gi, address); +#endif + gtk_list_store_set(GTK_LIST_STORE(model), &peerIter, + PEERSCOL_ICON, GTK_STOCK_NETWORK, + PEERSCOL_IP, address, +#if HAVE_GEOIP + PEERSCOL_COUNTRY, country != NULL ? country : "", +#endif + PEERSCOL_CLIENT, peer_get_client_name(peer), + -1); + isNew = TRUE; } else { isNew = FALSE; } - address = peer_get_address(peer); + flagStr = peer_get_flagstr(peer); -#if HAVE_GEOIP - if ((gi = g_object_get_data(G_OBJECT(model), "geoip")) != NULL) - country = GeoIP_country_name_by_addr(gi, address); -#endif gtk_list_store_set(GTK_LIST_STORE(model), &peerIter, - PEERSCOL_ICON, - GTK_STOCK_NETWORK, PEERSCOL_IP, address, -#if HAVE_GEOIP - PEERSCOL_COUNTRY, - country != NULL ? country : "", -#endif PEERSCOL_FLAGS, flagStr, PEERSCOL_PROGRESS, peer_get_progress(peer), @@ -202,6 +207,7 @@ static void trg_peers_model_init(TrgPeersModel * self) column_types[PEERSCOL_PROGRESS] = G_TYPE_DOUBLE; column_types[PEERSCOL_DOWNSPEED] = G_TYPE_INT64; column_types[PEERSCOL_UPSPEED] = G_TYPE_INT64; + column_types[PEERSCOL_CLIENT] = G_TYPE_STRING; column_types[PEERSCOL_UPDATESERIAL] = G_TYPE_INT64; gtk_list_store_set_column_types(GTK_LIST_STORE(self), diff --git a/src/trg-peers-model.h b/src/trg-peers-model.h index 853bd9b..c5f17b0 100644 --- a/src/trg-peers-model.h +++ b/src/trg-peers-model.h @@ -73,6 +73,7 @@ enum { PEERSCOL_PROGRESS, PEERSCOL_DOWNSPEED, PEERSCOL_UPSPEED, + PEERSCOL_CLIENT, PEERSCOL_UPDATESERIAL, PEERSCOL_COLUMNS }; diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c index 3ad4ef8..4ceee93 100644 --- a/src/trg-peers-tree-view.c +++ b/src/trg-peers-tree-view.c @@ -57,6 +57,9 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self) PEERSCOL_DOWNSPEED, -1); trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), "Up Speed", PEERSCOL_UPSPEED, -1); + trg_tree_view_add_column(TRG_TREE_VIEW(self), "Client", + PEERSCOL_CLIENT); + } TrgPeersTreeView *trg_peers_tree_view_new(TrgPeersModel * model) |