reindent with gnu indent. add keyboard accelerators for view menu, fix toggle filter widget also connected to toggle graph cb. add Lithuanian translation thanks to Algimantas Margevičius via launchpad.

1 files changed, 53 insertions, 34 deletions

diff --git a/src/trg-status-bar.c b/src/trg-status-bar.c
index 5fdee8c..4d3efc2 100644
--- a/src/trg-status-bar.c
+++ b/src/trg-status-bar.c
@@ -54,24 +54,29 @@ struct _TrgStatusBarPrivate {
     TrgMainWindow *win;
 };
 
-static void trg_status_bar_class_init(TrgStatusBarClass * klass) {
+static void trg_status_bar_class_init(TrgStatusBarClass * klass)
+{
     g_type_class_add_private(klass, sizeof(TrgStatusBarPrivate));
 }
 
-void trg_status_bar_clear_indicators(TrgStatusBar * sb) {
+void trg_status_bar_clear_indicators(TrgStatusBar * sb)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
     gtk_label_set_text(GTK_LABEL(priv->free_lbl), "");
     gtk_label_set_text(GTK_LABEL(priv->speed_lbl), "");
 }
 
-void trg_status_bar_reset(TrgStatusBar * sb) {
+void trg_status_bar_reset(TrgStatusBar * sb)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
     trg_status_bar_clear_indicators(sb);
     gtk_label_set_text(GTK_LABEL(priv->info_lbl), _("Disconnected"));
     gtk_widget_set_visible(priv->turtleEventBox, FALSE);
 }
 
-static void turtle_toggle(GtkWidget *w, GdkEventButton * event, gpointer data) {
+static void turtle_toggle(GtkWidget * w, GdkEventButton * event,
+                          gpointer data)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(data);
     JsonNode *req = session_set();
     JsonObject *args = node_get_arguments(req);
@@ -82,14 +87,16 @@ static void turtle_toggle(GtkWidget *w, GdkEventButton * event, gpointer data) {
     altSpeedOn = g_strcmp0(stockName, "alt-speed-on") == 0;
 
     gtk_image_set_from_stock(GTK_IMAGE(priv->turtleImage),
-            altSpeedOn ? "alt-speed-off" : "alt-speed-on",
-            GTK_ICON_SIZE_SMALL_TOOLBAR);
-    json_object_set_boolean_member(args, SGET_ALT_SPEED_ENABLED, !altSpeedOn);
+                             altSpeedOn ? "alt-speed-off" : "alt-speed-on",
+                             GTK_ICON_SIZE_SMALL_TOOLBAR);
+    json_object_set_boolean_member(args, SGET_ALT_SPEED_ENABLED,
+                                   !altSpeedOn);
 
     dispatch_async(priv->client, req, on_session_set, priv->win);
 }
 
-static void trg_status_bar_init(TrgStatusBar * self) {
+static void trg_status_bar_init(TrgStatusBar * self)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(self);
     gtk_container_set_border_width(GTK_CONTAINER(self), 2);
 
@@ -100,9 +107,10 @@ static void trg_status_bar_init(TrgStatusBar * self) {
 
     priv->turtleEventBox = gtk_event_box_new();
     g_signal_connect(priv->turtleEventBox, "button-press-event",
-            G_CALLBACK(turtle_toggle), self);
+                     G_CALLBACK(turtle_toggle), self);
     gtk_widget_set_visible(priv->turtleEventBox, FALSE);
-    gtk_container_add(GTK_CONTAINER(priv->turtleEventBox), priv->turtleImage);
+    gtk_container_add(GTK_CONTAINER(priv->turtleEventBox),
+                      priv->turtleImage);
     gtk_box_pack_end(GTK_BOX(self), priv->turtleEventBox, FALSE, TRUE, 5);
 
     priv->speed_lbl = gtk_label_new(NULL);
@@ -112,25 +120,30 @@ static void trg_status_bar_init(TrgStatusBar * self) {
     gtk_box_pack_end(GTK_BOX(self), priv->free_lbl, FALSE, TRUE, 30);
 }
 
-void trg_status_bar_push_connection_msg(TrgStatusBar * sb, const gchar * msg) {
+void trg_status_bar_push_connection_msg(TrgStatusBar * sb,
+                                        const gchar * msg)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(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)
+{
     gchar *statusMsg;
     float version;
 
     session_get_version(session, &version);
-    statusMsg = g_strdup_printf(
-            _("Connected to Transmission %g, getting torrents..."),
-            version);
+    statusMsg =
+        g_strdup_printf(_
+                        ("Connected to Transmission %g, getting torrents..."),
+                        version);
     g_message("%s", statusMsg);
     trg_status_bar_push_connection_msg(sb, statusMsg);
     g_free(statusMsg);
 }
 
-void trg_status_bar_session_update(TrgStatusBar * sb, JsonObject * session) {
+void trg_status_bar_session_update(TrgStatusBar * sb, JsonObject * session)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
     gint64 free = session_get_download_dir_free_space(session);
     gboolean altSpeedEnabled = session_get_alt_speed_enabled(session);
@@ -147,17 +160,19 @@ void trg_status_bar_session_update(TrgStatusBar * sb, JsonObject * session) {
     }
 
     gtk_image_set_from_stock(GTK_IMAGE(priv->turtleImage),
-            altSpeedEnabled ? "alt-speed-on" : "alt-speed-off",
-            GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_widget_set_tooltip_text(
-            priv->turtleImage,
-            altSpeedEnabled ? _("Disable alternate speed limits") :
-                    _("Enable alternate speed limits"));
+                             altSpeedEnabled ? "alt-speed-on" :
+                             "alt-speed-off", GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_widget_set_tooltip_text(priv->turtleImage,
+                                altSpeedEnabled ?
+                                _("Disable alternate speed limits") :
+                                _("Enable alternate speed limits"));
     gtk_widget_set_visible(priv->turtleEventBox, TRUE);
 }
 
 void trg_status_bar_update(TrgStatusBar * sb,
-        trg_torrent_model_update_stats * stats, TrgClient * client) {
+                           trg_torrent_model_update_stats * stats,
+                           TrgClient * client)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
     JsonObject *session = trg_client_get_session(client);
     gboolean altLimits = session_get_speed_limit_alt_enabled(session);
@@ -187,25 +202,27 @@ void trg_status_bar_update(TrgStatusBar * sb,
     if (uplimitraw >= 0) {
         gchar uplimitstring[32];
         trg_strlspeed(uplimitstring, uplimitraw);
-        g_snprintf(uplimit, sizeof(uplimit), _(" (Limit: %s)"), uplimitstring);
+        g_snprintf(uplimit, sizeof(uplimit), _(" (Limit: %s)"),
+                   uplimitstring);
     }
 
     if (downlimitraw >= 0) {
         gchar downlimitstring[32];
         trg_strlspeed(downlimitstring, downlimitraw);
         g_snprintf(downlimit, sizeof(downlimit), _(" (Limit: %s)"),
-                downlimitstring);
+                   downlimitstring);
     }
 
-    speedText = g_strdup_printf(_("Down: %s%s, Up: %s%s"), downRateTotalString,
-            downlimitraw >= 0 ? downlimit : "", upRateTotalString,
-            uplimitraw >= 0 ? uplimit : "");
+    speedText =
+        g_strdup_printf(_("Down: %s%s, Up: %s%s"), downRateTotalString,
+                        downlimitraw >= 0 ? downlimit : "",
+                        upRateTotalString, uplimitraw >= 0 ? uplimit : "");
 
     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);
+                               ("%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);
     gtk_label_set_text(GTK_LABEL(priv->speed_lbl), speedText);
@@ -214,12 +231,14 @@ void trg_status_bar_update(TrgStatusBar * sb,
     g_free(infoText);
 }
 
-const gchar *trg_status_bar_get_speed_text(TrgStatusBar * s) {
+const gchar *trg_status_bar_get_speed_text(TrgStatusBar * s)
+{
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(s);
     return gtk_label_get_text(GTK_LABEL(priv->speed_lbl));
 }
 
-TrgStatusBar *trg_status_bar_new(TrgMainWindow *win, TrgClient *client) {
+TrgStatusBar *trg_status_bar_new(TrgMainWindow * win, TrgClient * client)
+{
     TrgStatusBar *sb = g_object_new(TRG_TYPE_STATUS_BAR, NULL);
     TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(sb);
     priv->client = client;