support proxy configuration using libproxy (optional). might add a getenv() fallback sometime.

26 files changed, 162 insertions, 85 deletions

diff --git a/config.h.in b/config.h.in
index ca3164b..9eb2b8b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -12,6 +12,9 @@
 /* Define to 1 if you have a functional curl library. */
 #undef HAVE_LIBCURL
 
+/* Define if libproxy is available */
+#undef HAVE_LIBPROXY
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
diff --git a/configure.ac b/configure.ac
index 4d4f41c..63522df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ PKG_CHECK_MODULES([gtk], [gtk+-2.0 >= 2.16])
 PKG_CHECK_MODULES([gio], [gio-2.0 >= 2.22])
 PKG_CHECK_MODULES([unique], [unique-1.0])
 PKG_CHECK_MODULES([notify], [libnotify])
+PKG_CHECK_MODULES([libproxy], [libproxy-1.0], AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available]), AC_MSG_WARN([libproxy is required for HTTP proxy support]))
+
 LIBCURL_CHECK_CONFIG([yes], [7.0], [], [AC_MSG_ERROR(["libcurl not found"])])
 
 AC_ARG_WITH([libgeoip], AC_HELP_STRING([--without-libgeoip], [disable GeoIP support]))
diff --git a/src/Makefile.am b/src/Makefile.am
index e726dab..31a8174 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,7 +71,7 @@ transmission_remote_gtk_SOURCES = main.c \
 	  trg-torrent-graph.c \
 	  $(NULL)
 
-transmission_remote_gtk_LDFLAGS = -lcurl $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gconf_LIBS) $(gio_LIBS) $(unique_LIBS) $(notify_LIBS)
+transmission_remote_gtk_LDFLAGS = -lcurl $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gconf_LIBS) $(gio_LIBS) $(unique_LIBS) $(notify_LIBS) $(libproxy_LIBS)
 
 install-data-local: install-icons update-icon-cache
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
diff --git a/src/http.c b/src/http.c
index d52aac6..a2eba57 100644
--- a/src/http.c
+++ b/src/http.c
@@ -76,9 +76,16 @@ static struct http_response *trg_http_perform_inner(trg_client * tc,
     curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, &header_callback);
     curl_easy_setopt(handle, CURLOPT_WRITEHEADER, (void *) tc);
     curl_easy_setopt(handle, CURLOPT_POSTFIELDS, req);
+
     if (tc->ssl)
         curl_easy_setopt(handle, CURLOPT_SSL_VERIFYPEER, 0);
 
+    if (tc->proxy) {
+        curl_easy_setopt(handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+        curl_easy_setopt(handle, CURLOPT_PROXY, tc->proxy);
+    }
+
+
     if (tc->session_id != NULL) {
         headers = curl_slist_append(headers, tc->session_id);
         curl_easy_setopt(handle, CURLOPT_HTTPHEADER, headers);
diff --git a/src/trg-about-window.c b/src/trg-about-window.c
index 542ff7d..343354f 100644
--- a/src/trg-about-window.c
+++ b/src/trg-about-window.c
@@ -56,7 +56,8 @@ GtkWidget *trg_about_window_new(GtkWindow * parent)
     gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
                                    "(C) 2011 Alan Fitton");
     gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog),
-                                  _("A remote client to transmission-daemon."));
+                                  _
+                                  ("A remote client to transmission-daemon."));
     gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), "GPL2");
     gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog),
                                  "http://code.google.com/p/transmission-remote-gtk/");
diff --git a/src/trg-client.c b/src/trg-client.c
index cdbebfc..2353669 100644
--- a/src/trg-client.c
+++ b/src/trg-client.c
@@ -17,10 +17,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <glib-object.h>
 #include <gconf/gconf-client.h>
 
+#ifdef HAVE_LIBPROXY
+#include <proxy.h>
+#endif
+
 #include "trg-client.h"
 #include "trg-preferences.h"
 
@@ -57,6 +65,9 @@ int trg_client_populate_with_settings(trg_client * tc, GConfClient * gconf)
     gint port;
     gchar *host;
     GError *error = NULL;
+#ifdef HAVE_LIBPROXY
+    pxProxyFactory *pf = NULL;
+#endif
 
     g_free(tc->url);
     tc->url = NULL;
