brasero r1622 - in trunk: . nautilus src

[philippr svn gnome org]

Author: philippr
Date: Sat Dec 13 20:51:28 2008
New Revision: 1622
URL: http://svn.gnome.org/viewvc/brasero?rev=1622&view=rev

Log:
2008-12-13  Debarshi Ray  <rishi gnu org>

	Fix for #564397 â Use g_timeout_add_seconds where possible

	* src/brasero-file-monitor.c (brasero_file_monitor_moved_from_event):
	* src/brasero-audio-disc.c (brasero_audio_disc_inotify_move):
	* src/brasero-burn-dialog.c (brasero_burn_dialog_dummy_success_cb):
	* src/brasero-file-filtered.c (brasero_file_filtered_add):
	* src/brasero-search-beagle.c (brasero_search_new):
	* src/brasero-search-entry.c (brasero_search_entry_activated):
	* src/brasero-playlist.c (brasero_playlist_start_beagle_search):
	* nautilus/nautilus-burn-extension.c (nautilus_burn_instance_init):
	Use g_timeout_add_seconds instead of g_timeout_add.


Modified:
   trunk/ChangeLog
   trunk/nautilus/nautilus-burn-extension.c
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-burn-dialog.c
   trunk/src/brasero-file-filtered.c
   trunk/src/brasero-file-monitor.c
   trunk/src/brasero-playlist.c
   trunk/src/brasero-search-beagle.c
   trunk/src/brasero-search-entry.c

Modified: trunk/nautilus/nautilus-burn-extension.c
==============================================================================
--- trunk/nautilus/nautilus-burn-extension.c	(original)
+++ trunk/nautilus/nautilus-burn-extension.c	Sat Dec 13 20:51:28 2008
@@ -839,9 +839,9 @@
         debug_init ();
 #endif
 
-        burn->priv->start_monitor_id = g_timeout_add (1000,
-                                                      (GSourceFunc)start_monitor,
-                                                      burn);
+        burn->priv->start_monitor_id = g_timeout_add_seconds (1,
+                                                              (GSourceFunc)start_monitor,
+                                                              burn);
 }
 
 static void

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Sat Dec 13 20:51:28 2008
@@ -4071,9 +4071,9 @@
 		/* we remember this move for 5s. If 5s later we haven't received
 		 * a corresponding MOVED_TO then we consider the file was
 		 * removed. */
-		data->id = g_timeout_add (5000,
-					  (GSourceFunc) brasero_audio_disc_inotify_move_timeout,
-					  disc);
+		data->id = g_timeout_add_seconds (5,
+						  (GSourceFunc) brasero_audio_disc_inotify_move_timeout,
+						  disc);
 
 		/* NOTE: the order is important, we _must_ append them */
 		disc->priv->moved_list = g_slist_append (disc->priv->moved_list, data);

Modified: trunk/src/brasero-burn-dialog.c
==============================================================================
--- trunk/src/brasero-burn-dialog.c	(original)
+++ trunk/src/brasero-burn-dialog.c	Sat Dec 13 20:51:28 2008
@@ -1191,9 +1191,9 @@
 	gtk_widget_show (button);
 	gtk_dialog_add_action_widget (GTK_DIALOG (message), button, GTK_RESPONSE_OK);
 
-	id = g_timeout_add (10000,
-			    brasero_burn_dialog_dummy_success_timeout,
-			    message);
+	id = g_timeout_add_seconds (10,
+				    brasero_burn_dialog_dummy_success_timeout,
+				    message);
 
 	gtk_widget_show (GTK_WIDGET (dialog));
 	gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);

Modified: trunk/src/brasero-file-filtered.c
==============================================================================
--- trunk/src/brasero-file-filtered.c	(original)
+++ trunk/src/brasero-file-filtered.c	Sat Dec 13 20:51:28 2008
@@ -316,9 +316,9 @@
 	}
 
 	if (!priv->idle_id)
-		priv->idle_id = g_timeout_add (1000,
-					       brasero_file_filtered_add_loop,
-					       self);
+		priv->idle_id = g_timeout_add_seconds (1,
+						       brasero_file_filtered_add_loop,
+						       self);
 }
 
 static void

Modified: trunk/src/brasero-file-monitor.c
==============================================================================
--- trunk/src/brasero-file-monitor.c	(original)
+++ trunk/src/brasero-file-monitor.c	Sat Dec 13 20:51:28 2008
@@ -231,9 +231,9 @@
 			
 	/* we remember this move for 5s. If 5s later we haven't received
 	 * a corresponding MOVED_TO then we consider the file was removed. */
-	data->id = g_timeout_add (5000,
-				  (GSourceFunc) brasero_file_monitor_move_timeout_cb,
-				  self);
+	data->id = g_timeout_add_seconds (5,
+					  (GSourceFunc) brasero_file_monitor_move_timeout_cb,
+					  self);
 
 	/* NOTE: the order is important, we _must_ append them */
 	priv->moved_list = g_slist_append (priv->moved_list, data);

Modified: trunk/src/brasero-playlist.c
==============================================================================
--- trunk/src/brasero-playlist.c	(original)
+++ trunk/src/brasero-playlist.c	Sat Dec 13 20:51:28 2008
@@ -540,9 +540,9 @@
 	}
 	else {
 		/* we will retry in 10 seconds */
-		playlist->priv->id = g_timeout_add (10000,
-					       (GSourceFunc) brasero_playlist_try_again,
-					       playlist);
+		playlist->priv->id = g_timeout_add_seconds (10,
+							    (GSourceFunc) brasero_playlist_try_again,
+							    playlist);
 	}
 }
 

Modified: trunk/src/brasero-search-beagle.c
==============================================================================
--- trunk/src/brasero-search-beagle.c	(original)
+++ trunk/src/brasero-search-beagle.c	Sat Dec 13 20:51:28 2008
@@ -577,9 +577,9 @@
 		gtk_widget_set_sensitive (GTK_WIDGET (obj), FALSE);
 
 		/* we will retry in 10 seconds */
-		obj->priv->id = g_timeout_add (10000,
-					       (GSourceFunc) brasero_search_try_again,
-					       obj);
+		obj->priv->id = g_timeout_add_seconds (10,
+						       (GSourceFunc) brasero_search_try_again,
+						       obj);
 	}
 
 	return GTK_WIDGET (obj);

Modified: trunk/src/brasero-search-entry.c
==============================================================================
--- trunk/src/brasero-search-entry.c	(original)
+++ trunk/src/brasero-search-entry.c	Sat Dec 13 20:51:28 2008
@@ -553,9 +553,9 @@
 
 	if (!search_now) {
 		/* gtk_widget_set_sensitive (entry->priv->button, TRUE); */
-		entry->priv->search_id = g_timeout_add (2000,
-							(GSourceFunc) brasero_search_entry_activated_real,
-							entry);
+		entry->priv->search_id = g_timeout_add_seconds (2,
+								(GSourceFunc) brasero_search_entry_activated_real,
+								entry);
 	}
 	else
 		brasero_search_entry_check_keywords (entry);