fix that min/max problem reported by reardonia

11 files changed, 74 insertions, 64 deletions

diff --git a/src/main.c b/src/main.c
index 0dfb92a..1bd21c4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -158,7 +158,8 @@ static gint trg_gtkapp_init(TrgClient * client, int argc, char *argv[])
 
 #else
 
-static gint trg_simple_init(TrgClient * client, int argc, char *argv[], gchar **args)
+static gint trg_simple_init(TrgClient * client, int argc, char *argv[],
+                            gchar ** args)
 {
     TrgMainWindow *window =
         trg_main_window_new(client, should_be_minimised(argc, argv));
diff --git a/src/trg-gtk-app.c b/src/trg-gtk-app.c
index f08f32f..5652568 100644
--- a/src/trg-gtk-app.c
+++ b/src/trg-gtk-app.c
@@ -91,7 +91,6 @@ static void trg_gtk_app_startup(GtkApplication * app, gpointer data)
     TrgMainWindow *window =
         trg_main_window_new(priv->client, priv->min_start);
     gtk_window_set_application(GTK_WINDOW(window), app);
-
 }
 
 static int
@@ -102,8 +101,7 @@ trg_gtk_app_command_line(GApplication * application,
         gtk_application_get_windows(GTK_APPLICATION(application));
     gchar **argv = g_application_command_line_get_arguments(cmdline, NULL);
 
-    if (argv && argv[0])
-        auto_connect_if_required(TRG_MAIN_WINDOW(windows->data), argv);
+    auto_connect_if_required(TRG_MAIN_WINDOW(windows->data), argv);
 
     return 0;
 }
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index a6dfc9f..1da4ca2 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -218,7 +218,6 @@ struct _TrgMainWindowPrivate {
     GtkMenu *iconMenu;
     GtkStatusIcon *statusIcon;
 #endif
-    GdkPixbuf *icon;
     TrgStateSelector *stateSelector;
     GtkWidget *stateSelectorScroller;
     TrgGeneralPanel *genDetails;
@@ -429,7 +428,8 @@ static void add_url_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data);
 
     TrgTorrentAddUrlDialog *dlg = trg_torrent_add_url_dialog_new(win,
-                                                                 priv->client);
+                                                                 priv->
+                                                                 client);
     gtk_widget_show_all(GTK_WIDGET(dlg));
 }
 
@@ -469,9 +469,15 @@ gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris)
     GSList *filesList = NULL;
     int i;
 
-    for (i = 0; uris[i]; i++)
-        if (uris[i])
-            filesList = g_slist_append(filesList, uris[i]);
+    if (uris)
+        for (i = 0; uris[i]; i++)
+            if (uris[i])
+                filesList = g_slist_append(filesList, uris[i]);
+
+    g_free(uris);
+
+    if (!filesList)
+        return EXIT_SUCCESS;
 
     if (trg_prefs_get_bool(prefs, TRG_PREFS_KEY_ADD_OPTIONS_DIALOG,
                            TRG_PREFS_GLOBAL)) {
@@ -492,10 +498,6 @@ gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris)
         launch_add_thread(args);
     }
 
-    g_free(uris);               // launch_add_thread() or trg_torrent_add_dialog() will free the filenames and fileList;
-
-    priv->args = NULL;
-
     return EXIT_SUCCESS;
 }
 
@@ -907,9 +909,8 @@ static void trg_main_window_toggle_graph_cb(GtkCheckMenuItem * w,
     } else if (gtk_check_menu_item_get_active(w)) {
         if (priv->graphNotebookIndex < 0)
             trg_main_window_add_graph(TRG_MAIN_WINDOW(win), TRUE);
-    } else {
-        if (priv->graphNotebookIndex >= 0)
-            trg_main_window_remove_graph(TRG_MAIN_WINDOW(win));
+    } else if (priv->graphNotebookIndex >= 0) {
+        trg_main_window_remove_graph(TRG_MAIN_WINDOW(win));
     }
 }
 #endif
@@ -1241,8 +1242,10 @@ static gboolean on_torrent_get_first(gpointer data)
 
     gboolean result = on_torrent_get(data, TORRENT_GET_MODE_FIRST);
 
-    if (priv->args)
+    if (priv->args) {
         trg_add_from_filename(win, priv->args);
+        priv->args = NULL;
+    }
 
     return result;
 }
@@ -1321,7 +1324,8 @@ static gboolean trg_torrent_tree_view_visible_func(GtkTreeModel * model,
             matchesTracker = (!json
                               || !torrent_has_tracker(json,
                                                       trg_state_selector_get_url_host_regex
-                                                      (priv->stateSelector),
+                                                      (priv->
+                                                       stateSelector),
                                                       text));
             g_free(text);
             if (matchesTracker)
@@ -1698,7 +1702,7 @@ static void status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED,
         g_source_remove(priv->timerId);
         dispatch_async(priv->client,
                        torrent_get(TORRENT_GET_TAG_MODE_FULL),
-                       on_torrent_get_first, data);
+                       on_torrent_get_update, data);
     }
 }
 
