(trunk gtk) make it easier to change the periodic refresh intervals at the code level

diff --git a/gtk/details.c b/gtk/details.c
index 6f908837d4295f7284986b1cdf1d654b5c26922e..9f9c8b3f710138058e86aaa150cc099c28d6ffbd 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -30,8 +30,6 @@
 
 #define DETAILS_KEY "details-data"
 
-#define UPDATE_INTERVAL_SECONDS 2
-
 struct DetailsImpl
 {
     GtkWidget * dialog;
@@ -2243,7 +2241,7 @@ torrent_inspector_new( GtkWindow * parent, TrCore * core )
 
     gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 );
 
-    di->periodic_refresh_tag = gtr_timeout_add_seconds( UPDATE_INTERVAL_SECONDS,
+    di->periodic_refresh_tag = gtr_timeout_add_seconds( SECONDARY_WINDOW_REFRESH_INTERVAL_SECONDS,
                                                         periodic_refresh, di );
     gtk_widget_show_all( GTK_DIALOG( d )->vbox );
     return d;

diff --git a/gtk/file-list.c b/gtk/file-list.c
index 5ac37b109463de48141dcf704ff334b3742f7687..23d363b99aff0a69d27f78ea30983e0fa1444f79 100644 (file)
--- a/gtk/file-list.c
+++ b/gtk/file-list.c
@@ -22,6 +22,7 @@
 #include "file-list.h"
 #include "hig.h"
 #include "icons.h"
+#include "tr-prefs.h"
 
 enum
 {
@@ -521,7 +522,7 @@ file_list_set_torrent( GtkWidget * w, int torrentId )
         }
 
         refresh( data );
-        data->timeout_tag = gtr_timeout_add_seconds( 2, refreshModel, data );
+        data->timeout_tag = gtr_timeout_add_seconds( SECONDARY_WINDOW_REFRESH_INTERVAL_SECONDS, refreshModel, data );
     }
 
     gtk_tree_view_set_model( GTK_TREE_VIEW( data->view ), data->model );

diff --git a/gtk/main.c b/gtk/main.c
index 4c2fa80cea0c5fa1d9a64cd87e5dd7664732c9c9..49f2d1431a51468bb33dec20f7299b4ff673dae8 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -61,8 +61,6 @@
 
 #define MY_NAME "transmission"
 
-#define REFRESH_INTERVAL_SECONDS 2
-
 #if GTK_CHECK_VERSION( 2, 8, 0 )
  #define SHOW_LICENSE
 static const char * LICENSE =
@@ -686,7 +684,7 @@ appsetup( TrWindow *      wind,
     prefschanged( cbdata->core, PREF_KEY_SHOW_TRAY_ICON, cbdata );
 
     /* start model update timer */
-    cbdata->timer = gtr_timeout_add_seconds( REFRESH_INTERVAL_SECONDS, updatemodel, cbdata );
+    cbdata->timer = gtr_timeout_add_seconds( MAIN_WINDOW_REFRESH_INTERVAL_SECONDS, updatemodel, cbdata );
     updatemodel( cbdata );
 
     /* either show the window or iconify it */

diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 2fc74dc80d3de1f62b5b8334767a79901299c2ef..6dcf986cf10e7d7a1ca03be7183e395503783d0e 100644 (file)
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -22,6 +22,7 @@
 #include "hig.h"
 #include "makemeta-ui.h"
 #include "tr-core.h"
+#include "tr-prefs.h"
 #include "util.h"
 
 #define FILE_CHOSEN_KEY "file-is-chosen"
@@ -189,7 +190,7 @@ makeProgressDialog( GtkWidget * parent, MakeMetaUI * ui )
     ui->progress_bar = w;
     gtk_box_pack_start( GTK_BOX( v ), w, FALSE, FALSE, 0 );
 
-    ui->progress_tag = gtr_timeout_add_seconds( 1, onProgressDialogRefresh, ui );
+    ui->progress_tag = gtr_timeout_add_seconds( SECONDARY_WINDOW_REFRESH_INTERVAL_SECONDS, onProgressDialogRefresh, ui );
     g_object_weak_ref( G_OBJECT( d ), onProgressDialogDestroyed, ui );
     onProgressDialogRefresh( ui );
 

diff --git a/gtk/msgwin.c b/gtk/msgwin.c
index 7e5d5d9cbb8ef6bbb272b8dc82a6c9904e7750bd..0856b63826acd01c3fb972bacc2f2d9fc60d9bf4 100644 (file)
--- a/gtk/msgwin.c
+++ b/gtk/msgwin.c
@@ -528,7 +528,7 @@ msgwin_new( TrCore * core )
     gtk_box_pack_start( GTK_BOX( vbox ), w, TRUE, TRUE, 0 );
     gtk_container_add( GTK_CONTAINER( win ), vbox );
 
-    data->refresh_tag = gtr_timeout_add_seconds( 2, onRefresh, data );
+    data->refresh_tag = gtr_timeout_add_seconds( SECONDARY_WINDOW_REFRESH_INTERVAL_SECONDS, onRefresh, data );
     g_object_weak_ref( G_OBJECT( win ), onWindowDestroyed, data );
 
     gtk_widget_show_all( win );

diff --git a/gtk/stats.c b/gtk/stats.c
index 00394a02f8ab0cc14525d1c8438bc94ad6e04b67..a741949ec0aef531055d92370c87943ccc9d7251 100644 (file)
--- a/gtk/stats.c
+++ b/gtk/stats.c
@@ -15,6 +15,7 @@
 #include "hig.h"
 #include "stats.h"
 #include "tr-core.h"
+#include "tr-prefs.h"
 
 enum
 {
@@ -187,7 +188,7 @@ stats_dialog_create( GtkWindow * parent,
     updateStats( ui );
     g_object_set_data_full( G_OBJECT( d ), "data", ui, g_free );
     g_signal_connect( d, "response", G_CALLBACK( dialogResponse ), ui );
-    i = gtr_timeout_add_seconds( 1, updateStats, ui );
+    i = gtr_timeout_add_seconds( SECONDARY_WINDOW_REFRESH_INTERVAL_SECONDS, updateStats, ui );
     g_object_weak_ref( G_OBJECT( d ), dialogDestroyed, GUINT_TO_POINTER( i ) );
     return d;
 }

diff --git a/gtk/tr-prefs.h b/gtk/tr-prefs.h
index a7b0f8240a821a95e3fc408ba6aecbc80e3a945b..cc9d1e3fc4e0604d517a9c15f9d57bf99299c309 100644 (file)
--- a/gtk/tr-prefs.h
+++ b/gtk/tr-prefs.h
@@ -52,4 +52,11 @@ GtkWidget * tr_prefs_dialog_new( GObject *   core,
 #define PREF_KEY_MAIN_WINDOW_Y                     "main-window-y"
 #define PREF_KEY_MAIN_WINDOW_IS_MAXIMIZED          "main-window-is-maximized"
 
+enum
+{
+    MAIN_WINDOW_REFRESH_INTERVAL_SECONDS = 1,
+
+    SECONDARY_WINDOW_REFRESH_INTERVAL_SECONDS = 2
+};
+
 #endif