diff options
| -rw-r--r-- | src/trg-main-window.c | 9 | ||||
| -rw-r--r-- | src/trg-peers-tree-view.c | 2 | ||||
| -rw-r--r-- | src/trg-torrent-add-dialog.c | 1 | ||||
| -rw-r--r-- | src/trg-trackers-tree-view.c | 7 | ||||
| -rw-r--r-- | src/util.c | 4 | ||||
| -rw-r--r-- | src/util.h | 4 |
6 files changed, 14 insertions, 13 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 490f377..e3eb0fd 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -262,7 +262,7 @@ static void update_selected_torrent_notebook(TrgMainWindow * win, JsonObject *t; GtkTreeIter iter; - if (id >= 0 && id != priv->selectedTorrentId + if (id >= 0 && get_torrent_data(client->torrentTable, id, &t, &iter)) { trg_toolbar_torrent_actions_sensitive(priv->toolBar, TRUE); trg_menu_bar_torrent_actions_sensitive(priv->menuBar, TRUE); @@ -273,7 +273,6 @@ static void update_selected_torrent_notebook(TrgMainWindow * win, mode); trg_peers_model_update(priv->peersModel, client->updateSerial, t, mode); - } else if (id < 0) { trg_main_window_torrent_scrub(win); trg_toolbar_torrent_actions_sensitive(priv->toolBar, FALSE); @@ -1407,11 +1406,11 @@ static void set_limit_cb(GtkWidget * w, gpointer data) JsonNode *req = NULL; JsonObject *args; - if (limitIds) { + + if (limitIds) req = torrent_set((JsonArray *) limitIds); - } else { + else req = session_set(); - } args = node_get_arguments(req); diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c index 1935853..c4f9c32 100644 --- a/src/trg-peers-tree-view.c +++ b/src/trg-peers-tree-view.c @@ -46,7 +46,7 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self) trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, PEERSCOL_ICON, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, PEERSCOL_IP, _("IP"), "ip", 0); desc->model_column_icon = PEERSCOL_ICON; diff --git a/src/trg-torrent-add-dialog.c b/src/trg-torrent-add-dialog.c index cd6308f..4604a8e 100644 --- a/src/trg-torrent-add-dialog.c +++ b/src/trg-torrent-add-dialog.c @@ -208,6 +208,7 @@ static GtkWidget *trg_destination_folder_new(trg_client * client) gtk_tree_path_free(path); } } + g_list_free(torrentItemRefs); g_mutex_unlock(client->updateMutex); diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index 88632e2..ea4d703 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -122,9 +122,10 @@ static void trg_tracker_announce_edited(GtkCellRendererText * renderer, } static void trg_tracker_announce_editing_started(GtkCellRenderer * - renderer, + renderer G_GNUC_UNUSED, GtkCellEditable * - editable, gchar * path, + editable G_GNUC_UNUSED, + gchar * path G_GNUC_UNUSED, gpointer user_data) { TrgTrackersModel *model = @@ -134,7 +135,7 @@ static void trg_tracker_announce_editing_started(GtkCellRenderer * trg_trackers_model_set_accept(model, FALSE); } -static void trg_tracker_announce_editing_canceled(GtkWidget * w, +static void trg_tracker_announce_editing_canceled(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgTrackersModel *model = @@ -246,7 +246,7 @@ char *tr_strlspeed(char *buf, double kb_sec, size_t buflen) return buf; } -char *tr_strltime_short(char *buf, gint64 seconds, size_t buflen) +char *tr_strltime_short(char *buf, long seconds, size_t buflen) { int hours, minutes; @@ -262,7 +262,7 @@ char *tr_strltime_short(char *buf, gint64 seconds, size_t buflen) return buf; } -char *tr_strltime_long(char *buf, gint64 seconds, size_t buflen) +char *tr_strltime_long(char *buf, long seconds, size_t buflen) { int days, hours, minutes; char d[128], h[128], m[128], s[128]; @@ -53,8 +53,8 @@ const gchar *make_error_message(JsonObject * response, int status); void trg_error_dialog(GtkWindow * parent, int status, JsonObject * response); -char *tr_strltime_long(char *buf, gint64 seconds, size_t buflen); -char *tr_strltime_short(char *buf, gint64 seconds, size_t buflen); +char *tr_strltime_long(char *buf, long seconds, size_t buflen); +char *tr_strltime_short(char *buf, long seconds, size_t buflen); char *tr_strpercent(char *buf, double x, size_t buflen); char *tr_strlpercent(char *buf, double x, size_t buflen); char *tr_strratio(char *buf, size_t buflen, double ratio, |