118

4 files changed, 17 insertions, 13 deletions

diff --git a/src/session-get.c b/src/session-get.c
index ea523de..f9c94c6 100644
--- a/src/session-get.c
+++ b/src/session-get.c
@@ -24,11 +24,9 @@
 #include "protocol-constants.h"
 #include "session-get.h"
 
-int session_get_version(JsonObject * s, float *version)
+int session_get_version(JsonObject *s, float *version)
 {
-    const gchar *versionStr =
-        json_object_get_string_member(s, SGET_VERSION);
-    return sscanf(versionStr, "%g", version);
+    return sscanf(json_object_get_string_member(s, SGET_VERSION), "%g", version);
 }
 
 gint64 session_get_download_dir_free_space(JsonObject *s)
diff --git a/src/session-get.h b/src/session-get.h
index 9572e1d..7b2d558 100644
--- a/src/session-get.h
+++ b/src/session-get.h
@@ -73,7 +73,7 @@
 const gchar *session_get_torrent_done_filename(JsonObject * s);
 gboolean session_get_torrent_done_enabled(JsonObject * s);
 gint64 session_get_cache_size_mb(JsonObject * s);
-int session_get_version(JsonObject * s, float *version);
+int session_get_version(JsonObject *s, float *version);
 gboolean session_get_pex_enabled(JsonObject * s);
 gboolean session_get_lpd_enabled(JsonObject * s);
 const gchar *session_get_download_dir(JsonObject * s);
diff --git a/src/trg-client.c b/src/trg-client.c
index 6cf088b..3cedeff 100644
--- a/src/trg-client.c
+++ b/src/trg-client.c
@@ -60,7 +60,7 @@ struct _TrgClientPrivate {
     gint64 updateSerial;
     JsonObject *session;
     gboolean ssl;
-    //float version;
+    float version;
     char *url;
     char *username;
     char *password;
@@ -150,11 +150,11 @@ trg_client_new (void)
     return tc;
 }
 
-/*float trg_client_get_version(TrgClient *tc)
+float trg_client_get_version(TrgClient *tc)
 {
     TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc);
     return priv->version;
-}*/
+}
 
 gint64 trg_client_get_rpc_version(TrgClient *tc)
 {
@@ -169,7 +169,7 @@ void trg_client_set_session(TrgClient * tc, JsonObject * session)
     if (priv->session)
         json_object_unref(priv->session);
 
-    //session_get_version(session, &priv->version);
+    session_get_version(session, &priv->version);
 
     priv->session = session;
 
diff --git a/src/trg-stats-dialog.c b/src/trg-stats-dialog.c
index f370fc3..87e04a7 100644
--- a/src/trg-stats-dialog.c
+++ b/src/trg-stats-dialog.c
@@ -57,7 +57,7 @@ struct _TrgStatsDialogPrivate {
     GtkWidget *tv;
     GtkListStore *model;
     GtkTreeRowReference *rr_up, *rr_down, *rr_files_added,
-        *rr_session_count, *rr_active;
+        *rr_session_count, *rr_active, *rr_version;
 };
 
 static GObject *instance = NULL;
@@ -203,6 +203,10 @@ static gboolean on_stats_reply(gpointer data)
     if (response->status == CURLE_OK) {
         args = get_arguments(response->obj);
 
+        char versionStr[32];
+        g_snprintf(versionStr, sizeof(versionStr), "Transmission %g", trg_client_get_version(priv->client));
+        update_statistic(priv->rr_version, versionStr, "");
+
         update_size_stat(args, priv->rr_up, "uploadedBytes");
         update_size_stat(args, priv->rr_down, "downloadedBytes");
         update_int_stat(args, priv->rr_files_added, "filesAdded");
@@ -277,6 +281,8 @@ static GObject *trg_stats_dialog_constructor(GType type,
         gtk_list_store_new(STATCOL_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
                            G_TYPE_STRING);
 
+    priv->rr_version =
+        stats_dialog_add_statistic(priv->model, _("Version"));
     priv->rr_down =
         stats_dialog_add_statistic(priv->model, _("Download Total"));
     priv->rr_up =
@@ -292,11 +298,11 @@ static GObject *trg_stats_dialog_constructor(GType type,
     gtk_widget_set_sensitive(tv, TRUE);
 
     trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_STAT, _("Statistic"),
-                         170);
+                         200);
     trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_SESSION, _("Session"),
-                         100);
+                         200);
     trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_CUMULAT,
-                         _("Cumulative"), 100);
+                         _("Cumulative"), 200);
 
     gtk_tree_view_set_model(GTK_TREE_VIEW(tv),
                             GTK_TREE_MODEL(priv->model));