seahorse r2661 - in trunk: . libseahorse src

[sadam svn gnome org]

Author: sadam
Date: Sun Dec 14 16:27:35 2008
New Revision: 2661
URL: http://svn.gnome.org/viewvc/seahorse?rev=2661&view=rev

Log:
2008-12-14  Adam Schreiber  <sadam clemson edu>

    * libseahorse/seahorse-transfer-operation.c:
    * libseahorse/seahorse-progress.c:
    * src/seahorse-key-manager.c:
    * src/seahorse-key-manager.vala: Use g_timeout_add_seconds instead 
of
    g_timeout_add where possible to allow for event grouping. 
    Patch from Debarshi RayFixes bug #564403.  


Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-progress.c
   trunk/libseahorse/seahorse-transfer-operation.c
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-manager.vala

Modified: trunk/libseahorse/seahorse-progress.c
==============================================================================
--- trunk/libseahorse/seahorse-progress.c	(original)
+++ trunk/libseahorse/seahorse-progress.c	Sun Dec 14 16:27:35 2008
@@ -322,7 +322,7 @@
     
     /* Show the progress, after one second */
     if (delayed)
-        g_timeout_add (1000, (GSourceFunc)progress_show, operation);
+        g_timeout_add_seconds (1, (GSourceFunc)progress_show, operation);
     
     /* Right away */
     else

Modified: trunk/libseahorse/seahorse-transfer-operation.c
==============================================================================
--- trunk/libseahorse/seahorse-transfer-operation.c	(original)
+++ trunk/libseahorse/seahorse-transfer-operation.c	Sun Dec 14 16:27:35 2008
@@ -387,7 +387,7 @@
     seahorse_operation_mark_progress (SEAHORSE_OPERATION (top), message, 0.0);
     
     /* We delay and continue from a callback */
-    g_timeout_add (0, (GSourceFunc)start_transfer, top);
+    g_timeout_add_seconds (0, (GSourceFunc)start_transfer, top);
     
     return SEAHORSE_OPERATION (top);
 }

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Sun Dec 14 16:27:35 2008
@@ -1255,7 +1255,7 @@
 		gtk_drag_dest_set_target_list (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), targets);
 		g_signal_connect_object (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), "drag-data-received", ((GCallback) (_seahorse_key_manager_on_target_drag_data_received_gtk_widget_drag_data_received)), self, 0);
 		/* To show first time dialog */
-		g_timeout_add (((guint) (1000)), _seahorse_key_manager_on_first_timer_gsource_func, self);
+		g_timeout_add_seconds (((guint) (1)), _seahorse_key_manager_on_first_timer_gsource_func, self);
 		g_signal_emit_by_name (G_OBJECT (SEAHORSE_VIEW (self)), "selection-changed");
 		(actions == NULL ? NULL : (actions = (g_object_unref (actions), NULL)));
 		(action == NULL ? NULL : (action = (g_object_unref (action), NULL)));

Modified: trunk/src/seahorse-key-manager.vala
==============================================================================
--- trunk/src/seahorse-key-manager.vala	(original)
+++ trunk/src/seahorse-key-manager.vala	Sun Dec 14 16:27:35 2008
@@ -265,7 +265,7 @@
 			window.drag_data_received += on_target_drag_data_received;
 			
 			/* To show first time dialog */
-			GLib.Timeout.add (1000, on_first_timer);
+			GLib.Timeout.add_seconds (1, on_first_timer);
 			
 			selection_changed ();
 		}