Ticket #1585: timeout_add_seconds.patch

gtk/details.c

@@ -28 +28 @@
 #include "hig.h"
 #include "util.h"
 
-#define UPDATE_INTERVAL_MSEC 2000
+#define UPDATE_INTERVAL_SEC 2
 
 /****
 *****  PIECES VIEW
@@ -1533 +1533 @@
 
     gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 );
 
-    tag = g_timeout_add ( UPDATE_INTERVAL_MSEC, periodic_refresh, d );
+    tag = g_timeout_add_seconds ( UPDATE_INTERVAL_SEC, periodic_refresh, d );
     g_object_set_data_full ( G_OBJECT( d ), "tag",
                              GUINT_TO_POINTER( tag ), remove_tag );
 

gtk/file-list.c

@@ -483 +483 @@
 
         refresh( data );
 
-        data->timeout_tag = g_timeout_add( 2500, refreshModel, data );
+        data->timeout_tag = g_timeout_add_seconds( 2.5, refreshModel, data );
     }
 
     gtk_tree_view_set_model( GTK_TREE_VIEW( data->view ),

gtk/main.c

@@ -68 +68 @@
 #include <libtransmission/version.h>
 
 /* interval in milliseconds to update the torrent list display */
-#define UPDATE_INTERVAL         1666
+#define UPDATE_INTERVAL         1.666
 
 /* interval in milliseconds to check for stopped torrents and update display */
 #define EXIT_CHECK_INTERVAL     500
@@ -647 +647 @@
     prefschanged( cbdata->core, PREF_KEY_SHOW_TRAY_ICON, cbdata );
 
     /* start model update timer */
-    cbdata->timer = g_timeout_add( UPDATE_INTERVAL, updatemodel, cbdata );
+    cbdata->timer = g_timeout_add_seconds( UPDATE_INTERVAL, updatemodel, cbdata );
     updatemodel( cbdata );
 
     /* start scheduled rate timer */
     updateScheduledLimits ( tr_core_session( cbdata->core ) );
-    g_timeout_add( 60 * 1000, updateScheduledLimits,
+    g_timeout_add_seconds( 60 , updateScheduledLimits,
                   tr_core_session( cbdata->core ) );
 
     /* either show the window or iconify it */
@@ -730 +730 @@
         gtk_window_get_position( window, &x, &y );
         clearTag( &cbdata->idle_hide_mainwindow_tag );
         hideMainWindow( cbdata );
-        cbdata->idle_hide_mainwindow_tag = g_timeout_add(
-            100, idle_hide_mainwindow, window );
+        cbdata->idle_hide_mainwindow_tag = g_timeout_add_seconds(
+            .1, idle_hide_mainwindow, window );
     }
     else
     {

gtk/msgwin.c

@@ -543 +543 @@
     gtk_box_pack_start( GTK_BOX( vbox ), w, TRUE, TRUE, 0 );
     gtk_container_add( GTK_CONTAINER( win ), vbox );
 
-    data->refresh_tag = g_timeout_add( 1666, onRefresh, data );
+    data->refresh_tag = g_timeout_add_seconds( 1.666, onRefresh, data );
     g_object_weak_ref( G_OBJECT( win ), onWindowDestroyed, data );
 
     gtk_widget_show_all( win );

gtk/stats.c

@@ -169 +169 @@
     updateStats( ui );
     g_object_set_data_full( G_OBJECT( d ), "data", ui, g_free );
     g_signal_connect( d, "response", G_CALLBACK( dialogResponse ), ui );
-    i = g_timeout_add( 1000, updateStats, ui );
+    i = g_timeout_add_seconds( 1, updateStats, ui );
     g_object_weak_ref( G_OBJECT( d ), dialogDestroyed, GUINT_TO_POINTER( i ) );
     return d;
 }

gtk/tr-core.c

@@ -499 +499 @@
             p->monitor_files =
                 g_slist_append( p->monitor_files, g_strdup( filename ) );
         if( !p->monitor_idle_tag )
-            p->monitor_idle_tag = g_timeout_add( 1000, watchFolderIdle,
+            p->monitor_idle_tag = g_timeout_add_seconds( 1, watchFolderIdle,
                                                  core );
     }
 }

gtk/tr-icon.c

@@ -26 +26 @@
 
 #else
 
- #define UPDATE_INTERVAL 2500
+ #define UPDATE_INTERVAL 2.5
 
 static void
 activated( GtkStatusIcon   * self      UNUSED,
@@ -90 +90 @@
 
     g_signal_connect( icon, "activate", G_CALLBACK( activated ), NULL );
     g_signal_connect( icon, "popup-menu", G_CALLBACK( popup ), NULL );
-    id = g_timeout_add( UPDATE_INTERVAL, refresh_tooltip_cb, icon );
+    id = g_timeout_add_seconds( UPDATE_INTERVAL, refresh_tooltip_cb, icon );
     g_object_set_data( G_OBJECT( icon ), "tr-core", core );
     g_object_set_data_full( G_OBJECT(
                                 icon ), "update-tag", GUINT_TO_POINTER(

gtk/tr-prefs.c

@@ -251 +251 @@
         data->last_change = g_timer_new( );
         g_object_set_data_full( o, IDLE_DATA, data, spin_idle_data_free );
         g_object_ref( G_OBJECT( o ) );
-        g_timeout_add( 100, spun_cb_idle, w );
+        g_timeout_add_seconds( .1, spun_cb_idle, w );
     }
     g_timer_start( data->last_change );
 }
@@ -1310 +1310 @@
         data = g_new0( struct test_port_data, 1 );
         data->label = ndata->label;
         data->alive = ndata->alive;
-        g_timeout_add( 3000, testing_port_begin, data );
+        g_timeout_add_seconds( 3, testing_port_begin, data );
     }
 }