adium 2504:97ec2ce929ec: im.pidgin.adium at 15a875ba3a686d7e5cd2...
commits at adium.im
commits at adium.im
Fri Jun 19 14:20:39 UTC 2009
details: http://hg.adium.im/adium/rev/97ec2ce929ec
revision: 2504:97ec2ce929ec
author: Zachary West <zacw at adium.im>
date: Fri Jun 19 10:20:16 2009 -0400
im.pidgin.adium at 15a875ba3a686d7e5cd232784f28d346661537fb
diffs (184 lines):
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/connection.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/connection.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/connection.h Fri Jun 19 10:20:16 2009 -0400
@@ -560,6 +560,9 @@
* Checks if gc is still a valid pointer to a gc.
*
* @return @c TRUE if gc is valid.
+ *
+ * @deprecated Do not use this. Instead, cancel your asynchronous request
+ * when the PurpleConnection is destroyed.
*/
/*
* TODO: Eventually this bad boy will be removed, because it is
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h Fri Jun 19 10:20:16 2009 -0400
@@ -325,8 +325,8 @@
void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
void jabber_remove_feature(const gchar *namespace);
-/** Adds an identitiy to this jabber library instance. For list of valid values vistit the
- * webiste of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ).
+/** Adds an identity to this jabber library instance. For list of valid values visit the
+ * website of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ).
* @param category the category of the identity.
* @param type the type of the identity.
* @param language the language localization of the name. Can be NULL.
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/network.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/network.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/network.h Fri Jun 19 10:20:16 2009 -0400
@@ -259,7 +259,14 @@
*/
const gchar *purple_network_get_turn_ip(void);
-
+/**
+ * Remove a port mapping (UPnP or NAT-PMP) associated with listening socket
+ *
+ * @param fd Socket to remove the port mapping for
+ * @since 2.6.0
+ */
+void purple_network_remove_port_mapping(gint fd);
+
/**
* Initializes the network subsystem.
*/
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/notify.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/notify.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/notify.h Fri Jun 19 10:20:16 2009 -0400
@@ -427,7 +427,9 @@
* Displays a notification for multiple emails to the user.
*
* @param handle The plugin or connection handle.
- * @param count The number of emails.
+ * @param count The number of emails. '0' can be used to signify that
+ * the user has no unread emails and the UI should remove
+ * the mail notification.
* @param detailed @c TRUE if there is information for each email in the
* arrays.
* @param subjects The array of subjects.
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/xmlnode.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/xmlnode.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/xmlnode.h Fri Jun 19 10:20:16 2009 -0400
@@ -136,7 +136,7 @@
* @return The data from the node or NULL. This data is in raw escaped format.
* You must g_free this string when finished using it.
*/
-char *xmlnode_get_data(xmlnode *node);
+char *xmlnode_get_data(const xmlnode *node);
/**
* Gets unescaped data from a node.
@@ -146,7 +146,7 @@
* @return The data from the node, in unescaped form. You must g_free
* this string when finished using it.
*/
-char *xmlnode_get_data_unescaped(xmlnode *node);
+char *xmlnode_get_data_unescaped(const xmlnode *node);
/**
* Sets an attribute for a node.
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h Fri Jun 19 10:20:16 2009 -0400
@@ -53,7 +53,7 @@
#define YAHOOJP_XFER_HOST "filetransfer.msg.yahoo.co.jp"
#define YAHOOJP_WEBCAM_HOST "wc.yahoo.co.jp"
/* not sure, must test: */
-#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp"
+#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp"
#define YAHOOJP_XFER_RELAY_PORT 80
#define YAHOOJP_ROOMLIST_URL "http://insider.msg.yahoo.co.jp/ycontent/"
#define YAHOOJP_ROOMLIST_LOCALE "ja"
@@ -201,7 +201,7 @@
GSList *url_datas;
GHashTable *xfer_peer_idstring_map;/* Hey, i dont know, but putting this HashTable next to friends gives a run time fault... */
GSList *cookies;/* contains all cookies, including _y and _t */
-
+
/**
* We may receive a list15 in multiple packets with no prior warning as to how many we'll be getting;
* the server expects us to keep track of the group for which it is sending us contact names.
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h Sat Jun 13 12:53:13 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h Fri Jun 19 10:20:16 2009 -0400
@@ -1,38 +1,38 @@
-/*
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here. Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
- *
- */
-
-
-#include "internal.h"
-
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "debug.h"
-#include "util.h"
-#include "version.h"
-#include "yahoo.h"
-#include "yahoo_packet.h"
-
-void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
-void yahoo_fetch_aliases(PurpleConnection *gc);
-
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ *
+ */
+
+
+#include "internal.h"
+
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "debug.h"
+#include "util.h"
+#include "version.h"
+#include "yahoo.h"
+#include "yahoo_packet.h"
+
+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
+void yahoo_fetch_aliases(PurpleConnection *gc);
+
diff -r e9a00c46cd32 -r 97ec2ce929ec Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed
More information about the commits
mailing list