reindent. remote prefs was sending the active encryption preference, lower cased, which won't work with i18n - fixed.

12 files changed, 89 insertions, 65 deletions

diff --git a/src/requests.c b/src/requests.c
index b52f5c9..252a1dd 100644
--- a/src/requests.c
+++ b/src/requests.c
@@ -202,8 +202,11 @@ void request_set_tag(JsonNode * req, gint64 tag)
     json_object_set_int_member(json_node_get_object(req), PARAM_TAG, tag);
 }
 
-void request_set_tag_from_ids(JsonNode *req, JsonArray *ids)
+void request_set_tag_from_ids(JsonNode * req, JsonArray * ids)
 {
-    gint64 id = json_array_get_length(ids) == 1 ? json_array_get_int_element(ids, 0) : -1;
+    gint64 id =
+        json_array_get_length(ids) == 1 ? json_array_get_int_element(ids,
+                                                                     0) :
+        -1;
     request_set_tag(req, id);
 }
diff --git a/src/requests.h b/src/requests.h
index a47c88d..8bd5a10 100644
--- a/src/requests.h
+++ b/src/requests.h
@@ -42,6 +42,6 @@ JsonNode *blocklist_update(void);
 JsonNode *port_test(void);
 JsonNode *session_stats(void);
 void request_set_tag(JsonNode * req, gint64 tag);
-void request_set_tag_from_ids(JsonNode *req, JsonArray *ids);
+void request_set_tag_from_ids(JsonNode * req, JsonArray * ids);
 
 #endif                          /* REQUESTS_H_ */
diff --git a/src/torrent.c b/src/torrent.c
index 93bee44..585c14b 100644
--- a/src/torrent.c
+++ b/src/torrent.c
@@ -192,7 +192,7 @@ gchar *torrent_get_status_icon(guint flags)
         return g_strdup(GTK_STOCK_DIALOG_QUESTION);
 }
 
-gint64 torrent_get_done_date(JsonObject *t)
+gint64 torrent_get_done_date(JsonObject * t)
 {
     return json_object_get_int_member(t, FIELD_DONE_DATE);
 }
diff --git a/src/torrent.h b/src/torrent.h
index b1e609a..039eaab 100644
--- a/src/torrent.h
+++ b/src/torrent.h
@@ -64,7 +64,7 @@ gboolean torrent_get_honors_session_limits(JsonObject * t);
 gint64 torrent_get_bandwidth_priority(JsonObject * t);
 gint64 torrent_get_upload_limit(JsonObject * t);
 gint64 torrent_get_added_date(JsonObject * t);
-gint64 torrent_get_done_date(JsonObject *t);
+gint64 torrent_get_done_date(JsonObject * t);
 gboolean torrent_get_upload_limited(JsonObject * t);
 gint64 torrent_get_download_limit(JsonObject * t);
 gboolean torrent_get_download_limited(JsonObject * t);
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index a1caff9..f61dc75 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -1003,10 +1003,10 @@ static gboolean trg_update_torrents_timerfunc(gpointer data)
 
     if (priv->client->session)
         dispatch_async(priv->client,
-                       torrent_get(priv->
-                                   client->activeOnlyUpdate ? -2 : -1),
-                       priv->client->
-                       activeOnlyUpdate ? on_torrent_get_active :
+                       torrent_get(priv->client->
+                                   activeOnlyUpdate ? -2 : -1),
+                       priv->
+                       client->activeOnlyUpdate ? on_torrent_get_active :
                        on_torrent_get_update, data);
 
     return FALSE;
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index e1717c2..07395bc 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -110,9 +110,19 @@ static void update_session(GtkDialog * dlg)
 
     /* Connection */
 
-    encryption =
-        g_ascii_strdown(gtk_combo_box_get_active_text
-                        (GTK_COMBO_BOX(priv->encryption_combo)), -1);
+    switch (gtk_combo_box_get_active
+            (GTK_COMBO_BOX(priv->encryption_combo))) {
+    case 0:
+        encryption = "required";
+        break;
+    case 2:
+        encryption = "tolerated";
+        break;
+    default:
+        encryption = "preferred";
+        break;
+    }
+
     json_object_set_string_member(args, SGET_ENCRYPTION, encryption);
     gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON
                                (priv->peer_port_random_check), args);
@@ -152,8 +162,6 @@ static void update_session(GtkDialog * dlg)
                                  (priv->peer_limit_per_torrent_spin),
                                  args);
 
-    g_free(encryption);
-
     dispatch_async(priv->client, request, on_session_set, priv->parent);
 }
 
