rhythmbox r6045 - in trunk: . lib metadata plugins/generic-player plugins/ipod podcast rhythmdb shell

[teuf svn gnome org]

Author: teuf
Date: Thu Nov 13 12:55:57 2008
New Revision: 6045
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6045&view=rev

Log:
2008-11-13  Christophe Fergeau  <teuf gnome org>

        * lib/rb-tree-dnd.c
        * metadata/rb-metadata-dbus-service.c
        * plugins/generic-player/rb-generic-player-playlist-source.c
        * plugins/ipod/rb-ipod-db.c
        * podcast/rb-podcast-manager.c
        * rhythmdb/rhythmdb.c
        * shell/rb-shell.c: use g_timeout_add_seconds instead of
        g_timeout_add. Fixes part of bug #399012

Modified:
   trunk/ChangeLog
   trunk/lib/rb-tree-dnd.c
   trunk/metadata/rb-metadata-dbus-service.c
   trunk/plugins/generic-player/rb-generic-player-playlist-source.c
   trunk/plugins/ipod/rb-ipod-db.c
   trunk/podcast/rb-podcast-manager.c
   trunk/rhythmdb/rhythmdb.c
   trunk/shell/rb-shell.c

Modified: trunk/lib/rb-tree-dnd.c
==============================================================================
--- trunk/lib/rb-tree-dnd.c	(original)
+++ trunk/lib/rb-tree-dnd.c	Thu Nov 13 12:55:57 2008
@@ -749,7 +749,7 @@
 			priv_data->previous_dest_path = path;
 			if (priv_data->select_on_drag_timeout == 0) {
 				rb_debug("Setting up a new select on drag timeout");
-				priv_data->select_on_drag_timeout = g_timeout_add (2000, select_on_drag_timeout, tree_view);
+				priv_data->select_on_drag_timeout = g_timeout_add_seconds (2, select_on_drag_timeout, tree_view);
 			}
 		} else {
 			gtk_tree_path_free (path);

Modified: trunk/metadata/rb-metadata-dbus-service.c
==============================================================================
--- trunk/metadata/rb-metadata-dbus-service.c	(original)
+++ trunk/metadata/rb-metadata-dbus-service.c	Thu Nov 13 12:55:57 2008
@@ -555,7 +555,7 @@
 				       g_main_loop_get_context (svc.loop));
 
 	if (!svc.external)
-		g_timeout_add (ATTENTION_SPAN * 500, (GSourceFunc) electromagnetic_shotgun, &svc);
+		g_timeout_add_seconds (ATTENTION_SPAN / 2, (GSourceFunc) electromagnetic_shotgun, &svc);
 
 	g_main_loop_run (svc.loop);
 

Modified: trunk/plugins/generic-player/rb-generic-player-playlist-source.c
==============================================================================
--- trunk/plugins/generic-player/rb-generic-player-playlist-source.c	(original)
+++ trunk/plugins/generic-player/rb-generic-player-playlist-source.c	Thu Nov 13 12:55:57 2008
@@ -37,7 +37,7 @@
 #include "rb-plugin.h"
 #include "rb-file-helpers.h"
 
-#define PLAYLIST_SAVE_TIMEOUT	1000
+#define PLAYLIST_SAVE_TIMEOUT	1
 
 typedef struct
 {
@@ -333,9 +333,9 @@
 		g_source_remove (priv->save_playlist_id);
 	}
 
-	priv->save_playlist_id = g_timeout_add (PLAYLIST_SAVE_TIMEOUT,
-						(GSourceFunc) save_playlist,
-						source);
+	priv->save_playlist_id = g_timeout_add_seconds (PLAYLIST_SAVE_TIMEOUT,
+							(GSourceFunc) save_playlist,
+							source);
 }
 
 RBSource *

Modified: trunk/plugins/ipod/rb-ipod-db.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-db.c	(original)
+++ trunk/plugins/ipod/rb-ipod-db.c	Thu Nov 13 12:55:57 2008
@@ -860,9 +860,9 @@
 
 	if (priv->save_timeout_id == 0) {
 		rb_debug ("Scheduling iPod database save in 15 seconds");
-		priv->save_timeout_id = g_timeout_add (15000, 
-						       (GSourceFunc)save_timeout_cb,
-						       ipod_db);
+		priv->save_timeout_id = g_timeout_add_seconds (15, 
+							       (GSourceFunc)save_timeout_cb,
+							       ipod_db);
 	} else {
 		rb_debug ("Database save already scheduled");
 	}

Modified: trunk/podcast/rb-podcast-manager.c
==============================================================================
--- trunk/podcast/rb-podcast-manager.c	(original)
+++ trunk/podcast/rb-podcast-manager.c	Thu Nov 13 12:55:57 2008
@@ -551,7 +551,7 @@
 			rb_podcast_manager_update_synctime (pd);
 			return;
 		}
-		pd->priv->source_sync = g_timeout_add (next_time * 1000, (GSourceFunc) rb_podcast_manager_sync_head_cb, pd);
+		pd->priv->source_sync = g_timeout_add_seconds (next_time, (GSourceFunc) rb_podcast_manager_sync_head_cb, pd);
 	}
 
 }

Modified: trunk/rhythmdb/rhythmdb.c
==============================================================================
--- trunk/rhythmdb/rhythmdb.c	(original)
+++ trunk/rhythmdb/rhythmdb.c	Thu Nov 13 12:55:57 2008
@@ -2942,7 +2942,7 @@
 	g_mutex_unlock (db->priv->saving_mutex);
 
 	g_object_ref (db);
-	g_timeout_add (10000, (GSourceFunc) rhythmdb_sync_library_idle, db);
+	g_timeout_add_seconds (10, (GSourceFunc) rhythmdb_sync_library_idle, db);
 
 	rb_debug ("queuing db load complete signal");
 	result = g_slice_new0 (RhythmDBEvent);

Modified: trunk/shell/rb-shell.c
==============================================================================
--- trunk/shell/rb-shell.c	(original)
+++ trunk/shell/rb-shell.c	Thu Nov 13 12:55:57 2008
@@ -2535,7 +2535,7 @@
 	rb_shell_sync_state (shell);
 	g_object_unref (G_OBJECT (shell));
 
-	g_timeout_add (10000, quit_timeout, NULL);
+	g_timeout_add_seconds (10, quit_timeout, NULL);
 	return TRUE;
 }