client in peers treeview

5 files changed, 24 insertions, 15 deletions

diff --git a/redhat/transmission-remote-gtk.spec b/redhat/transmission-remote-gtk.spec
index 0ce37a6..c48eabd 100644
--- a/redhat/transmission-remote-gtk.spec
+++ b/redhat/transmission-remote-gtk.spec
@@ -1,6 +1,6 @@
 Name: transmission-remote-gtk
 Version: 0.1.0
-Release: 1
+Release: 1%{?dist:%{dist}}
 Summary: Remote control client for Transmission BitTorrent
 
 Group: Applications/Internet
@@ -9,7 +9,6 @@ URL: http://code.google.com/p/transmission-remote-gtk/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# These two are just the oldest version tested
 Requires: gtk2
 Requires: glib2
 Requires: unique
@@ -35,7 +34,7 @@ Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
 %description
-transmission-remote-gtk is a GTK client to remotely manage the Transmission BitTorrent client.
+transmission-remote-gtk is a GTK app to remotely manage the Transmission BitTorrent client.
 
 %prep
 %setup -q
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)