diff --git a/src/trg-torrent-add-dialog.c b/src/trg-torrent-add-dialog.c
index 148aca8..cd6308f 100644
--- a/src/trg-torrent-add-dialog.c
+++ b/src/trg-torrent-add-dialog.c
@@ -890,8 +890,8 @@ static GObject *trg_torrent_add_dialog_constructor(GType type,
     priv->paused_check =
         gtk_check_button_new_with_mnemonic(_("Start _paused"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->paused_check),
-                                 pref_get_start_paused(priv->client->
-                                                       gconf));
+                                 pref_get_start_paused(priv->
+                                                       client->gconf));
 
     priv->priority_combo = gtr_priority_combo_new();
     gtk_combo_box_set_active(GTK_COMBO_BOX(priv->priority_combo), 1);
diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c
index d692627..11e42f9 100644
--- a/src/trg-torrent-model.c
+++ b/src/trg-torrent-model.c
@@ -287,8 +287,7 @@ update_torrent_iter(TrgTorrentModel * model, gint64 serial,
     json_object_ref(t);
 
 #ifdef DEBUG
-    gtk_list_store_set(ls, iter,
-                       TORRENT_COLUMN_ICON, statusIcon, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_ICON, statusIcon, -1);
     gtk_list_store_set(ls, iter,
                        TORRENT_COLUMN_NAME, torrent_get_name(t), -1);
     gtk_list_store_set(ls, iter,
@@ -296,18 +295,13 @@ update_torrent_iter(TrgTorrentModel * model, gint64 serial,
     gtk_list_store_set(ls, iter,
                        TORRENT_COLUMN_DONE, torrent_get_percent_done(t),
                        -1);
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_STATUS,
-                       statusString, -1);
-    gtk_list_store_set(ls, iter,
-                       TORRENT_COLUMN_DOWNSPEED, downRate, -1);
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_FLAGS,
-                       newFlags, -1);
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_UPSPEED,
-                       upRate, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_STATUS, statusString, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_DOWNSPEED, downRate, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_FLAGS, newFlags, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_UPSPEED, upRate, -1);
     gtk_list_store_set(ls, iter, TORRENT_COLUMN_ETA,
                        torrent_get_eta(t), -1);
-    gtk_list_store_set(ls, iter,
-                       TORRENT_COLUMN_UPLOADED, uploaded, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_UPLOADED, uploaded, -1);
     gtk_list_store_set(ls, iter,
                        TORRENT_COLUMN_DOWNLOADED, downloaded, -1);
     gtk_list_store_set(ls, iter, TORRENT_COLUMN_RATIO,
@@ -315,18 +309,18 @@ update_torrent_iter(TrgTorrentModel * model, gint64 serial,
                        && downloaded >
                        0 ? (double) uploaded / (double) downloaded : 0,
                        -1);
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_ID, id,
-                       -1);
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_JSON, t,
-                       -1);
-    gtk_list_store_set(ls, iter,
-                       TORRENT_COLUMN_UPDATESERIAL, serial, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_ID, id, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_JSON, t, -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_UPDATESERIAL, serial, -1);
     gtk_list_store_set(ls, iter,
                        TORRENT_COLUMN_ADDED, torrent_get_added_date(t),
                        -1);
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_DOWNLOADDIR, torrent_get_download_dir(t));
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_BANDWIDTH_PRIORITY, torrent_get_bandwidth_priority(t));
-    gtk_list_store_set(ls, iter, TORRENT_COLUMN_DONE_DATE, torrent_get_done_date(t), -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_DOWNLOADDIR,
+                       torrent_get_download_dir(t));
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_BANDWIDTH_PRIORITY,
+                       torrent_get_bandwidth_priority(t));
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_DONE_DATE,
+                       torrent_get_done_date(t), -1);
 #else
     gtk_list_store_set(ls, iter,
                        TORRENT_COLUMN_ICON, statusIcon,
@@ -348,8 +342,10 @@ update_torrent_iter(TrgTorrentModel * model, gint64 serial,
                        0
                        && downloaded >
                        0 ? (double) uploaded / (double) downloaded : 0,
-                       TORRENT_COLUMN_DOWNLOADDIR, torrent_get_download_dir(t),
-                       TORRENT_COLUMN_BANDWIDTH_PRIORITY, torrent_get_bandwidth_priority(t),
+                       TORRENT_COLUMN_DOWNLOADDIR,
+                       torrent_get_download_dir(t),
+                       TORRENT_COLUMN_BANDWIDTH_PRIORITY,
+                       torrent_get_bandwidth_priority(t),
                        TORRENT_COLUMN_ID, id, TORRENT_COLUMN_JSON, t,
                        TORRENT_COLUMN_UPDATESERIAL, serial, -1);
 #endif
diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c
index d50bd89..9b82297 100644
--- a/src/trg-torrent-props-dialog.c
+++ b/src/trg-torrent-props-dialog.c
@@ -139,10 +139,12 @@ trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id,
                                     (priv->seedRatioLimit), args);
     json_object_set_int_member(args, FIELD_SEED_RATIO_MODE,
                                gtk_combo_box_get_active(GTK_COMBO_BOX
-                                                        (priv->seedRatioMode)));
+                                                        (priv->
+                                                         seedRatioMode)));
     json_object_set_int_member(args, FIELD_BANDWIDTH_PRIORITY,
                                gtk_combo_box_get_active(GTK_COMBO_BOX
-                                                        (priv->bandwidthPriorityCombo))
+                                                        (priv->
+                                                         bandwidthPriorityCombo))
                                - 1);
 
     gtk_spin_button_json_int_out(GTK_SPIN_BUTTON
diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c
index 473a0e1..29f1162 100644
--- a/src/trg-torrent-tree-view.c
+++ b/src/trg-torrent-tree-view.c
@@ -74,13 +74,17 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tttv)
                              _("Ratio"), "ratio", 0);
     trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, TORRENT_COLUMN_ADDED,
                              _("Added"), "added", 0);