@@ -97,5 +108,25 @@ int trg_client_populate_with_settings(trg_client * tc, GConfClient * gconf)
         gconf_client_get_string(gconf, TRG_GCONF_KEY_PASSWORD, &error);
     check_for_error(error);
 
+    g_free(tc->proxy);
+    tc->proxy = NULL;
+
+#ifdef HAVE_LIBPROXY
+    if ((pf = px_proxy_factory_new())) {
+        char **proxies = px_proxy_factory_get_proxies(pf, tc->url);
+        int i;
+
+        for (i = 0; proxies[i]; i++) {
+            if (g_str_has_prefix(proxies[i], "http")) {
+                g_free(tc->proxy);
+                tc->proxy = g_strdup(proxies[i]);
+            }
+            g_free(proxies[i]);
+        }
+
+        g_free(proxies);
+    }
+#endif
+
     return 0;
 }
diff --git a/src/trg-client.h b/src/trg-client.h
index ae0f889..51d851d 100644
--- a/src/trg-client.h
+++ b/src/trg-client.h
@@ -39,6 +39,7 @@ typedef struct {
     char *url;
     char *username;
     char *password;
+    char *proxy;
     JsonArray *torrents;
     GConfClient *gconf;
     GMutex *updateMutex;
diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c
index 27e0b99..dab7611 100644
--- a/src/trg-files-tree-view.c
+++ b/src/trg-files-tree-view.c
@@ -362,11 +362,12 @@ static void trg_files_tree_view_init(TrgFilesTreeView * self)
     trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(self),
                                          FILESCOL_ICON, FILESCOL_NAME,
                                          _("Name"), -1);
-    trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Size"), FILESCOL_SIZE);
+    trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Size"),
+                             FILESCOL_SIZE);
     trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), _("Progress"),
                                   FILESCOL_PROGRESS, -1);
-    trg_files_tree_view_add_wanted_column(TRG_TREE_VIEW(self),
-                                          _("Wanted"), FILESCOL_WANTED, -1);
+    trg_files_tree_view_add_wanted_column(TRG_TREE_VIEW(self), _("Wanted"),
+                                          FILESCOL_WANTED, -1);
     trg_files_tree_view_add_priority_column(TRG_TREE_VIEW(self),
                                             _("Priority"),
                                             FILESCOL_PRIORITY, -1);
diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c
index c4edf60..c0165fd 100644
--- a/src/trg-general-panel.c
+++ b/src/trg-general-panel.c
@@ -148,14 +148,12 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
         gchar *markup =
             g_markup_printf_escaped("<span fgcolor=\"red\">%s</span>",
                                     errorStr);
