[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    im.pidgin.pidgin: de8dad1b03c821de19c59374dee246d735dfa955
From:       markdoliner () pidgin ! im
Date:       2008-01-27 10:51:09
Message-ID: 20080127105109.C622148E88 () homing ! pidgin ! im
[Download RAW message or body]

-----------------------------------------------------------------
Revision: de8dad1b03c821de19c59374dee246d735dfa955
Ancestor: 5046bd3153638dbe3e89f36367b62a0809546214
Author: markdoliner@pidgin.im
Date: 2008-01-27T10:44:51
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/protocols/oscar/oscar.c

ChangeLog:=20

Stop unconditionally setting oscar's server-side preference "allow
others to see me as idle?" to "yes."  We now look at Pidgin's
"Show me as idle?" preference and set the oscar preference based
on that.



============================================================
--- ChangeLog	f3b44e73dfd70612ae14e7d6261d4aa6c62f4cd6
+++ ChangeLog	6e6d3291bd75979ad8d669500cd5652e6655a6fc
@@ -13,6 +13,9 @@ version 2.4.0 (??/??/????):
 	* Support for Yahoo Messenger 7.0+ file transfer method (Thanumalayan S.)
 	* Support for retrieving full names and addresses from the address book
 	  on Yahoo! Japan (Yusuke Odate)
+	* The AIM/ICQ server-side preference for "allow others to see me
+	  as idle" is no longer unconditionally set to "yes" even when
+	  your libpurple preference is "no."
 
 	Pidgin:
 	* Added the ability to theme conversation name colors (red and blue)
============================================================
--- libpurple/protocols/oscar/oscar.c	3e5cd2f1195c4b2edd275463fb4d67b3e3406892
+++ libpurple/protocols/oscar/oscar.c	ded5172ee9cf4c4452583e5a80220e019b331a2e
@@ -197,7 +197,6 @@ static void purple_icons_fetch(PurpleCon
 
 static void purple_icons_fetch(PurpleConnection *gc);
 
-static void recent_buddies_cb(const char *name, PurplePrefType type, gconstpointer \
value, gpointer data);  void oscar_set_info(PurpleConnection *gc, const char *info);
 static void oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, \
const char *rawinfo, gboolean setstatus, PurpleStatus *status);  static void \
oscar_set_extendedstatus(PurpleConnection *gc); @@ -1182,6 +1181,48 @@ \
flap_connection_established(OscarData *o  return 1;
 }
 
+static void
+idle_reporting_pref_cb(const char *name, PurplePrefType type,
+		gconstpointer value, gpointer data)
+{
+	PurpleConnection *gc;
+	OscarData *od;
+	gboolean report_idle;
+	guint32 presence;
+
+	gc = data;
+	od = gc->proto_data;
+	report_idle = strcmp((const char *)value, "none") != 0;
+	presence = aim_ssi_getpresence(od->ssi.local);
+
+	if (report_idle)
+		aim_ssi_setpresence(od, presence | 0x400);
+	else
+		aim_ssi_setpresence(od, presence & ~0x400);
+}
+
+/**
+ * Should probably make a "Use recent buddies group" account preference
+ * so that this option is surfaced to the user.
+ */
+static void
+recent_buddies_pref_cb(const char *name, PurplePrefType type,
+		gconstpointer value, gpointer data)
+{
+	PurpleConnection *gc;
+	OscarData *od;
+	guint32 presence;
+
+	gc = data;
+	od = gc->proto_data;
+	presence = aim_ssi_getpresence(od->ssi.local);
+
+	if (value)
+		aim_ssi_setpresence(od, presence & ~AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES);
+	else
+		aim_ssi_setpresence(od, presence | AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES);
+}
+
 void
 oscar_login(PurpleAccount *account)
 {
@@ -1272,7 +1313,8 @@ oscar_login(PurpleAccount *account)
 	}
 
 	/* Connect to core Purple signals */
-	purple_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", \
recent_buddies_cb, gc); +	purple_prefs_connect_callback(gc, \
"/purple/away/idle_reporting", idle_reporting_pref_cb, gc); \
+	purple_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", \
recent_buddies_pref_cb, gc);  
 	newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
 	newconn->connect_data = purple_proxy_connect(NULL, account,
@@ -4905,9 +4947,21 @@ static int purple_ssi_parselist(OscarDat
 			}
 		}
 		/* Presence settings (idle time visibility) */
-		if ((tmp = aim_ssi_getpresence(od->ssi.local)) != 0xFFFFFFFF)
-			if (!(tmp & 0x400))
+		tmp = aim_ssi_getpresence(od->ssi.local);
+		if (tmp != 0xFFFFFFFF) {
+			const char *idle_reporting_pref;
+			gboolean report_idle;
+
+			idle_reporting_pref = purple_prefs_get_string("/purple/away/idle_reporting");
+			report_idle = strcmp(idle_reporting_pref, "none") != 0;
+
+			if (report_idle)
 				aim_ssi_setpresence(od, tmp | 0x400);
+			else
+				aim_ssi_setpresence(od, tmp & ~0x400);
+		}
+
+
 	} /* end pruning buddies from local list */
 
 	/* Add from server list to local list */
@@ -6546,33 +6600,6 @@ oscar_convo_closed(PurpleConnection *gc,
 	}
 }
 
-static void
-recent_buddies_cb(const char *name, PurplePrefType type,
-				  gconstpointer value, gpointer data)
-{
-	PurpleConnection *gc = data;
-	OscarData *od = gc->proto_data;
-	guint32 presence;
-
-	presence = aim_ssi_getpresence(od->ssi.local);
-
-	if (value) {
-		presence &= ~AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES;
-		aim_ssi_setpresence(od, presence);
-	} else {
-		presence |= AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES;
-		aim_ssi_setpresence(od, presence);
-	}
-}
-
-#ifdef USE_PRPL_PREFERENCES
-	ppref = purple_plugin_pref_new_with_name_and_label("/plugins/prpl/oscar/recent_buddies", \
                _("Use recent buddies group"));
-	purple_plugin_pref_frame_add(frame, ppref);
-
-	ppref = purple_plugin_pref_new_with_name_and_label("/plugins/prpl/oscar/show_idle", \
                _("Show how long you have been idle"));
-	purple_plugin_pref_frame_add(frame, ppref);
-#endif
-
 const char *
 oscar_normalize(const PurpleAccount *account, const char *str)
 {
@@ -6735,7 +6762,7 @@ void oscar_init(PurplePluginProtocolInfo
 	/* Preferences */
 	purple_prefs_add_none("/plugins/prpl/oscar");
 	purple_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
-	purple_prefs_add_bool("/plugins/prpl/oscar/show_idle", FALSE);
+	purple_prefs_remove("/plugins/prpl/oscar/show_idle");
 	purple_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
 
 	/* protocol handler */



_______________________________________________
Commits mailing list
Commits@pidgin.im
http://pidgin.im/cgi-bin/mailman/listinfo/commits


[prev in list] [next in list] [prev in thread] [next in thread]