@@ -1709,12 +1713,11 @@ static gboolean trg_status_icon_popup_menu_cb(GtkStatusIcon * icon,
 
     gtk_menu_popup(priv->iconMenu, NULL, NULL,
 #ifdef WIN32
-                       NULL,
+                   NULL,
 #else
-                       gtk_status_icon_position_menu,
+                   gtk_status_icon_position_menu,
 #endif
-				   priv->statusIcon, 0,
-                   gtk_get_current_event_time());
+                   priv->statusIcon, 0, gtk_get_current_event_time());
 
     return TRUE;
 }
@@ -1731,7 +1734,7 @@ static gboolean status_icon_button_press_event(GtkStatusIcon * icon,
 #else
                        gtk_status_icon_position_menu,
 #endif
-					   priv->statusIcon,
+                       priv->statusIcon,
                        event->button,
                        gdk_event_get_time((GdkEvent *) event));
         return TRUE;
@@ -2345,10 +2348,8 @@ void trg_main_window_add_status_icon(TrgMainWindow * win)
                                trg_status_icon_view_menu(win, NULL));
     }
 #else
-    if (!priv->icon)
-        return;
 
-    priv->statusIcon = gtk_status_icon_new_from_pixbuf(priv->icon);
+    priv->statusIcon = gtk_status_icon_new_from_icon_name(PACKAGE_NAME);
     gtk_status_icon_set_screen(priv->statusIcon,
                                gtk_window_get_screen(GTK_WINDOW(win)));
     g_signal_connect(priv->statusIcon, "activate",
@@ -2471,15 +2472,11 @@ static GObject *trg_main_window_constructor(GType type,
 
     theme = gtk_icon_theme_get_default();
     register_my_icons(theme);
-    priv->icon = gtk_icon_theme_load_icon(theme, PACKAGE_NAME, 48,
-                                          GTK_ICON_LOOKUP_USE_BUILTIN,
-                                          NULL);
 
 #ifdef HAVE_LIBNOTIFY
     notify_init(PACKAGE_NAME);
 #endif
-    if (priv->icon)
-        gtk_window_set_default_icon(priv->icon);
+    gtk_window_set_default_icon_name(PACKAGE_NAME);
 
     gtk_window_set_title(GTK_WINDOW(self), _("Transmission Remote"));
     gtk_window_set_default_size(GTK_WINDOW(self), 1000, 600);
@@ -2515,7 +2512,8 @@ static GObject *trg_main_window_constructor(GType type,
                                            self, NULL);
 
     priv->torrentTreeView = trg_main_window_torrent_tree_view_new(self,
-                                                                  priv->filteredTorrentModel);
+                                                                  priv->
+                                                                  filteredTorrentModel);
     g_signal_connect(priv->torrentTreeView, "popup-menu",
                      G_CALLBACK(torrent_tv_popup_menu_cb), self);
     g_signal_connect(priv->torrentTreeView, "button-press-event",
@@ -2563,7 +2561,8 @@ static GObject *trg_main_window_constructor(GType type,
                     FALSE, FALSE);
 
     gtk_paned_pack2(GTK_PANED(priv->hpaned), my_scrolledwin_new(GTK_WIDGET
-                                                                (priv->torrentTreeView)),
+                                                                (priv->
+                                                                 torrentTreeView)),
                     TRUE, TRUE);
 
     g_signal_connect(G_OBJECT(priv->stateSelector),
diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c
index d4f5680..29e1b86 100644
--- a/src/trg-preferences-dialog.c
+++ b/src/trg-preferences-dialog.c
@@ -385,7 +385,8 @@ static void trgp_double_special_dependent(GtkWidget * widget,
                              (priv->fullUpdateCheck)
                              &&
                              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
-                                                          (priv->fullUpdateCheck)));
+                                                          (priv->
+                                                           fullUpdateCheck)));
 }
 
 static GtkWidget *trg_prefs_generalPage(TrgPreferencesDialog * dlg)
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index 8c921e4..8f866ea 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -159,10 +159,12 @@ static void trg_remote_prefs_double_special_dependent(GtkWidget * widget,
 
     gtk_widget_set_sensitive(GTK_WIDGET(data),
                              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
-                                                          (priv->alt_time_check))
+                                                          (priv->
+                                                           alt_time_check))
                              ||
                              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