-        gtk_label_set_markup(GTK_LABEL(priv->gen_error_label),
-                             markup);
+        gtk_label_set_markup(GTK_LABEL(priv->gen_error_label), markup);
         g_free(markup);
 
         markup = g_markup_printf_escaped("<span fgcolor=\"red\">%s</span>",
-                                            _("Error"));
-        gtk_label_set_markup(keyLabel,
-                             markup);
+                                         _("Error"));
+        gtk_label_set_markup(keyLabel, markup);
         g_free(markup);
     } else {
         gtk_label_clear(GTK_LABEL(priv->gen_error_label));
@@ -189,7 +187,8 @@ static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed,
     gchar *keyMarkup;
 
     keyLabel = gtk_label_new(NULL);
-    keyMarkup = g_markup_printf_escaped(strlen(key) > 0 ? "<b>%s:</b>" : "", key);
+    keyMarkup =
+        g_markup_printf_escaped(strlen(key) > 0 ? "<b>%s:</b>" : "", key);
     gtk_label_set_markup(GTK_LABEL(keyLabel), keyMarkup);
     g_free(keyMarkup);
     gtk_fixed_put(GTK_FIXED(fixed), keyLabel, 10 + (col * 280),
@@ -213,7 +212,8 @@ static void trg_general_panel_init(TrgGeneralPanel * self)
 
     priv->gen_size_label =
         trg_general_panel_add_label(self, _("Size"), 0, 1);
-    priv->gen_eta_label = trg_general_panel_add_label(self, _("ETA"), 1, 1);
+    priv->gen_eta_label =
+        trg_general_panel_add_label(self, _("ETA"), 1, 1);
     priv->gen_completed_label =
         trg_general_panel_add_label(self, _("Completed"), 2, 1);
 
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 12568de..757393e 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -114,14 +114,13 @@ static GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win);
 static void on_session_get(JsonObject * response, int status,
                            gpointer data);
 static void on_torrent_get(JsonObject * response,
-                                        int mode, int status,
-                                        gpointer data);
+                           int mode, int status, gpointer data);
 static void on_torrent_get_first(JsonObject * response, int status,
                                  gpointer data);
 static void on_torrent_get_update(JsonObject * response, int status,
-                           gpointer data);
+                                  gpointer data);
 static void on_torrent_get_interactive(JsonObject * response, int status,
-                           gpointer data);
+                                       gpointer data);
 static gboolean trg_update_torrents_timerfunc(gpointer data);
 static void trg_main_window_update_notebook_displays(TrgMainWindow * win,
                                                      JsonObject * t,
@@ -510,7 +509,8 @@ static void connect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
         switch (populate_result) {
         case TRG_GCONF_SCHEMA_ERROR:
             msg =
-                _("Unable to retrieve connection settings from GConf. Schema not installed?");
+                _
+                ("Unable to retrieve connection settings from GConf. Schema not installed?");
             break;
         case TRG_NO_HOSTNAME_SET:
             msg = _("No hostname set");
@@ -533,7 +533,8 @@ static void connect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
         return;
     }
 
-    trg_status_bar_push_connection_msg(priv->statusBar, _("Connecting..."));
+    trg_status_bar_push_connection_msg(priv->statusBar,
+                                       _("Connecting..."));
     dispatch_async(priv->client, session_get(), on_session_get, data);
 }
 
@@ -826,8 +827,9 @@ GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win)
                              gtk_label_new(_("Peers")));
 
 
-    show_graph = gconf_client_get_bool(priv->client->gconf, TRG_GCONF_KEY_SHOW_GRAPH,
-                                              &error);
+    show_graph =
+        gconf_client_get_bool(priv->client->gconf,
+                              TRG_GCONF_KEY_SHOW_GRAPH, &error);
 
     if (error) {
         g_error_free(error);
@@ -891,8 +893,7 @@ static void on_session_get(JsonObject * response, int status,
 }
 
 static void
-on_torrent_get(JsonObject * response, int mode,
-                            int status, gpointer data)
+on_torrent_get(JsonObject * response, int mode, int status, gpointer data)
 {
     trg_torrent_model_update_stats stats;
     TrgMainWindowPrivate *priv;
@@ -960,7 +961,8 @@ on_torrent_get(JsonObject * response, int mode,
         trg_torrent_graph_set_speed(priv->graph, &stats);
 
     if (mode != TORRENT_GET_MODE_INTERACTION)
-        g_timeout_add_seconds(client->interval, trg_update_torrents_timerfunc, data);
+        g_timeout_add_seconds(client->interval,
+                              trg_update_torrents_timerfunc, data);
 
     gdk_threads_leave();
     g_mutex_unlock(client->updateMutex);
@@ -973,13 +975,14 @@ on_torrent_get_first(JsonObject * response, int status, gpointer data)
     on_torrent_get(response, TORRENT_GET_MODE_FIRST, status, data);
 }
 
-static void on_torrent_get_interactive(JsonObject * response, int status, gpointer data)
+static void on_torrent_get_interactive(JsonObject * response, int status,
+                                       gpointer data)
 {
     on_torrent_get(response, TORRENT_GET_MODE_INTERACTION, status, data);
 }
 
 static void on_torrent_get_update(JsonObject * response, int status,
-                           gpointer data)
+                                  gpointer data)
 {
     on_torrent_get(response, TORRENT_GET_MODE_UPDATE, status, data);
 }
@@ -989,7 +992,8 @@ static gboolean trg_update_torrents_timerfunc(gpointer data)
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data);
 
     if (priv->client->session != NULL)
-        dispatch_async(priv->client, torrent_get(), on_torrent_get_update, data);
+        dispatch_async(priv->client, torrent_get(), on_torrent_get_update,
+                       data);
 
     return FALSE;
 }
