the information in the bottom left label seemed pretty redundant now that is all displayed in the filter panel. I think that space is better used just for something simple like Connected: where (what).

7 files changed, 28 insertions, 73 deletions

diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c
index 38c8521..598502e 100644
--- a/src/trg-files-tree-view.c
+++ b/src/trg-files-tree-view.c
@@ -112,7 +112,6 @@ static void send_updated_file_prefs(TrgFilesTreeView * tv)
 
     req = torrent_set(targetIdArray);
     args = node_get_arguments(req);
-    request_set_tag(req, targetId);
 
     gtk_tree_model_foreach(model, send_updated_file_prefs_foreachfunc,
                            args);
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 16bbdcc..dd686f2 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -93,7 +93,6 @@ static void torrent_event_notification(TrgTorrentModel * model,
 static void connchange_whatever_statusicon(TrgMainWindow * win,
                                            gboolean connected);
 static void update_whatever_statusicon(TrgMainWindow * win,
-                                       const gchar * speedLabel,
                                        trg_torrent_model_update_stats *
                                        stats);
 static void on_torrent_completed(TrgTorrentModel * model,
@@ -1043,7 +1042,7 @@ TRANSMISSION_MIN_SUPPORTED, version);
             return FALSE;
         }
 
-        trg_status_bar_connect(priv->statusBar, newSession);
+        trg_status_bar_connect(priv->statusBar, newSession, client);
     }
 
     if (newSession) {
@@ -1088,7 +1087,10 @@ static void connchange_whatever_statusicon(TrgMainWindow * win,
                                            gboolean connected)
 {
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win);
-    const gchar *display = connected ? _("Connected") : _("Disconnected");
+    TrgPrefs *prefs = trg_client_get_prefs(priv->client);
+    const gchar *display = connected ?
+            trg_prefs_get_string(prefs, TRG_PREFS_KEY_PROFILE_NAME,
+                    TRG_PREFS_CONNECTION) : _("Disconnected");
 
 #ifdef HAVE_LIBAPPINDICATOR
     if (priv->appIndicator) {
@@ -1109,7 +1111,6 @@ static void connchange_whatever_statusicon(TrgMainWindow * win,
 }
 
 static void update_whatever_statusicon(TrgMainWindow * win,
-                                       const gchar * speedLabel,
                                        trg_torrent_model_update_stats *
                                        stats)
 {
@@ -1120,26 +1121,24 @@ static void update_whatever_statusicon(TrgMainWindow * win,
     gtk_widget_set_visible(priv->iconSepItem, stats != NULL);
 
     if (stats) {
-        gchar *downloadingLabel = g_strdup_printf(_("Downloading  %d"),
-                                                  stats->down);
-        gchar *seedingLabel =
-            g_strdup_printf(_("Seeding  %d"), stats->seeding);
-        gtk_menu_item_set_label(GTK_MENU_ITEM(priv->iconSeedingItem),
-                                seedingLabel);
+        gchar *downloadingLabel;
+        gchar *seedingLabel;
+        gchar buf[32];
+
+        trg_strlsize(buf, stats->downRateTotal);
+        downloadingLabel = g_strdup_printf(_("%d Downloading @ %s"),
+                                                  stats->down, buf);
         gtk_menu_item_set_label(GTK_MENU_ITEM(priv->iconDownloadingItem),
                                 downloadingLabel);
         g_free(downloadingLabel);
+
+        trg_strlsize(buf, stats->upRateTotal);
+        seedingLabel = g_strdup_printf(_("%d Seeding @ %s"),
+                                                  stats->seeding, buf);
+        gtk_menu_item_set_label(GTK_MENU_ITEM(priv->iconSeedingItem),
+                seedingLabel);
         g_free(seedingLabel);
     }
-
-    if (priv->iconStatusItem)
-        gtk_menu_item_set_label(GTK_MENU_ITEM
-                                (priv->iconStatusItem), speedLabel);
-
-#ifndef HAVE_LIBAPPINDICATOR
-    if (priv->statusIcon)
-        gtk_status_icon_set_tooltip_text(priv->statusIcon, speedLabel);
-#endif
 }
 
 /*
@@ -1209,9 +1208,7 @@ static gboolean on_torrent_get(gpointer data, int mode)
                                  mode);
     update_selected_torrent_notebook(win, mode, priv->selectedTorrentId);
     trg_status_bar_update(priv->statusBar, stats, client);
-    update_whatever_statusicon(win,
-                               trg_status_bar_get_speed_text
-                               (priv->statusBar), stats);
+    update_whatever_statusicon(win, stats);
 
 #ifndef TRG_NO_GRAPH
     if (priv->graphNotebookIndex >= 0)
diff --git a/src/trg-status-bar.c b/src/trg-status-bar.c
index 3ac4792..464233c 100644
--- a/src/trg-status-bar.c
+++ b/src/trg-status-bar.c
@@ -21,6 +21,7 @@
 #include <glib/gprintf.h>
 #include <gtk/gtk.h>
 
+#include "trg-prefs.h"
 #include "trg-main-window.h"
 #include "trg-status-bar.h"
 #include "trg-torrent-model.h"
@@ -127,19 +128,24 @@ void trg_status_bar_push_connection_msg(TrgStatusBar * sb,
     gtk_label_set_text(GTK_LABEL(priv->info_lbl), msg);
 }
 
-void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session)
+void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session, TrgClient *client)
 {
+    TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
+    TrgPrefs *prefs = trg_client_get_prefs(client);
     gchar *statusMsg;
     float version;
 
     session_get_version(session, &version);
     statusMsg =
         g_strdup_printf(_
-                        ("Connected to Transmission %g, getting torrents..."),
+                        ("Connected: %s (Transmission %g)"),
+                        trg_prefs_get_string(prefs, TRG_PREFS_KEY_PROFILE_NAME, TRG_PREFS_CONNECTION),
                         version);
     g_message("%s", statusMsg);
     trg_status_bar_push_connection_msg(sb, statusMsg);
     g_free(statusMsg);
+
+    gtk_label_set_text(GTK_LABEL(priv->speed_lbl), _("Updating torrents..."));
 }
 
 void trg_status_bar_session_update(TrgStatusBar * sb, JsonObject * session)
@@ -226,20 +232,7 @@ void trg_status_bar_update(TrgStatusBar * sb,
                            trg_torrent_model_update_stats * stats,
                            TrgClient * client)
 {
-    TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
-    gchar *infoText;
-
-    infoText = g_strdup_printf(ngettext
-                               ("%d torrent:  %d seeding, %d downloading, %d paused",
-                                "%d torrents: %d seeding, %d downloading, %d paused",
-                                stats->count), stats->count,
-                               stats->seeding, stats->down, stats->paused);
-
-    gtk_label_set_text(GTK_LABEL(priv->info_lbl), infoText);
-
     trg_status_bar_update_speed(sb, stats, client);
-
-    g_free(infoText);
 }
 
 const gchar *trg_status_bar_get_speed_text(TrgStatusBar * s)
diff --git a/src/trg-status-bar.h b/src/trg-status-bar.h
index 876330d..e0ba8d5 100644
--- a/src/trg-status-bar.h
+++ b/src/trg-status-bar.h
@@ -55,7 +55,7 @@ G_END_DECLS
                                TrgClient * client);
 void trg_status_bar_session_update(TrgStatusBar * sb,
                                    JsonObject * session);
-void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session);
+void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session, TrgClient *client);
 void trg_status_bar_push_connection_msg(TrgStatusBar * sb,
                                         const gchar * msg);
 void trg_status_bar_reset(TrgStatusBar * sb);
diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c
index 9166998..18eb4ec 100644
--- a/src/trg-trackers-tree-view.c
+++ b/src/trg-trackers-tree-view.c
@@ -112,7 +112,6 @@ static void trg_tracker_announce_edited(GtkCellRendererText * renderer,
     json_array_add_int_element(torrentIds, torrentId);
 
     req = torrent_set(torrentIds);
-    request_set_tag(req, torrentId);
     args = node_get_arguments(req);
 
     if (!g_strcmp0(icon, GTK_STOCK_ADD)) {
@@ -262,7 +261,6 @@ static void delete_tracker(GtkWidget * w, gpointer data)
     json_array_add_int_element(torrentIds, torrentId);
 
     req = torrent_set(torrentIds);
-    request_set_tag(req, torrentId);
     args = node_get_arguments(req);
 
     json_object_set_array_member(args, "trackerRemove", trackerIds);
diff --git a/src/util.c b/src/util.c
index dd083a3..7594c46 100644
--- a/src/util.c
+++ b/src/util.c
@@ -533,29 +533,3 @@ evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
     return r;
 #endif
 }
-
-GtkTreeRowReference *iter_to_row_reference(GtkTreeModel * model,
-                                           GtkTreeIter * iter)
-{
-    GtkTreePath *path = gtk_tree_model_get_path(model, iter);
-    GtkTreeRowReference *rr = gtk_tree_row_reference_new(model, path);
-    gtk_tree_path_free(path);
-    return rr;
-}
-
-void iter_replace_row_reference(GtkTreeModel * model, GtkTreeIter * iter,
-                                GtkTreeRowReference ** rr)
-{
-    if (*rr)
-        gtk_tree_row_reference_free(*rr);
-
-    *rr = iter_to_row_reference(model, iter);
-}
-
-void rowref_to_iter(GtkTreeModel * model, GtkTreeRowReference * rr,
-                    GtkTreeIter * iter)
-{
-    GtkTreePath *path = gtk_tree_row_reference_get_path(rr);
-    gtk_tree_model_get_iter(model, iter, path);
-    gtk_tree_path_free(path);
-}
diff --git a/src/util.h b/src/util.h
index 611798c..07ab0bf 100644
--- a/src/util.h
+++ b/src/util.h
@@ -89,11 +89,5 @@ GtkWidget *my_scrolledwin_new(GtkWidget * child);
 gboolean is_url(gchar * string);
 gboolean is_magnet(gchar * string);
 GtkWidget *gtr_combo_box_new_enum(const char *text_1, ...);
-void iter_replace_row_reference(GtkTreeModel * model, GtkTreeIter * iter,
-                                GtkTreeRowReference ** rr);
-void rowref_to_iter(GtkTreeModel * model, GtkTreeRowReference * rr,
-                    GtkTreeIter * iter);
-GtkTreeRowReference *iter_to_row_reference(GtkTreeModel * model,
-                                           GtkTreeIter * iter);
 
 #endif                          /* UTIL_H_ */