From 2a52ebab20e602fd8be613db7b0dc7b1909aedb1 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Fri, 4 Jan 2013 16:36:52 +0000 Subject: [PATCH] (gtk) copyediting: use G_SOURCE_REMOVE and G_SOURCE_CONTINUE where appropriate --- gtk/details.c | 3 ++- gtk/file-list.c | 3 ++- gtk/main.c | 6 +++--- gtk/makemeta-ui.c | 3 ++- gtk/msgwin.c | 2 +- gtk/relocate.c | 2 +- gtk/stats.c | 2 +- gtk/tr-core.c | 4 ++-- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gtk/details.c b/gtk/details.c index cede45e2c..d1132b739 100644 --- a/gtk/details.c +++ b/gtk/details.c @@ -2481,7 +2481,8 @@ static gboolean periodic_refresh (gpointer data) { refresh (data); - return TRUE; + + return G_SOURCE_CONTINUE; } static void diff --git a/gtk/file-list.c b/gtk/file-list.c index 9852e081c..eaf74fc0a 100644 --- a/gtk/file-list.c +++ b/gtk/file-list.c @@ -279,7 +279,8 @@ static gboolean refreshModel (gpointer file_data) { refresh (file_data); - return TRUE; + + return G_SOURCE_CONTINUE; } /*** diff --git a/gtk/main.c b/gtk/main.c index e23422f8c..4a3b2bba2 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -267,7 +267,7 @@ refresh_actions (gpointer gdata) gtr_action_set_sensitive ("torrent-reannounce", canUpdate != 0); data->refresh_actions_tag = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -881,7 +881,7 @@ on_session_closed (gpointer gdata) g_slist_foreach (cbdata->duplicates_list, (GFunc)g_free, NULL); g_slist_free (cbdata->duplicates_list); - return FALSE; + return G_SOURCE_REMOVE; } struct session_close_struct @@ -1289,7 +1289,7 @@ update_model_once (gpointer gdata) gtr_icon_refresh (data->icon); data->update_model_soon_tag = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c index 5f113cb8c..aefd882d9 100644 --- a/gtk/makemeta-ui.c +++ b/gtk/makemeta-ui.c @@ -111,7 +111,8 @@ onProgressDialogRefresh (gpointer data) gtk_dialog_set_response_sensitive (d, GTK_RESPONSE_ACCEPT, b->isDone && !b->result); g_free (base); - return TRUE; + + return G_SOURCE_CONTINUE; } static void diff --git a/gtk/msgwin.c b/gtk/msgwin.c index f6d6f59ed..050ad4ea4 100644 --- a/gtk/msgwin.c +++ b/gtk/msgwin.c @@ -430,7 +430,7 @@ onRefresh (gpointer gdata) scroll_to_bottom (data); } - return TRUE; + return G_SOURCE_CONTINUE; } static GtkWidget* diff --git a/gtk/relocate.c b/gtk/relocate.c index 189afee7f..5edc4b996 100644 --- a/gtk/relocate.c +++ b/gtk/relocate.c @@ -99,7 +99,7 @@ onTimer (gpointer gdata) } } - return TRUE; /* keep looping */ + return G_SOURCE_CONTINUE; } static void diff --git a/gtk/stats.c b/gtk/stats.c index e80e948e2..7024ce55a 100644 --- a/gtk/stats.c +++ b/gtk/stats.c @@ -81,7 +81,7 @@ updateStats (gpointer gdata) setLabel (ui->all_time_lb, tr_strltime (buf, all.secondsActive, buflen)); setLabelFromRatio (ui->all_ratio_lb, all.ratio); - return TRUE; + return G_SOURCE_CONTINUE; } static void diff --git a/gtk/tr-core.c b/gtk/tr-core.c index 48a1d0d83..07b723e0d 100644 --- a/gtk/tr-core.c +++ b/gtk/tr-core.c @@ -706,9 +706,9 @@ core_watchdir_idle (gpointer gcore) /* if monitor_files is nonempty, keep checking every second */ if (core->priv->monitor_files) - return TRUE; + return G_SOURCE_CONTINUE; core->priv->monitor_idle_tag = 0; - return FALSE; + return G_SOURCE_REMOVE; } /* If this file is a torrent, add it to our list */