@@ -1138,8 +1142,8 @@ on_generic_interactive_action(JsonObject * response, int status,
         gdk_threads_leave();
 
         if (status == CURLE_OK || status == FAIL_RESPONSE_UNSUCCESSFUL)
-            dispatch_async(priv->client, torrent_get(), on_torrent_get_interactive,
-                           data);
+            dispatch_async(priv->client, torrent_get(),
+                           on_torrent_get_interactive, data);
     }
 
     response_unref(response);
@@ -1478,10 +1482,12 @@ trg_torrent_tv_view_menu(GtkWidget * treeview,
     trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Re-announce"),
                           GTK_STOCK_REFRESH, TRUE,
                           G_CALLBACK(reannounce_cb), data);
-    trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Move"), GTK_STOCK_HARDDISK,
-                          TRUE, G_CALLBACK(move_cb), data);
-    trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove"), GTK_STOCK_REMOVE,
-                          TRUE, G_CALLBACK(remove_cb), data);
+    trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Move"),
+                          GTK_STOCK_HARDDISK, TRUE, G_CALLBACK(move_cb),
+                          data);
+    trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove"),
+                          GTK_STOCK_REMOVE, TRUE, G_CALLBACK(remove_cb),
+                          data);
     trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove & Delete"),
                           GTK_STOCK_DELETE, TRUE, G_CALLBACK(delete_cb),
                           data);
@@ -1492,7 +1498,8 @@ trg_torrent_tv_view_menu(GtkWidget * treeview,
                                          FIELD_DOWNLOAD_LIMITED,
                                          FIELD_DOWNLOAD_LIMIT, ids));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-                          limit_menu_new(TRG_MAIN_WINDOW(data), _("Up Limit"),
+                          limit_menu_new(TRG_MAIN_WINDOW(data),
+                                         _("Up Limit"),
                                          FIELD_UPLOAD_LIMITED,
                                          FIELD_UPLOAD_LIMIT, ids));
 
@@ -1522,8 +1529,9 @@ trg_status_icon_view_menu(GtkStatusIcon * icon G_GNUC_UNUSED,
                               GTK_STOCK_DISCONNECT, connected,
                               G_CALLBACK(disconnect_cb), data);
 
-        trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Add"), GTK_STOCK_ADD,
-                              connected, G_CALLBACK(add_cb), data);
+        trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Add"),
+                              GTK_STOCK_ADD, connected, G_CALLBACK(add_cb),
+                              data);
         trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Add from URL"),
                               GTK_STOCK_ADD, connected,
                               G_CALLBACK(add_url_cb), data);
@@ -1659,10 +1667,12 @@ void trg_main_window_add_graph(TrgMainWindow * win, gboolean show)
 {
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win);
 
-    priv->graph = trg_torrent_graph_new(gtk_widget_get_style(priv->notebook));
-    priv->graphNotebookIndex = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook),
-                             GTK_WIDGET(priv->graph),
-                             gtk_label_new(_("Graph")));
+    priv->graph =
+        trg_torrent_graph_new(gtk_widget_get_style(priv->notebook));
+    priv->graphNotebookIndex =
+        gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook),
+                                 GTK_WIDGET(priv->graph),
+                                 gtk_label_new(_("Graph")));
 
     if (show)
         gtk_widget_show_all(priv->notebook);
@@ -1674,9 +1684,9 @@ void trg_main_window_remove_graph(TrgMainWindow * win)
 {
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win);
 
-    if (priv->graphNotebookIndex >= 0)
-    {
-        gtk_notebook_remove_page(GTK_NOTEBOOK(priv->notebook), priv->graphNotebookIndex);
+    if (priv->graphNotebookIndex >= 0) {
+        gtk_notebook_remove_page(GTK_NOTEBOOK(priv->notebook),
+                                 priv->graphNotebookIndex);
         priv->graphNotebookIndex = -1;
     }
 }
diff --git a/src/trg-main-window.h b/src/trg-main-window.h
index 1019ec1..fd413c6 100644
--- a/src/trg-main-window.h
+++ b/src/trg-main-window.h
@@ -71,4 +71,3 @@ void trg_main_window_remove_graph(TrgMainWindow * win);
 
 G_END_DECLS
 #endif                          /* MAIN_WINDOW_H_ */