-                                                          (priv->alt_check)));
+                                                          (priv->
+                                                           alt_check)));
 }
 
 static void trg_rprefs_time_widget_savefunc(GtkWidget * w,
diff --git a/src/trg-torrent-graph.h b/src/trg-torrent-graph.h
index 914a184..49a9b87 100644
--- a/src/trg-torrent-graph.h
+++ b/src/trg-torrent-graph.h
@@ -53,6 +53,5 @@ void trg_torrent_graph_set_speed(TrgTorrentGraph * g,
 void trg_torrent_graph_set_nothing(TrgTorrentGraph * g);
 
 G_END_DECLS
-
 #endif
-#endif /* _TRG_TORRENT_GRAPH */
+#endif                          /* _TRG_TORRENT_GRAPH */
diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c
index a0ae22a..d18b577 100644
--- a/src/trg-torrent-props-dialog.c
+++ b/src/trg-torrent-props-dialog.c
@@ -136,12 +136,10 @@ trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id,
 
     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);
 
     trg_json_widgets_save(priv->widgets, args);
diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c
index 54c5cf5..4265c7d 100644
--- a/src/trg-tree-view.c
+++ b/src/trg-tree-view.c
@@ -313,7 +313,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
             gtk_cell_renderer_text_new();
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer, "text",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
 
         break;
@@ -322,7 +323,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "speed-value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_EPOCH:
@@ -330,7 +332,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "epoch-value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_ETA:
@@ -338,7 +341,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "eta-value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_SIZE:
@@ -346,7 +350,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "size-value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_PROG:
@@ -354,7 +359,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_RATIO:
@@ -362,7 +368,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "ratio-value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_WANTED:
@@ -387,7 +394,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "priority-value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_NUMGTZERO:
@@ -395,7 +403,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     case TRG_COLTYPE_NUMGTEQZERO:
@@ -403,7 +412,8 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv,
         column = gtk_tree_view_column_new_with_attributes(desc->header,
                                                           renderer,
                                                           "value",
-                                                          desc->model_column,
+                                                          desc->
+                                                          model_column,
                                                           NULL);
         break;
     }
@@ -557,7 +567,8 @@ void trg_tree_view_setup_columns(TrgTreeView * tv)
                                                                  json_node_get_string
                                                                  ((JsonNode
                                                                    *)
-                                                                  cli->data));
+                                                                  cli->
+                                                                  data));
         if (desc) {
             gint64 width = json_node_get_int((JsonNode *) wli->data);
             trg_tree_view_add_column(tv, desc, width);
diff --git a/src/util.h b/src/util.h
index aeb984d..5cb8774 100644
--- a/src/util.h
+++ b/src/util.h
@@ -48,7 +48,8 @@ extern const char *speed_M_str;
 extern const char *speed_G_str;
 extern const char *speed_T_str;
 
-void add_file_id_to_array(JsonObject * args, const gchar * key, gint index);
+void add_file_id_to_array(JsonObject * args, const gchar * key,
+                          gint index);
 void g_str_slist_free(GSList * list);
 GRegex *trg_uri_host_regex_new(void);
 gchar *trg_gregex_get_first(GRegex * rx, const gchar * uri);
diff --git a/src/win32-mailslot.c b/src/win32-mailslot.c
index 274aa6f..d000281 100644
--- a/src/win32-mailslot.c
+++ b/src/win32-mailslot.c
@@ -141,13 +141,13 @@ void mailslot_start_background_listener(TrgMainWindow * win)
 
 gboolean mailslot_send_message(gchar ** args)
 {
-    HANDLE hMailSlot = CreateFile(TRG_MAILSLOT_NAME,   // mailslot name
-                           GENERIC_WRITE,       // mailslot write only
-                           FILE_SHARE_READ,     // required for mailslots
-                           NULL,        // default security attributes
-                           OPEN_EXISTING,       // opens existing mailslot
-                           FILE_ATTRIBUTE_NORMAL,       // normal attributes
-                           NULL);       // no template file
+    HANDLE hMailSlot = CreateFile(TRG_MAILSLOT_NAME,    // mailslot name
+                                  GENERIC_WRITE,        // mailslot write only
+                                  FILE_SHARE_READ,      // required for mailslots
+                                  NULL, // default security attributes
+                                  OPEN_EXISTING,        // opens existing mailslot
+                                  FILE_ATTRIBUTE_NORMAL,        // normal attributes
+                                  NULL);        // no template file
 
     if (hMailSlot != INVALID_HANDLE_VALUE) {
         DWORD cbBytes;
@@ -178,7 +178,7 @@ gboolean mailslot_send_message(gchar ** args)
         json_node_free(node);
         g_object_unref(generator);
 
-        WriteFile(hMailSlot,            // handle to mailslot
+        WriteFile(hMailSlot,    // handle to mailslot
                   msg,          // buffer to write from
                   strlen(msg) + 1,      // number of bytes to write, include the NULL
                   &cbBytes,     // number of bytes written
diff --git a/src/win32-mailslot.h b/src/win32-mailslot.h
index c88ff5a..c0dc71b 100644
--- a/src/win32-mailslot.h
+++ b/src/win32-mailslot.h
@@ -29,4 +29,4 @@ void mailslot_start_background_listener(TrgMainWindow * win);
 int mailslot_send_message(gchar ** args);
 
 #endif
-#endif /* WIN32_MAILSLOT_H_ */
+#endif                          /* WIN32_MAILSLOT_H_ */