-    trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TORRENT_COLUMN_DOWNLOADDIR,
-                             _("Location"), "download-dir", TRG_COLUMN_EXTRA);
+    trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT,
+                             TORRENT_COLUMN_DOWNLOADDIR, _("Location"),
+                             "download-dir", TRG_COLUMN_EXTRA);
     trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TORRENT_COLUMN_ID,
                              _("ID"), "id", TRG_COLUMN_EXTRA);
-    trg_tree_view_reg_column(ttv, TRG_COLTYPE_PRIO, TORRENT_COLUMN_BANDWIDTH_PRIORITY,
-                             _("Bandwidth Priority"), "bandwidth-priority", TRG_COLUMN_EXTRA);
-    trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, TORRENT_COLUMN_DONE_DATE, _("Done Date"), "done-date", TRG_COLUMN_EXTRA);
+    trg_tree_view_reg_column(ttv, TRG_COLTYPE_PRIO,
+                             TORRENT_COLUMN_BANDWIDTH_PRIORITY,
+                             _("Priority"), "priority", TRG_COLUMN_EXTRA);
+    trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH,
+                             TORRENT_COLUMN_DONE_DATE, _("Done Date"),
+                             "done-date", TRG_COLUMN_EXTRA);
 
     gtk_tree_view_set_search_column(GTK_TREE_VIEW(tttv),
                                     TORRENT_COLUMN_NAME);
diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c
index c1b8bcc..6a37ca7 100644
--- a/src/trg-tree-view.c
+++ b/src/trg-tree-view.c
@@ -41,8 +41,9 @@ struct _TrgTreeViewPrivate {
 };
 
 static void trg_tree_view_add_column_after(TrgTreeView * tv,
-                                     trg_column_description * desc,
-                                     gchar ** widths, gint i, GtkTreeViewColumn *after_col);
+                                           trg_column_description * desc,
+                                           gchar ** widths, gint i,
+                                           GtkTreeViewColumn * after_col);
 
 trg_column_description *trg_tree_view_reg_column(TrgTreeView * tv,
                                                  gint type,
@@ -100,9 +101,11 @@ static gchar **trg_gconf_get_csv(TrgTreeView * tv, gchar * key)
     return ret;
 }
 
