From 0faddf054b2fcb7aa71602a1651afe4a4187ae9d Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Sat, 30 Jul 2011 13:28:03 +0000
Subject: [PATCH] (trunk gtk) when N torrents change their state at the same
 time, use an idle timer so that the UI refreshes once instead of N times.

---
 gtk/main.c | 70 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/gtk/main.c b/gtk/main.c
index b8bef7e2e..8a4b96f08 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -77,6 +77,7 @@ struct cbdata
 {
     gboolean                    is_iconified;
     guint                       timer;
+    guint                       update_model_soon_tag;
     guint                       refresh_actions_tag;
     gpointer                    icon;
     GtkWindow                 * wind;
@@ -321,7 +322,7 @@ refresh_actions( gpointer gdata )
 }
 
 static void
-on_selection_changed( GtkTreeSelection * s UNUSED, gpointer gdata )
+refresh_actions_soon( gpointer gdata )
 {
     struct cbdata * data = gdata;
 
@@ -329,6 +330,12 @@ on_selection_changed( GtkTreeSelection * s UNUSED, gpointer gdata )
         data->refresh_actions_tag = gtr_idle_add( refresh_actions, data );
 }
 
+static void
+on_selection_changed( GtkTreeSelection * s UNUSED, gpointer gdata )
+{
+    refresh_actions_soon( gdata );
+}
+
 /***
 ****
 ****
@@ -350,7 +357,8 @@ static void on_add_torrent( TrCore *, tr_ctor *, gpointer );
 
 static void on_prefs_changed( TrCore * core, const char * key, gpointer );
 
-static gboolean update_model( gpointer gdata );
+static gboolean update_model_loop( gpointer gdata );
+static gboolean update_model_once( gpointer gdata );
 
 /***
 ****
@@ -828,8 +836,8 @@ app_setup( TrWindow      * wind,
     on_prefs_changed( cbdata->core, PREF_KEY_SHOW_TRAY_ICON, cbdata );
 
     /* start model update timer */
-    cbdata->timer = gtr_timeout_add_seconds( MAIN_WINDOW_REFRESH_INTERVAL_SECONDS, update_model, cbdata );
-    update_model( cbdata );
+    cbdata->timer = gtr_timeout_add_seconds( MAIN_WINDOW_REFRESH_INTERVAL_SECONDS, update_model_loop, cbdata );
+    update_model_once( cbdata );
 
     /* either show the window or iconify it */
     if( !is_iconified )
@@ -912,8 +920,9 @@ rowChangedCB( GtkTreeModel  * model UNUSED,
               gpointer        gdata )
 {
     struct cbdata * data = gdata;
+
     if( gtk_tree_selection_path_is_selected ( data->sel, path ) )
-        refresh_actions( gdata );
+        refresh_actions_soon( data );
 }
 
 static void
@@ -1378,27 +1387,44 @@ on_prefs_changed( TrCore * core UNUSED, const char * key, gpointer data )
 }
 
 static gboolean
-update_model( gpointer gdata )
+update_model_once( gpointer gdata )
 {
     struct cbdata *data = gdata;
+
+    /* update the torrent data in the model */
+    gtr_core_update( data->core );
+
+    /* refresh the main window's statusbar and toolbar buttons */
+    if( data->wind != NULL )
+        gtr_window_refresh( data->wind );
+
+    /* update the actions */
+        refresh_actions( data );
+
+    /* update the status tray icon */
+    if( data->icon != NULL )
+        gtr_icon_refresh( data->icon );
+
+    data->update_model_soon_tag = 0;
+    return FALSE;
+}
+
+static void
+update_model_soon( gpointer gdata )
+{
+    struct cbdata *data = gdata;
+
+    if( data->update_model_soon_tag == 0 )
+        data->update_model_soon_tag = gtr_idle_add( update_model_once, data );
+}
+
+static gboolean
+update_model_loop( gpointer gdata )
+{
     const gboolean done = global_sigcount;
 
     if( !done )
-    {
-        /* update the torrent data in the model */
-        gtr_core_update( data->core );
-
-        /* refresh the main window's statusbar and toolbar buttons */
-        if( data->wind != NULL )
-            gtr_window_refresh( data->wind );
-
-        /* update the actions */
-        refresh_actions( data );
-
-        /* update the status tray icon */
-        if( data->icon != NULL )
-            gtr_icon_refresh( data->icon );
-    }
+        update_model_once( gdata );
 
     return !done;
 }
@@ -1724,5 +1750,5 @@ gtr_actions_handler( const char * action_name, gpointer user_data )
     else g_error ( "Unhandled action: %s", action_name );
 
     if( changed )
-        update_model( data );
+        update_model_soon( data );
 }