-
diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c
index c94f8ff..e9830e5 100644
--- a/src/trg-menu-bar.c
+++ b/src/trg-menu-bar.c
@@ -219,7 +219,8 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBarPrivate * priv)
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
                                    (priv->mb_view_notebook), TRUE);
 
-    priv->mb_view_stats = gtk_menu_item_new_with_mnemonic(_("_Statistics"));
+    priv->mb_view_stats =
+        gtk_menu_item_new_with_mnemonic(_("_Statistics"));
     gtk_widget_set_sensitive(priv->mb_view_stats, FALSE);
 
     gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_states);
@@ -297,8 +298,8 @@ GtkWidget *trg_menu_bar_torrent_menu_new(TrgMenuBarPrivate * priv)
         trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("_Verify"),
                               GTK_STOCK_REFRESH, FALSE);
     priv->mb_reannounce =
-        trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("Re-_announce"),
-                              GTK_STOCK_REFRESH, FALSE);
+        trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu),
+                              _("Re-_announce"), GTK_STOCK_REFRESH, FALSE);
     priv->mb_move =
         trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("_Move"),
                               GTK_STOCK_HARDDISK, FALSE);
diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c
index 719de63..58c297f 100644
--- a/src/trg-peers-tree-view.c
+++ b/src/trg-peers-tree-view.c
@@ -58,7 +58,8 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self)
                                    PEERSCOL_UPSPEED, -1);
     trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), _("Progress"),
                                   PEERSCOL_PROGRESS, -1);
-    trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Flags"), PEERSCOL_FLAGS);
+    trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Flags"),
+                             PEERSCOL_FLAGS);
     trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Client"),
                              PEERSCOL_CLIENT);
 }
diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c
index a0c51a4..b4546fa 100644
--- a/src/trg-preferences-dialog.c
+++ b/src/trg-preferences-dialog.c
@@ -234,8 +234,7 @@ static GtkWidget *trg_prefs_desktopPage(GConfClient * gconf,
 
     hig_workarea_add_section_title(t, &row, _("Features"));
 
-    w = new_check_button(gconf, _("Show graph"),
-                            TRG_GCONF_KEY_SHOW_GRAPH);
+    w = new_check_button(gconf, _("Show graph"), TRG_GCONF_KEY_SHOW_GRAPH);
     g_signal_connect(G_OBJECT(w), "toggled",
                      G_CALLBACK(toggle_show_graph), win);
     hig_workarea_add_wide_control(t, &row, w);
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index 1536293..e1717c2 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -302,7 +302,8 @@ static void on_port_tested(JsonObject * response, int status,
         TrgRemotePrefsDialogPrivate *priv =
             TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(data);
 
-        gtk_button_set_label(GTK_BUTTON(priv->port_test_button), _("Retest"));
+        gtk_button_set_label(GTK_BUTTON(priv->port_test_button),
+                             _("Retest"));
         gtk_widget_set_sensitive(priv->port_test_button, TRUE);
 
         if (status == CURLE_OK) {
@@ -311,10 +312,12 @@ static void on_port_tested(JsonObject * response, int status,
                                                "port-is-open");
             if (isOpen)
                 gtk_label_set_markup(GTK_LABEL(priv->port_test_label),
-                                     _("Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"));
+                                     _
+                                     ("Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"));
             else
                 gtk_label_set_markup(GTK_LABEL(priv->port_test_label),
-                                     _("Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"));
+                                     _
+                                     ("Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"));
         } else {
             trg_error_dialog(GTK_WINDOW(data), status, response);
         }
@@ -544,7 +547,8 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win,
 
     w = priv->trash_original_torrent_files_check =
         hig_workarea_add_wide_checkbutton(t, &row,
-                                          _("Trash original torrent files"),
+                                          _
+                                          ("Trash original torrent files"),
                                           session_get_trash_original_torrent_files
                                           (s));
     widget_set_json_key(w, SGET_TRASH_ORIGINAL_TORRENT_FILES);
diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c
index 8c9045b..1ae4247 100644
--- a/src/trg-state-selector.c
+++ b/src/trg-state-selector.c
@@ -128,9 +128,11 @@ static void trg_state_selector_init(TrgStateSelector * self)
         gtk_list_store_new(STATE_SELECTOR_COLUMNS, G_TYPE_STRING,
                            G_TYPE_STRING, G_TYPE_UINT);
 
