pidgin: libpurple/idle.c comparison

comparison libpurple/idle.c @ 17723:c02305ee715a

propagate from branch 'im.pidgin.pidgin' (head 62e9d17cd37551991c5040ce6ca48e6d7578dde3) to branch 'org.maemo.garage.pidgin.pidgin.pidgin-create-window' (head 369bca3c0c736b247092848177aeaa6fd0f3a25c)

author	Richard Laager <rlaager@wiktel.com>
date	Sat, 19 May 2007 08:24:46 +0000
parents	bf27ef68e81a
children	b27e535cce50 f2d8658b3a86

comparison

equal deleted inserted replaced

-:68f634d5f5f5
+:c02305ee715a
 			   purple_account_get_username(account));
 	purple_presence_set_idle(presence, FALSE, 0);
 }
+static int no_away = 0;
 static gint time_until_next_idle_event;
 /*
 * This function should be called when you think your idle state
 * may have changed.  Maybe you're over the 10-minute mark and
 * Purple should start reporting idle time to the server.  Maybe
 	gboolean auto_away;
 	const gchar *idle_reporting;
 	gboolean report_idle;
 	GList *l;
 	gint away_seconds = 0;
-	static int no_away = 0;
+	gint idle_recheck_interval;
 	purple_signal_emit(purple_blist_get_handle(), "update-idle");
 	idle_reporting = purple_prefs_get_string("/purple/away/idle_reporting");
 	report_idle = TRUE;
 	if (!strcmp(idle_reporting, "system") &&
 		(idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
 	{
 		/* Use system idle time (mouse or keyboard movement, etc.) */
 		time_idle = idle_ui_ops->get_time_idle();
+		idle_recheck_interval = 60;
 	}
 	else if (!strcmp(idle_reporting, "purple"))
 	{
 		/* Use 'Purple idle' */
 		time_idle = time(NULL) - last_active_time;
+		idle_recheck_interval = 0;
 	}
 	else
 	{
 		/* Don't report idle time */
 		time_idle = 0;
 	/* Auto-away stuff */
 	auto_away = purple_prefs_get_bool("/purple/away/away_when_idle");
 	/* If we're not reporting idle, we can still do auto-away.
 	 * First try "system" and if that isn't possible, use "purple" */
-	if (!report_idle && auto_away) {
+	if (!report_idle)
-		if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
+	{
-			time_idle = idle_ui_ops->get_time_idle();
+		if (auto_away)
+		{
+			if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
+			{
+				time_idle = idle_ui_ops->get_time_idle();
+				idle_recheck_interval = 60;
+			}
+			else
+			{
+				time_idle = time(NULL) - last_active_time;
+				idle_recheck_interval = 0;
+			}
+		}
 		else
-			time_idle = time(NULL) - last_active_time;
+		{
-	}
+			if (!no_away)
+			{
-	time_until_next_idle_event = IDLEMARK - time_idle; /* reasonable start upperbound */
+				purple_savedstatus_set_idleaway(FALSE);
+				no_away = 1;
+			}
+			time_until_next_idle_event = 0;
+			return;
+		}
+	}
+	time_until_next_idle_event = IDLEMARK - time_idle;
+	if (time_until_next_idle_event < 0)
+	{
+		/* If we're already idle, check again as appropriate. */
+		time_until_next_idle_event = idle_recheck_interval;
+	}
 	if (auto_away || !no_away)
 		away_seconds = 60 * purple_prefs_get_int("/purple/away/mins_before_away");
 	if (auto_away && time_idle > away_seconds)
 	{
 		purple_savedstatus_set_idleaway(TRUE);
 		no_away = 0;
-		if (time_idle < away_seconds && (away_seconds - time_idle) < time_until_next_idle_event)
-			time_until_next_idle_event = away_seconds - time_idle;
 	}
 	else if (!no_away && time_idle < away_seconds)
 	{
 		purple_savedstatus_set_idleaway(FALSE);
 		no_away = 1;
-		if (time_idle < away_seconds && (away_seconds - time_idle) < time_until_next_idle_event)
+		if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event)
 			time_until_next_idle_event = away_seconds - time_idle;
 	}
 	/* Idle reporting stuff */
 	if (report_idle && (time_idle >= IDLEMARK))
 	else if (!report_idle || (time_idle < IDLEMARK))
 	{
 		while (idled_accts != NULL)
 			set_account_unidle(idled_accts->data);
 	}
-	if (time_until_next_idle_event < 0)
-		time_until_next_idle_event = IDLEMARK;
 }
 /*
 * Check idle and set the timer to fire at the next idle-worth event
 */
 static gint
 check_idleness_timer()
 {
 	check_idleness();
-	idle_timer = purple_timeout_add(1000 * (time_until_next_idle_event + 1), check_idleness_timer, NULL);
+	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);
 	return FALSE;
 }
 static void
 im_msg_sent_cb(PurpleAccount *account, const char *receiver,
 	account = purple_connection_get_account(gc);
 	set_account_unidle(account);
 }
+static void
+idle_reporting_cb(const char *name, PurplePrefType type, gconstpointer val, gpointer data)
+{
+	if (idle_timer)
+		purple_timeout_remove(idle_timer);
+	idle_timer = 0;
+	check_idleness_timer();
+}
 void
 purple_idle_touch()
 {
 	time(&last_active_time);
+	if (!no_away)
+	{
+		if (idle_timer)
+			purple_timeout_remove(idle_timer);
+		idle_timer = 0;
+		check_idleness_timer();
+	}
 }
 void
 purple_idle_set(time_t time)
 {
 						PURPLE_CALLBACK(signing_on_cb), NULL);
 	purple_signal_connect(purple_connections_get_handle(), "signing-off",
 						purple_idle_get_handle(),
 						PURPLE_CALLBACK(signing_off_cb), NULL);
+	purple_prefs_connect_callback(purple_idle_get_handle(), "/purple/away/idle_reporting",
+	                              idle_reporting_cb, NULL);
 	purple_idle_touch();
 }
 void
 purple_idle_uninit()
 {
 	purple_signals_disconnect_by_handle(purple_idle_get_handle());
+	purple_prefs_disconnect_by_handle(purple_idle_get_handle());
 	/* Remove the idle timer */
 	if (idle_timer > 0)
 		purple_timeout_remove(idle_timer);
 	idle_timer = 0;

Mercurial > pidgin

comparison libpurple/idle.c @ 17723:c02305ee715a