changeset 18006:f2d8658b3a86

merge of '62e9d17cd37551991c5040ce6ca48e6d7578dde3' and '87c1ea9b3d60a343bac2a35e1fd8f7fee6bda6f2'

--- a/libpurple/account.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/account.c	Sat May 19 21:38:47 2007 +0000
@@ -417,7 +417,7 @@
 schedule_accounts_save()
 {
 	if (save_timer == 0)
-		save_timer = purple_timeout_add(5000, save_cb, NULL);
+		save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
 

--- a/libpurple/blist.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/blist.c	Sat May 19 21:38:47 2007 +0000
@@ -365,7 +365,7 @@
 purple_blist_schedule_save()
 {
 	if (save_timer == 0)
-		save_timer = purple_timeout_add(5000, save_cb, NULL);
+		save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
 

--- a/libpurple/connection.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/connection.c	Sat May 19 21:38:47 2007 +0000
@@ -72,7 +72,7 @@
 	if (on && !gc->keepalive)
 	{
 		purple_debug_info("connection", "Activating keepalive.\n");
-		gc->keepalive = purple_timeout_add(30000, send_keepalive, gc);
+		gc->keepalive = purple_timeout_add_seconds(30, send_keepalive, gc);
 	}
 	else if (!on && gc->keepalive > 0)
 	{

--- a/libpurple/conversation.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/conversation.c	Sat May 19 21:38:47 2007 +0000
@@ -1010,7 +1010,7 @@
 	conv = purple_conv_im_get_conversation(im);
 	name = purple_conversation_get_name(conv);
 
-	im->typing_timeout = purple_timeout_add(timeout * 1000, reset_typing_cb, conv);
+	im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv);
 }
 
 void

--- a/libpurple/eventloop.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/eventloop.c	Sat May 19 21:38:47 2007 +0000
@@ -35,6 +35,17 @@
 	return ops->timeout_add(interval, function, data);
 }
 
+guint
+gaim_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)
+{
+	GaimEventLoopUiOps *ops = gaim_eventloop_get_ui_ops();
+
+	if (ops->timeout_add_seconds)
+		return ops->timeout_add_seconds(interval, function, data);
+	else
+		return ops->timeout_add(1000 * interval, function, data);
+}
+
 gboolean
 purple_timeout_remove(guint tag)
 {

--- a/libpurple/eventloop.h	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/eventloop.h	Sat May 19 21:38:47 2007 +0000
@@ -48,12 +48,18 @@
 struct _PurpleEventLoopUiOps
 {
 	/**
-	 * Creates a callback timer.
+	 * Creates a callback timer with an interval measured in milliseconds.
 	 * @see g_timeout_add, purple_timeout_add
 	 **/
 	guint (*timeout_add)(guint interval, GSourceFunc function, gpointer data);
 
 	/**
+	 * Creates a callback timer with an interval measured in seconds.
+	 * @see g_timeout_add_seconds, purple_timeout_add_seconds
+	 **/
+	guint (*timeout_add_seconds)(guint interval, GSourceFunc function, gpointer data);
+
+	/**
 	 * Removes a callback timer.
 	 * @see purple_timeout_remove, g_source_remove
 	 */

--- a/libpurple/idle.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/idle.c	Sat May 19 21:38:47 2007 +0000
@@ -230,7 +230,7 @@
 	if (time_until_next_idle_event == 0)
 		idle_timer = 0;
 	else
-		idle_timer = purple_timeout_add(1000 * (time_until_next_idle_event + 1), check_idleness_timer, NULL);
+		idle_timer = purple_timeout_add_seconds(time_until_next_idle_event + 1, check_idleness_timer, NULL);
 	return FALSE;
 }
 
@@ -310,7 +310,7 @@
 purple_idle_init()
 {
 	/* Add the timer to check if we're idle */
-	idle_timer = purple_timeout_add(1000 * (IDLEMARK + 1), check_idleness_timer, NULL);
+	idle_timer = purple_timeout_add_seconds((IDLEMARK + 1), check_idleness_timer, NULL);
 
 	purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg",
 						purple_idle_get_handle(),

--- a/libpurple/pounce.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/pounce.c	Sat May 19 21:38:47 2007 +0000
@@ -273,7 +273,7 @@
 schedule_pounces_save(void)
 {
 	if (save_timer == 0)
-		save_timer = purple_timeout_add(5000, save_cb, NULL);
+		save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
 

--- a/libpurple/prefs.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/prefs.c	Sat May 19 21:38:47 2007 +0000
@@ -226,7 +226,7 @@
 schedule_prefs_save(void)
 {
 	if (save_timer == 0)
-		save_timer = purple_timeout_add(5000, save_cb, NULL);
+		save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
 

--- a/libpurple/savedstatuses.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/savedstatuses.c	Sat May 19 21:38:47 2007 +0000
@@ -357,7 +357,7 @@
 schedule_save(void)
 {
 	if (save_timer == 0)
-		save_timer = purple_timeout_add(5000, save_cb, NULL);
+		save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
 

--- a/libpurple/server.c	Sat May 19 08:12:31 2007 +0000
+++ b/libpurple/server.c	Sat May 19 21:38:47 2007 +0000
@@ -92,7 +92,7 @@
 
 	/* because we're modifying or creating a lar, schedule the
 	 * function to expire them as the pref dictates */
-	purple_timeout_add((SECS_BEFORE_RESENDING_AUTORESPONSE + 1) * 1000, expire_last_auto_responses, NULL);
+	purple_timeout_add_seconds((SECS_BEFORE_RESENDING_AUTORESPONSE + 1), expire_last_auto_responses, NULL);
 
 	tmp = last_auto_responses;
 

--- a/pidgin/gtkeventloop.c	Sat May 19 08:12:31 2007 +0000
+++ b/pidgin/gtkeventloop.c	Sat May 19 21:38:47 2007 +0000
@@ -116,6 +116,7 @@
 static PurpleEventLoopUiOps eventloop_ops =
 {
 	g_timeout_add,
+	NULL,
 	g_source_remove,
 	pidgin_input_add,
 	g_source_remove,