-    trg_state_selector_add_state(store, &iter, GTK_STOCK_ABOUT, _("All"), 0);
+    trg_state_selector_add_state(store, &iter, GTK_STOCK_ABOUT, _("All"),
+                                 0);
     trg_state_selector_add_state(store, &iter, GTK_STOCK_GO_DOWN,
-                                 _("Downloading"), TORRENT_FLAG_DOWNLOADING);
+                                 _("Downloading"),
+                                 TORRENT_FLAG_DOWNLOADING);
     trg_state_selector_add_state(store, &iter, GTK_STOCK_MEDIA_PAUSE,
                                  _("Paused"), TORRENT_FLAG_PAUSED);
     trg_state_selector_add_state(store, &iter, GTK_STOCK_REFRESH,
@@ -141,9 +143,8 @@ static void trg_state_selector_init(TrgStateSelector * self)
                                  _("Incomplete"), TORRENT_FLAG_INCOMPLETE);
     trg_state_selector_add_state(store, &iter, GTK_STOCK_GO_UP,
                                  _("Seeding"), TORRENT_FLAG_SEEDING);
-    trg_state_selector_add_state(store, &iter,
-                                 GTK_STOCK_DIALOG_WARNING, _("Error"),
-                                 TORRENT_FLAG_ERROR);
+    trg_state_selector_add_state(store, &iter, GTK_STOCK_DIALOG_WARNING,
+                                 _("Error"), TORRENT_FLAG_ERROR);
 
     gtk_tree_view_set_model(GTK_TREE_VIEW(self), GTK_TREE_MODEL(store));
     gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(self), TRUE);
diff --git a/src/trg-stats-dialog.c b/src/trg-stats-dialog.c
index 1649019..45258a4 100644
--- a/src/trg-stats-dialog.c
+++ b/src/trg-stats-dialog.c
@@ -284,7 +284,8 @@ static GObject *trg_stats_dialog_constructor(GType type,
 
     priv->rr_down =
         stats_dialog_add_statistic(priv->model, _("Download Total"));
-    priv->rr_up = stats_dialog_add_statistic(priv->model, _("Upload Total"));
+    priv->rr_up =
+        stats_dialog_add_statistic(priv->model, _("Upload Total"));
     priv->rr_files_added =
         stats_dialog_add_statistic(priv->model, _("Files Added"));
     priv->rr_session_count =
@@ -299,8 +300,8 @@ static GObject *trg_stats_dialog_constructor(GType type,
                          170);
     trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_SESSION, _("Session"),
                          100);
-    trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_CUMULAT, _("Cumulative"),
-                         100);
+    trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_CUMULAT,
+                         _("Cumulative"), 100);
 
     gtk_tree_view_set_model(GTK_TREE_VIEW(tv),
                             GTK_TREE_MODEL(priv->model));
