summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/trg-main-window.c2
-rw-r--r--src/trg-state-selector.c50
-rw-r--r--src/trg-state-selector.h2
-rw-r--r--src/trg-torrent-model.c1
4 files changed, 24 insertions, 31 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 58f7505..5461fb3 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -1298,7 +1298,7 @@ void trg_main_window_reload_dir_aliases(TrgMainWindow * win)
trg_torrent_model_reload_dir_aliases(priv->client,
GTK_TREE_MODEL
(priv->torrentModel));
- trg_state_selector_update(priv->stateSelector, TORRENT_UPDATE_ADDREMOVE);
+ trg_state_selector_update(priv->stateSelector);
}
static TrgTorrentTreeView
diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c
index 48d6b01..5bad1cc 100644
--- a/src/trg-state-selector.c
+++ b/src/trg-state-selector.c
@@ -161,27 +161,26 @@ static void trg_state_selector_update_dynamic_filter(GtkTreeModel * model,
if (oldSerial != serial) {
g_value_init(&gvalue, G_TYPE_INT);
g_value_set_int(&gvalue, 1);
- gtk_list_store_set_value(GTK_LIST_STORE(model), &iter,
- STATE_SELECTOR_COUNT, &gvalue);
+ gtk_list_store_set_value(GTK_LIST_STORE(model), &iter, STATE_SELECTOR_COUNT,
+ &gvalue);
memset(&gvalue, 0, sizeof(GValue));
g_value_init(&gvalue, G_TYPE_INT64);
g_value_set_int64(&gvalue, serial);
- gtk_list_store_set_value(GTK_LIST_STORE(model), &iter,
- STATE_SELECTOR_SERIAL, &gvalue);
+ gtk_list_store_set_value(GTK_LIST_STORE(model), &iter, STATE_SELECTOR_SERIAL,
+ &gvalue);
} else {
g_value_init(&gvalue, G_TYPE_INT);
g_value_set_int(&gvalue, ++oldCount);
- gtk_list_store_set_value(GTK_LIST_STORE(model), &iter,
- STATE_SELECTOR_COUNT, &gvalue);
+ gtk_list_store_set_value(GTK_LIST_STORE(model), &iter, STATE_SELECTOR_COUNT,
+ &gvalue);
}
gtk_tree_path_free(path);
}
static void refresh_statelist_cb(GtkWidget * w, gpointer data) {
- trg_state_selector_update(TRG_STATE_SELECTOR(data),
- TORRENT_UPDATE_ADDREMOVE);
+ trg_state_selector_update(TRG_STATE_SELECTOR(data));
}
static void view_popup_menu(GtkWidget * treeview, GdkEventButton * event,
@@ -264,7 +263,7 @@ static void trg_state_selector_insert(TrgStateSelector * s, int offset,
gtk_list_store_insert(GTK_LIST_STORE(model), iter, args.pos);
}
-void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged) {
+void trg_state_selector_update(TrgStateSelector * s) {
TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(s));
TrgClient *client = priv->client;
@@ -301,9 +300,7 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged) {
if (!t)
continue;
- if (priv->showTrackers
- && ((whatsChanged & TORRENT_UPDATE_PATH_CHANGE)
- || (whatsChanged & TORRENT_UPDATE_ADDREMOVE))) {
+ if (priv->showTrackers) {
trackersList = json_array_get_elements(
torrent_get_tracker_stats(t));
for (trackerItem = trackersList; trackerItem;
@@ -331,8 +328,9 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged) {
STATE_SELECTOR_ICON, GTK_STOCK_NETWORK,
STATE_SELECTOR_NAME, announceHost,
STATE_SELECTOR_SERIAL, updateSerial,
- STATE_SELECTOR_COUNT, 1, STATE_SELECTOR_BIT,
- FILTER_FLAG_TRACKER, STATE_SELECTOR_INDEX, 0, -1);
+ STATE_SELECTOR_COUNT, 1,
+ STATE_SELECTOR_BIT, FILTER_FLAG_TRACKER,
+ STATE_SELECTOR_INDEX, 0, -1);
g_hash_table_insert(priv->trackers, announceHost,
quick_tree_ref_new(model, &iter));
}
@@ -340,7 +338,7 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged) {
g_list_free(trackersList);
}
- if (priv->showTrackers && (whatsChanged & TORRENT_UPDATE_ADDREMOVE)) {
+ if (priv->showDirs) {
gchar *dir;
gtk_tree_model_get(torrentModel, &torrentIter,
TORRENT_COLUMN_DOWNLOADDIR_SHORT, &dir, -1);
@@ -357,7 +355,8 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged) {
STATE_SELECTOR_ICON, GTK_STOCK_DIRECTORY,
STATE_SELECTOR_NAME, dir, STATE_SELECTOR_SERIAL,
updateSerial, STATE_SELECTOR_BIT, FILTER_FLAG_DIR,
- STATE_SELECTOR_COUNT, 1, STATE_SELECTOR_INDEX, 0, -1);
+ STATE_SELECTOR_COUNT, 1,
+ STATE_SELECTOR_INDEX, 0, -1);
g_hash_table_insert(priv->directories, g_strdup(dir),
quick_tree_ref_new(model, &iter));
}
@@ -370,15 +369,13 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged) {
cruft.serial = trg_client_get_serial(client);
- if (priv->showTrackers && ((whatsChanged & TORRENT_UPDATE_ADDREMOVE))) {
+ if (priv->showTrackers) {
cruft.table = priv->trackers;
g_hash_table_foreach_remove(priv->trackers,
trg_state_selector_remove_cruft, &cruft);
}
- if (priv->showDirs
- && ((whatsChanged & TORRENT_UPDATE_PATH_CHANGE)
- || (whatsChanged & TORRENT_UPDATE_ADDREMOVE))) {
+ if (priv->showDirs) {
cruft.table = priv->directories;
g_hash_table_foreach_remove(priv->directories,
trg_state_selector_remove_cruft, &cruft);
@@ -391,18 +388,15 @@ void trg_state_selector_set_show_dirs(TrgStateSelector * s, gboolean show) {
if (!show)
g_hash_table_remove_all(priv->directories);
else
- trg_state_selector_update(s, TORRENT_UPDATE_PATH_CHANGE);
+ trg_state_selector_update(s);
}
static void on_torrents_state_change(TrgTorrentModel * model,
guint whatsChanged, gpointer data) {
TrgStateSelector *selector = TRG_STATE_SELECTOR(data);
- trg_state_selector_update(selector, whatsChanged);
-
- if ((whatsChanged & TORRENT_UPDATE_ADDREMOVE)
- || (whatsChanged & TORRENT_UPDATE_STATE_CHANGE))
- trg_state_selector_stats_update(selector,
- trg_torrent_model_get_stats(model));
+ trg_state_selector_update(selector);
+ trg_state_selector_stats_update(selector,
+ trg_torrent_model_get_stats(model));
}
void trg_state_selector_set_show_trackers(TrgStateSelector * s, gboolean show) {
@@ -411,7 +405,7 @@ void trg_state_selector_set_show_trackers(TrgStateSelector * s, gboolean show) {
if (!show)
g_hash_table_remove_all(priv->trackers);
else
- trg_state_selector_update(s, TORRENT_UPDATE_ADDREMOVE);
+ trg_state_selector_update(s);
}
static void trg_state_selector_add_state(TrgStateSelector * selector,
diff --git a/src/trg-state-selector.h b/src/trg-state-selector.h
index 2d9af17..f002b3b 100644
--- a/src/trg-state-selector.h
+++ b/src/trg-state-selector.h
@@ -64,7 +64,7 @@ GType trg_state_selector_get_type(void);
TrgStateSelector *trg_state_selector_new(TrgClient * client, TrgTorrentModel *tmodel);
G_END_DECLS guint32 trg_state_selector_get_flag(TrgStateSelector * s);
-void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged);
+void trg_state_selector_update(TrgStateSelector * s);
gchar *trg_state_selector_get_selected_text(TrgStateSelector * s);
GRegex *trg_state_selector_get_url_host_regex(TrgStateSelector * s);
void trg_state_selector_disconnect(TrgStateSelector * s);
diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c
index f9231e8..e46b876 100644
--- a/src/trg-torrent-model.c
+++ b/src/trg-torrent-model.c
@@ -249,7 +249,6 @@ static gboolean trg_torrent_model_reload_dir_aliases_foreachfunc(
void trg_torrent_model_reload_dir_aliases(TrgClient * tc, GtkTreeModel * model) {
gtk_tree_model_foreach(model,
trg_torrent_model_reload_dir_aliases_foreachfunc, tc);
- g_signal_emit(model, signals[TMODEL_STATE_CHANGED], 0, TORRENT_UPDATE_PATH_CHANGE);
}
static gboolean trg_torrent_model_stats_scan_foreachfunc(GtkTreeModel * model,
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-04 10:50:24 +0000