-static void trg_tree_view_hide_column(GtkWidget *w, GtkTreeViewColumn *col)
+static void trg_tree_view_hide_column(GtkWidget * w,
+                                      GtkTreeViewColumn * col)
 {
-    trg_column_description *desc = g_object_get_data(G_OBJECT(col), "column-desc");
+    trg_column_description *desc =
+        g_object_get_data(G_OBJECT(col), "column-desc");
     GtkWidget *tv = gtk_tree_view_column_get_tree_view(col);
     desc->flags &= ~TRG_COLUMN_SHOWING;
     gtk_tree_view_remove_column(GTK_TREE_VIEW(tv), col);
@@ -115,17 +118,19 @@ static void trg_tree_view_add_column(TrgTreeView * tv,
     trg_tree_view_add_column_after(tv, desc, widths, i, NULL);
 }
 
-static void trg_tree_view_user_add_column_cb(GtkWidget *w, trg_column_description *desc)
+static void trg_tree_view_user_add_column_cb(GtkWidget * w,
+                                             trg_column_description * desc)
 {
     GtkTreeViewColumn *col = g_object_get_data(G_OBJECT(w), "parent-col");
-    TrgTreeView *tv = TRG_TREE_VIEW(gtk_tree_view_column_get_tree_view(col));
+    TrgTreeView *tv =
+        TRG_TREE_VIEW(gtk_tree_view_column_get_tree_view(col));
 
     trg_tree_view_add_column_after(tv, desc, NULL, -1, col);
 }
 
 static void
-view_popup_menu(GtkButton  *button, GdkEventButton * event,
-                GtkTreeViewColumn *column)
+view_popup_menu(GtkButton * button, GdkEventButton * event,
+                GtkTreeViewColumn * column)
 {
     GtkWidget *tv = gtk_tree_view_column_get_tree_view(column);
     TrgTreeViewPrivate *priv = TRG_TREE_VIEW_GET_PRIVATE(tv);
@@ -138,16 +143,19 @@ view_popup_menu(GtkButton  *button, GdkEventButton * event,
     desc = g_object_get_data(G_OBJECT(column), "column-desc");
     menuitem = gtk_check_menu_item_new_with_label(desc->header);
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-    g_signal_connect(menuitem, "activate", G_CALLBACK(trg_tree_view_hide_column), column);
+    g_signal_connect(menuitem, "activate",
+                     G_CALLBACK(trg_tree_view_hide_column), column);
     gtk_widget_set_sensitive(menuitem, !(desc->flags & TRG_COLUMN_ALWAYS));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
     for (li = priv->columns; li; li = g_list_next(li)) {
-        trg_column_description *desc = (trg_column_description *)li->data;
+        trg_column_description *desc = (trg_column_description *) li->data;
         if (!(desc->flags & TRG_COLUMN_SHOWING)) {
             menuitem = gtk_check_menu_item_new_with_label(desc->header);
             g_object_set_data(G_OBJECT(menuitem), "parent-col", column);
-            g_signal_connect(menuitem, "activate", G_CALLBACK(trg_tree_view_user_add_column_cb), desc);
+            g_signal_connect(menuitem, "activate",
+                             G_CALLBACK(trg_tree_view_user_add_column_cb),
+                             desc);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
         }
     }
@@ -159,8 +167,8 @@ view_popup_menu(GtkButton  *button, GdkEventButton * event,
 }
 
 static gboolean
-col_onButtonPressed(GtkButton* button, GdkEventButton * event,
-                     GtkTreeViewColumn *col)
+col_onButtonPressed(GtkButton * button, GdkEventButton * event,
+                    GtkTreeViewColumn * col)
 {
     if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
         view_popup_menu(button, event, col);
@@ -171,8 +179,9 @@ col_onButtonPressed(GtkButton* button, GdkEventButton * event,
 }
 
 static void trg_tree_view_add_column_after(TrgTreeView * tv,
-                                     trg_column_description * desc,
-                                     gchar ** widths, gint i, GtkTreeViewColumn *after_col)
+                                           trg_column_description * desc,
+                                           gchar ** widths, gint i,
+                                           GtkTreeViewColumn * after_col)
 {
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column = NULL;
@@ -180,8 +189,9 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
     switch (desc->type) {
     case TRG_COLTYPE_TEXT:
         renderer =
-            desc->customRenderer ? desc->
-            customRenderer : gtk_cell_renderer_text_new();
+            desc->
+            customRenderer ? desc->customRenderer :
+            gtk_cell_renderer_text_new();
         column =
             gtk_tree_view_column_new_with_attributes(desc->header,
                                                      renderer, "text",
@@ -296,7 +306,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
     gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column);
 
     if (after_col)
-        gtk_tree_view_move_column_after(GTK_TREE_VIEW(tv), column, after_col);
+        gtk_tree_view_move_column_after(GTK_TREE_VIEW(tv), column,
+                                        after_col);
 
     g_signal_connect(column->button, "button-press-event",
                      G_CALLBACK(col_onButtonPressed), column);
diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
index 2e26303..e3bed00 100644
--- a/src/trg-tree-view.h
+++ b/src/trg-tree-view.h
@@ -46,7 +46,7 @@ GType trg_tree_view_get_type(void);
 
 GtkWidget *trg_tree_view_new(void);
 
-G_END_DECLS GList * trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
+G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
 
 enum {
     TRG_COLTYPE_ICONTEXT,