diff --git a/src/trg-status-bar.c b/src/trg-status-bar.c
index 8b82eeb..0ef0717 100644
--- a/src/trg-status-bar.c
+++ b/src/trg-status-bar.c
@@ -92,9 +92,9 @@ void trg_status_bar_update(TrgStatusBar * sb,
 
     statusBarUpdate =
         g_strdup_printf
-        (_("%d torrents ..  Down %s, Up %s  ..  %d seeding, %d downloading, %d paused"),
-         stats->count,
-         downRateTotalString, upRateTotalString,
+        (_
+         ("%d torrents ..  Down %s, Up %s  ..  %d seeding, %d downloading, %d paused"),
+         stats->count, downRateTotalString, upRateTotalString,
          stats->seeding, stats->down, stats->paused);
     gtk_statusbar_pop(GTK_STATUSBAR(sb), priv->countSpeedsCtx);
     gtk_statusbar_push(GTK_STATUSBAR(sb),
diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c
index c364329..da06c56 100644
--- a/src/trg-toolbar.c
+++ b/src/trg-toolbar.c
@@ -218,7 +218,8 @@ static void trg_toolbar_init(TrgToolbar * self)
         trg_toolbar_item_new(self, _("Disconnect"), &position,
                              GTK_STOCK_DISCONNECT, FALSE);
     priv->tb_add =
-        trg_toolbar_item_new(self, _("Add"), &position, GTK_STOCK_ADD, FALSE);
+        trg_toolbar_item_new(self, _("Add"), &position, GTK_STOCK_ADD,
+                             FALSE);
 
     /*priv->tb_add_url =
        trg_toolbar_item_new(self, "Add URL", 3, GTK_STOCK_ADD, FALSE); */
diff --git a/src/trg-torrent-add-url-dialog.c b/src/trg-torrent-add-url-dialog.c
index 5b65581..9a2d72e 100644
--- a/src/trg-torrent-add-url-dialog.c
+++ b/src/trg-torrent-add-url-dialog.c
@@ -86,7 +86,8 @@ static void trg_torrent_add_url_dialog_init(TrgTorrentAddUrlDialog * self)
     w = hig_workarea_add_row(t, &row, "URL:", w, NULL);
 
     priv->startCheck =
-        hig_workarea_add_wide_checkbutton(t, &row, _("Start Paused"), FALSE);
+        hig_workarea_add_wide_checkbutton(t, &row, _("Start Paused"),
+                                          FALSE);
 
     gtk_window_set_title(GTK_WINDOW(self), _("Add torrent from URL"));
     gtk_window_set_destroy_with_parent(GTK_WINDOW(self), TRUE);
diff --git a/src/trg-torrent-graph.c b/src/trg-torrent-graph.c
index 1fc21a6..16b8f64 100644
--- a/src/trg-torrent-graph.c
+++ b/src/trg-torrent-graph.c
@@ -201,7 +201,7 @@ void trg_torrent_graph_draw_background(TrgTorrentGraph * g)
     cairo_destroy(cr);
 }
 
-void trg_torrent_graph_set_nothing(TrgTorrentGraph *g)
+void trg_torrent_graph_set_nothing(TrgTorrentGraph * g)
 {
     TrgTorrentGraphPrivate *priv = TRG_TORRENT_GRAPH_GET_PRIVATE(g);
 
@@ -277,7 +277,8 @@ trg_torrent_graph_expose(GtkWidget * widget,
     cairo_set_line_width(cr, GRAPH_LINE_WIDTH);
     cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
     cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
-    cairo_rectangle(cr, priv->rmargin + priv->indent + GRAPH_FRAME_WIDTH + 1,
+    cairo_rectangle(cr,
+                    priv->rmargin + priv->indent + GRAPH_FRAME_WIDTH + 1,
                     GRAPH_FRAME_WIDTH - 1,
                     priv->draw_width - priv->rmargin - priv->indent - 1,
                     priv->real_draw_height + GRAPH_FRAME_WIDTH - 1);
@@ -390,13 +391,19 @@ static void trg_torrent_graph_update_net(TrgTorrentGraph * g)
     fp[0] = 1.0f * priv->out / priv->max;
     fp[1] = 1.0f * priv->in / priv->max;
 
-    trg_strlspeed(speed, (gint64)(priv->out/1024));
-    labelMarkup = g_markup_printf_escaped("<span font_size=\"small\" color=\""GRAPH_OUT_COLOR"\">%s: %s</span>", _("Total Uploading"), speed);
+    trg_strlspeed(speed, (gint64) (priv->out / 1024));
+    labelMarkup =
+        g_markup_printf_escaped("<span font_size=\"small\" color=\""
+                                GRAPH_OUT_COLOR "\">%s: %s</span>",
+                                _("Total Uploading"), speed);
     gtk_label_set_markup(GTK_LABEL(priv->label_out), labelMarkup);
     g_free(labelMarkup);
 
-    trg_strlspeed(speed, (gint64)(priv->in/1024));
-    labelMarkup = g_markup_printf_escaped("<span font_size=\"small\" color=\""GRAPH_IN_COLOR"\">%s: %s</span>", _("Total Downloading"), speed);
+    trg_strlspeed(speed, (gint64) (priv->in / 1024));
+    labelMarkup =
+        g_markup_printf_escaped("<span font_size=\"small\" color=\""
+                                GRAPH_IN_COLOR "\">%s: %s</span>",
+                                _("Total Downloading"), speed);
     gtk_label_set_markup(GTK_LABEL(priv->label_in), labelMarkup);
     g_free(labelMarkup);
 
@@ -524,7 +531,8 @@ static GObject *trg_torrent_graph_constructor(GType type,
     for (i = 0; i < GRAPH_NUM_DATA_BLOCK_ELEMENTS; i++) {
         priv->data_block[i] = -1.0f;
         if (i % GRAPH_NUM_LINES == 0)
-            priv->points = g_list_append(priv->points, &priv->data_block[i]);
+            priv->points =
+                g_list_append(priv->points, &priv->data_block[i]);
     }
 
     return object;
diff --git a/src/trg-torrent-graph.h b/src/trg-torrent-graph.h
index ec9166a..c71f3b6 100644
--- a/src/trg-torrent-graph.h
+++ b/src/trg-torrent-graph.h
@@ -46,7 +46,7 @@ void trg_torrent_graph_change_speed(TrgTorrentGraph * g, guint new_speed);
 
 void trg_torrent_graph_set_speed(TrgTorrentGraph * g,
                                  trg_torrent_model_update_stats * stats);
-void trg_torrent_graph_set_nothing(TrgTorrentGraph *g);
+void trg_torrent_graph_set_nothing(TrgTorrentGraph * g);
 
 G_END_DECLS
 #endif                          /* _TRG_TORRENT_GRAPH */
diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c
index 2b80aef..2851b7c 100644
--- a/src/trg-torrent-props-dialog.c
+++ b/src/trg-torrent-props-dialog.c
@@ -138,10 +138,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
@@ -219,7 +221,8 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win,
     w = priv->seedRatioMode = gtk_combo_box_new_text();
     widget_set_json_key(GTK_WIDGET(w), FIELD_SEED_RATIO_MODE);
     gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Use global settings"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Stop seeding at ratio"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(w),
+                              _("Stop seeding at ratio"));
     gtk_combo_box_append_text(GTK_COMBO_BOX(w),
                               _("Seed regardless of ratio"));
     gtk_combo_box_set_active(GTK_COMBO_BOX(w),
diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c
index ee8cfd8..fc5833f 100644
--- a/src/trg-torrent-tree-view.c
+++ b/src/trg-torrent-tree-view.c
@@ -37,7 +37,8 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tv)
 {
     trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(tv),
                                          TORRENT_COLUMN_ICON,
-                                         TORRENT_COLUMN_NAME, _("Name"), 300);
+                                         TORRENT_COLUMN_NAME, _("Name"),
+                                         300);
     trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), _("Size"),
                                   TORRENT_COLUMN_SIZE, -1);
     trg_tree_view_add_prog_column(TRG_TREE_VIEW(tv), _("Done"),
diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c
index 5cedc67..f5fe71a 100644
--- a/src/trg-trackers-tree-view.c
+++ b/src/trg-trackers-tree-view.c
@@ -248,8 +248,8 @@ view_popup_menu_add_only(GtkWidget * treeview, GdkEventButton * event,
     menu = gtk_menu_new();
 
     menuitem =
-        trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), GTK_STOCK_ADD,
-                              TRUE);
+        trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"),
+                              GTK_STOCK_ADD, TRUE);
     g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker),
                      treeview);
 
@@ -275,8 +275,8 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event,
                      treeview);
 
     menuitem =
-        trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), GTK_STOCK_ADD,
-                              TRUE);
+        trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"),
+                              GTK_STOCK_ADD, TRUE);
     g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker),
                      treeview);
 
diff --git a/src/util.c b/src/util.c
index f1c8571..906cf90 100644
--- a/src/util.c
+++ b/src/util.c
@@ -199,9 +199,10 @@ char *tr_strltime_long(char *buf, gint64 seconds, size_t buflen)
     seconds = (seconds % 3600) % 60;
 
     g_snprintf(d, sizeof(d), ngettext("%d day", "%d days", days), days);
-    g_snprintf(h, sizeof(h), ngettext("%d hour", "%d hours", hours), hours);
-    g_snprintf(m, sizeof(m), ngettext("%d minute", "%d minutes",
-               minutes), minutes);
+    g_snprintf(h, sizeof(h), ngettext("%d hour", "%d hours", hours),
+               hours);
+    g_snprintf(m, sizeof(m), ngettext("%d minute", "%d minutes", minutes),
+               minutes);
     g_snprintf(s, sizeof(s),
                ngettext("%ld second", "%ld seconds", seconds), seconds);