adium 2535:39c3c161de14: im.pidgin.adium at 534ffccfd244372a8f25...
commits at adium.im
commits at adium.im
Sat Jul 11 21:11:30 UTC 2009
details: http://hg.adium.im/adium/rev/39c3c161de14
revision: 2535:39c3c161de14
author: Zachary West <zacw at adium.im>
date: Sat Jul 11 17:11:11 2009 -0400
im.pidgin.adium at 534ffccfd244372a8f2569168b1bc15b8c9d9054, which separates out Yahoo into 2 protocols (JP, regular). Neither currently connect.
pidgin-facebookchat, as well, at r564.
diffs (truncated from 1308 to 1000 lines):
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/account.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/account.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/account.h Sat Jul 11 17:11:11 2009 -0400
@@ -459,6 +459,16 @@
void purple_account_clear_settings(PurpleAccount *account);
/**
+ * Removes an account-specific setting by name.
+ *
+ * @param account The account.
+ * @param setting The setting to remove.
+ *
+ * @since 2.6.0
+ */
+void purple_account_remove_setting(PurpleAccount *account, const char *setting);
+
+/**
* Sets a protocol-specific integer setting for an account.
*
* @param account The account.
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddyicon.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddyicon.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddyicon.h Sat Jul 11 17:11:11 2009 -0400
@@ -189,8 +189,6 @@
* takes ownership of and will free.
* @param icon_len The length of the icon data.
* @param checksum A protocol checksum from the prpl or @c NULL.
- *
- * @return The buddy icon set, or NULL if no icon was set.
*/
void
purple_buddy_icons_set_for_user(PurpleAccount *account, const char *username,
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/core.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/core.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/core.h Sat Jul 11 17:11:11 2009 -0400
@@ -188,7 +188,9 @@
* <dd>the UI's development/support website, such as http://developer.pidgin.im.</dd>
*
* <dt><tt>client_type</tt></dt>
- * <dd>the type of UI (pc, console, phone, handheld, web, bot)</dd>
+ * <dd>the type of UI. Possible values include 'pc', 'console', 'phone',
+ * 'handheld', 'web', and 'bot'. These values are compared
+ * programmatically and should not be localized.</dd>
*
* </dl>
*
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/debug.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/debug.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/debug.h Sat Jul 11 17:11:11 2009 -0400
@@ -151,10 +151,50 @@
/**
* Check if console debug output is enabled.
*
- * @return TRUE if debuggin is enabled, FALSE if it is not.
+ * @return TRUE if debugging is enabled, FALSE if it is not.
*/
gboolean purple_debug_is_enabled(void);
+/**
+ * Enable or disable verbose debugging. This ordinarily should only be called
+ * by #purple_debug_init, but there are cases where this can be useful for
+ * plugins.
+ *
+ * @param verbose TRUE to enable verbose debugging or FALSE to disable it.
+ *
+ * @since 2.6.0
+ */
+void purple_debug_set_verbose(gboolean verbose);
+
+/**
+ * Check if verbose logging is enabled.
+ *
+ * @return TRUE if verbose debugging is enabled, FALSE if it is not.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_debug_is_verbose(void);
+
+/**
+ * Enable or disable verbose debugging. This ordinarily should only be called
+ * by #purple_debug_init, but there are cases where this can be useful for
+ * plugins.
+ *
+ * @param unsafe TRUE to enable verbose debugging or FALSE to disable it.
+ *
+ * @since 2.6.0
+ */
+void purple_debug_set_unsafe(gboolean unsafe);
+
+/**
+ * Check if unsafe debugging is enabled.
+ *
+ * @return TRUE if verbose debugging is enabled, FALSE if it is not.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_debug_is_unsafe(void);
+
/*@}*/
/**************************************************************************/
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/dnssrv.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/dnssrv.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/dnssrv.h Sat Jul 11 17:11:11 2009 -0400
@@ -41,15 +41,21 @@
int pref;
};
+/**
+ * @param resp An array of PurpleSrvResponse of size results. The array
+ * is sorted based on the order described in the DNS SRV RFC.
+ * Users of this API should try each record in resp in order,
+ * starting at the beginning.
+ */
typedef void (*PurpleSrvCallback)(PurpleSrvResponse *resp, int results, gpointer data);
/**
* Callback that returns the data retrieved from a DNS TXT lookup.
*
- * @param responses A GSList of PurpleTxtResponse objects.
+ * @param responses A GList of PurpleTxtResponse objects.
* @param data The extra data passed to purple_txt_resolve.
*/
-typedef void (*PurpleTxtCallback)(GSList *responses, gpointer data);
+typedef void (*PurpleTxtCallback)(GList *responses, gpointer data);
/**
* Queries an SRV record.
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/history.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/history.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/history.h Sat Jul 11 17:11:11 2009 -0400
@@ -24,7 +24,8 @@
#ifndef _MSN_HISTORY_H
#define _MSN_HISTORY_H
-#define MSN_HIST_ELEMS 0x30
+#define MSN_NS_HIST_ELEMS 0x300
+#define MSN_SB_HIST_ELEMS 0x30
typedef struct _MsnHistory MsnHistory;
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/internal.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/internal.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/internal.h Sat Jul 11 17:11:11 2009 -0400
@@ -148,6 +148,14 @@
# endif
#endif
+#ifndef G_MAXSSIZE
+# if GLIB_SIZEOF_LONG == 8
+# define G_MAXSSIZE ((gssize) 0x7fffffffffffffff)
+# else
+# define G_MAXSSIZE ((gssize) 0x7fffffff)
+# endif
+#endif
+
#if GLIB_CHECK_VERSION(2,6,0)
# include <glib/gstdio.h>
#endif
@@ -222,6 +230,16 @@
# endif
#endif
+#ifdef HAVE_CONFIG_H
+#if SIZEOF_TIME_T == 4
+# define PURPLE_TIME_T_MODIFIER "lu"
+#elif SIZEOF_TIME_T == 8
+# define PURPLE_TIME_T_MODIFIER "zu"
+#else
+#error Unknown size of time_t
+#endif
+#endif
+
#include <glib-object.h>
#ifndef G_DEFINE_TYPE
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h Sat Jul 11 17:11:11 2009 -0400
@@ -28,6 +28,8 @@
char *resource;
} JabberID;
+#include "jabber.h"
+
JabberID* jabber_id_new(const char *str);
void jabber_id_free(JabberID *jid);
@@ -43,7 +45,7 @@
gboolean jabber_is_own_account(JabberStream *js, const char *jid);
gboolean jabber_nodeprep_validate(const char *);
-gboolean jabber_nameprep_validate(const char *);
+gboolean jabber_domain_validate(const char *);
gboolean jabber_resourceprep_validate(const char *);
PurpleConversation *jabber_find_unnormalized_conv(const char *name, PurpleAccount *account);
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/libymsg.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/libymsg.h Sat Jul 11 17:11:11 2009 -0400
@@ -0,0 +1,359 @@
+/**
+ * @file libymsg.h The Yahoo! and Yahoo! JAPAN Protocol Plugins
+ *
+ * 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
+ */
+
+#ifndef _LIBYMSG_H_
+#define _LIBYMSG_H_
+
+#include "circbuffer.h"
+#include "cmds.h"
+#include "prpl.h"
+
+#define YAHOO_PAGER_HOST "scsa.msg.yahoo.com"
+#define YAHOO_PAGER_PORT 5050
+#define YAHOO_PAGER_PORT_P2P 5101
+#define YAHOO_LOGIN_URL "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%s"
+#define YAHOO_TOKEN_URL "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
+#define YAHOO_P2P_KEEPALIVE_SECS 300
+#define YAHOO_P2P_SERVER_TIMEOUT 10
+#define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
+#define YAHOO_MAIL_URL "http://rd.yahoo.com/messenger/client/?http://mail.yahoo.com/"
+#define YAHOO_XFER_HOST "filetransfer.msg.yahoo.com"
+#define YAHOO_XFER_PORT 80
+#define YAHOO_XFER_RELAY_HOST "relay.msg.yahoo.com"
+#define YAHOO_XFER_RELAY_PORT 80
+#define YAHOO_ROOMLIST_URL "http://insider.msg.yahoo.com/ycontent/"
+#define YAHOO_ROOMLIST_LOCALE "us"
+/* really we should get the list of servers from
+ http://update.messenger.yahoo.co.jp/servers.html */
+#define YAHOOJP_PAGER_HOST "cs.yahoo.co.jp"
+#define YAHOOJP_TOKEN_URL "https://login.yahoo.co.jp/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
+#define YAHOOJP_LOGIN_URL "https://login.yahoo.co.jp/config/pwtoken_login?src=ymsgr&ts=&token=%s"
+#define YAHOOJP_PROFILE_URL "http://profiles.yahoo.co.jp/"
+#define YAHOOJP_MAIL_URL "http://mail.yahoo.co.jp/"
+#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_PORT 80
+#define YAHOOJP_ROOMLIST_URL "http://insider.msg.yahoo.co.jp/ycontent/"
+#define YAHOOJP_ROOMLIST_LOCALE "ja"
+
+#define YAHOO_AUDIBLE_URL "http://us.dl1.yimg.com/download.yahoo.com/dl/aud"
+
+#define WEBMESSENGER_URL "http://login.yahoo.com/config/login?.src=pg"
+
+#define YAHOO_SMS_CARRIER_URL "http://lookup.msg.vip.mud.yahoo.com"
+
+#define YAHOO_USERINFO_URL "http://address.yahoo.com/yab/us?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252"
+#define YAHOOJP_USERINFO_URL "http://address.yahoo.co.jp/yab/jp?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252"
+
+#define YAHOO_PICURL_SETTING "picture_url"
+#define YAHOO_PICCKSUM_SETTING "picture_checksum"
+#define YAHOO_PICEXPIRE_SETTING "picture_expire"
+
+#define YAHOO_STATUS_TYPE_OFFLINE "offline"
+#define YAHOO_STATUS_TYPE_AVAILABLE "available"
+#define YAHOO_STATUS_TYPE_BRB "brb"
+#define YAHOO_STATUS_TYPE_BUSY "busy"
+#define YAHOO_STATUS_TYPE_NOTATHOME "notathome"
+#define YAHOO_STATUS_TYPE_NOTATDESK "notatdesk"
+#define YAHOO_STATUS_TYPE_NOTINOFFICE "notinoffice"
+#define YAHOO_STATUS_TYPE_ONPHONE "onphone"
+#define YAHOO_STATUS_TYPE_ONVACATION "onvacation"
+#define YAHOO_STATUS_TYPE_OUTTOLUNCH "outtolunch"
+#define YAHOO_STATUS_TYPE_STEPPEDOUT "steppedout"
+#define YAHOO_STATUS_TYPE_AWAY "away"
+#define YAHOO_STATUS_TYPE_INVISIBLE "invisible"
+#define YAHOO_STATUS_TYPE_MOBILE "mobile"
+
+#define YAHOO_CLIENT_VERSION_ID "4194239"
+#define YAHOO_CLIENT_VERSION "9.0.0.2152"
+
+#define YAHOOJP_CLIENT_VERSION_ID "4194239"
+#define YAHOOJP_CLIENT_VERSION "9.0.0.2152"
+
+#define YAHOO_CLIENT_USERAGENT "Mozilla/5.0"
+
+/* Index into attention types list. */
+#define YAHOO_BUZZ 0
+
+typedef enum {
+ YAHOO_PKT_TYPE_SERVER = 0,
+ YAHOO_PKT_TYPE_P2P
+} yahoo_pkt_type;
+
+typedef enum {
+ YAHOO_P2P_WE_ARE_CLIENT =0,
+ YAHOO_P2P_WE_ARE_SERVER
+} yahoo_p2p_connection_type;
+
+enum yahoo_status {
+ YAHOO_STATUS_AVAILABLE = 0,
+ YAHOO_STATUS_BRB,
+ YAHOO_STATUS_BUSY,
+ YAHOO_STATUS_NOTATHOME,
+ YAHOO_STATUS_NOTATDESK,
+ YAHOO_STATUS_NOTINOFFICE,
+ YAHOO_STATUS_ONPHONE,
+ YAHOO_STATUS_ONVACATION,
+ YAHOO_STATUS_OUTTOLUNCH,
+ YAHOO_STATUS_STEPPEDOUT,
+ YAHOO_STATUS_INVISIBLE = 12,
+ YAHOO_STATUS_CUSTOM = 99,
+ YAHOO_STATUS_IDLE = 999,
+ YAHOO_STATUS_WEBLOGIN = 0x5a55aa55,
+ YAHOO_STATUS_OFFLINE = 0x5a55aa56, /* don't ask */
+ YAHOO_STATUS_TYPING = 0x16,
+ YAHOO_STATUS_DISCONNECTED = 0xffffffff /* in ymsg 15. doesnt mean the normal sense of 'disconnected' */
+};
+
+struct yahoo_buddy_icon_upload_data {
+ PurpleConnection *gc;
+ GString *str;
+ char *filename;
+ int pos;
+ int fd;
+ guint watcher;
+};
+
+struct yahoo_p2p_data {
+ PurpleConnection *gc;
+ char *host_ip;
+ char *host_username;
+ int val_13;
+ guint input_event;
+ gint source;
+ int session_id;
+ yahoo_p2p_connection_type connection_type;
+};
+
+struct _YchtConn;
+
+typedef struct _YahooPersonalDetails {
+ char *id;
+
+ struct {
+ char *first;
+ char *last;
+ char *middle;
+ char *nick;
+ } names;
+
+ struct {
+ char *work;
+ char *home;
+ char *mobile;
+ } phone;
+} YahooPersonalDetails;
+
+struct yahoo_data {
+ PurpleConnection *gc;
+ int fd;
+ guchar *rxqueue;
+ int rxlen;
+ PurpleCircBuffer *txbuf;
+ guint txhandler;
+ GHashTable *friends;
+
+ char **profiles; /* Multiple profiles can be associated with an account */
+ YahooPersonalDetails ypd;
+
+ /**
+ * This is used to keep track of the IMVironment chosen
+ * by people you talk to. We don't do very much with
+ * this right now... but at least now if the remote user
+ * selects an IMVironment we won't reset it back to the
+ * default of nothing.
+ */
+ GHashTable *imvironments;
+
+ int current_status;
+ gboolean logged_in;
+ GString *tmp_serv_blist, *tmp_serv_ilist, *tmp_serv_plist;
+ GSList *confs;
+ unsigned int conf_id; /* just a counter */
+ gboolean chat_online;
+ gboolean in_chat;
+ char *chat_name;
+ char *pending_chat_room;
+ char *pending_chat_id;
+ char *pending_chat_topic;
+ char *pending_chat_goto;
+ char *auth;
+ gsize auth_written;
+ char *cookie_y;
+ char *cookie_t;
+ int session_id;
+ gboolean jp;
+ gboolean wm; /* connected w/ web messenger method */
+ /* picture aka buddy icon stuff */
+ char *picture_url;
+ int picture_checksum;
+
+ /* ew. we have to check the icon before we connect,
+ * but can't upload it til we're connected. */
+ struct yahoo_buddy_icon_upload_data *picture_upload_todo;
+ PurpleProxyConnectData *buddy_icon_connect_data;
+
+ struct _YchtConn *ycht;
+
+ /**
+ * This linked list contains PurpleUtilFetchUrlData structs
+ * for when we lookup people profile or photo information.
+ */
+ 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.
+ */
+ char *current_list15_grp;
+ time_t last_ping;
+ time_t last_keepalive;
+ GHashTable *peers; /* information about p2p data */
+ int yahoo_p2p_timer;
+ int yahoo_local_p2p_server_fd;
+ int yahoo_p2p_server_watcher;
+ GHashTable *sms_carrier; /* sms carrier data */
+ guint yahoo_p2p_server_timeout_handle;
+};
+
+#define YAHOO_MAX_STATUS_MESSAGE_LENGTH (255)
+
+/*
+ * Current Maximum Length for Instant Messages
+ *
+ * This was found by experiment.
+ *
+ * The YMSG protocol allows a message of up to 948 bytes, but the official client
+ * limits to 800 characters. According to experiments I conducted, it seems that
+ * the discrepancy is to allow some leeway for messages with mixed single- and
+ * multi-byte characters, as I was able to send messages of 840 and 932 bytes
+ * by using some multibyte characters (some random Chinese or Japanese characters,
+ * to be precise). - rekkanoryo
+ */
+#define YAHOO_MAX_MESSAGE_LENGTH_BYTES 948
+#define YAHOO_MAX_MESSAGE_LENGTH_CHARS 800
+
+/* sometimes i wish prpls could #include things from other prpls. then i could just
+ * use the routines from libfaim and not have to admit to knowing how they work. */
+#define yahoo_put16(buf, data) ( \
+ (*(buf) = (unsigned char)((data)>>8)&0xff), \
+ (*((buf)+1) = (unsigned char)(data)&0xff), \
+ 2)
+#define yahoo_get16(buf) ((((*(buf))<<8)&0xff00) + ((*((buf)+1)) & 0xff))
+#define yahoo_put32(buf, data) ( \
+ (*((buf)) = (unsigned char)((data)>>24)&0xff), \
+ (*((buf)+1) = (unsigned char)((data)>>16)&0xff), \
+ (*((buf)+2) = (unsigned char)((data)>>8)&0xff), \
+ (*((buf)+3) = (unsigned char)(data)&0xff), \
+ 4)
+#define yahoo_get32(buf) ((((*(buf))<<24)&0xff000000) + \
+ (((*((buf)+1))<<16)&0x00ff0000) + \
+ (((*((buf)+2))<< 8)&0x0000ff00) + \
+ (((*((buf)+3) )&0x000000ff)))
+
+/* util.c */
+void yahoo_init_colorht(void);
+void yahoo_dest_colorht(void);
+char *yahoo_codes_to_html(const char *x);
+char *yahoo_html_to_codes(const char *src);
+
+gboolean
+yahoo_account_use_http_proxy(PurpleConnection *conn);
+
+/**
+ * Encode some text to send to the yahoo server.
+ *
+ * @param gc The connection handle.
+ * @param str The null terminated utf8 string to encode.
+ * @param utf8 If not @c NULL, whether utf8 is okay or not.
+ * Even if it is okay, we may not use it. If we
+ * used it, we set this to @c TRUE, else to
+ * @c FALSE. If @c NULL, false is assumed, and
+ * it is not dereferenced.
+ * @return The g_malloced string in the appropriate encoding.
+ */
+char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean *utf8);
+
+/**
+ * Decode some text received from the server.
+ *
+ * @param gc The gc handle.
+ * @param str The null terminated string to decode.
+ * @param utf8 Did the server tell us it was supposed to be utf8?
+ * @return The decoded, utf-8 string, which must be g_free()'d.
+ */
+char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8);
+
+char *yahoo_convert_to_numeric(const char *str);
+
+
+/* yahoo_profile.c */
+void yahoo_get_info(PurpleConnection *gc, const char *name);
+
+/* libymsg.h - these functions were formerly static but need not to be for the
+ * new two-prpl model. */
+const char *yahoo_list_icon(PurpleAccount *a, PurpleBuddy *b);
+const char *yahoo_list_emblem(PurpleBuddy *b);
+char *yahoo_status_text(PurpleBuddy *b);
+void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full);
+GList *yahoo_status_types(PurpleAccount *account);
+GList *yahoo_blist_node_menu(PurpleBlistNode *node);
+void yahoo_login(PurpleAccount *account);
+void yahoo_close(PurpleConnection *gc);
+int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags);
+unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state);
+void yahoo_set_status(PurpleAccount *account, PurpleStatus *status);
+void yahoo_set_idle(PurpleConnection *gc, int idle);
+void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g);
+void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group);
+void yahoo_add_deny(PurpleConnection *gc, const char *who);
+void yahoo_rem_deny(PurpleConnection *gc, const char *who);
+void yahoo_set_permit_deny(PurpleConnection *gc);
+void yahoo_keepalive(PurpleConnection *gc);
+void yahoo_change_buddys_group(PurpleConnection *gc, const char *who, const char *old_group, const char *new_group);
+void yahoo_rename_group(PurpleConnection *gc, const char *old_name, PurpleGroup *group, GList *moved_buddies);
+gboolean yahoo_offline_message(const PurpleBuddy *buddy);
+gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint type);
+GList *yahoo_attention_types(PurpleAccount *account);
+
+GList *yahoo_actions(PurplePlugin *plugin, gpointer context);
+void yahoopurple_register_commands(void);
+
+PurpleCmdRet yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gchar **error, void *data);
+PurpleCmdRet yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data);
+PurpleCmdRet yahoopurple_cmd_chat_list(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data);
+/* needed for xfer, thought theyd be useful for other enhancements later on
+ Returns list of cookies stored in yahoo_data formatted as a single null terminated string
+ returned value must be g_freed
+*/
+gchar* yahoo_get_cookies(PurpleConnection *gc);
+
+/* send p2p pkt containing our encoded ip, asking peer to connect to us */
+void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13);
+
+#endif /* _LIBYMSG_H_ */
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/msg.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/msg.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/msg.h Sat Jul 11 17:11:11 2009 -0400
@@ -345,4 +345,6 @@
void msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
#endif /* _MSN_MSG_H_ */
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/msn.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/msn.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/msn.h Sat Jul 11 17:11:11 2009 -0400
@@ -24,17 +24,6 @@
#ifndef _MSN_H_
#define _MSN_H_
-/* #define MSN_DEBUG_MSG 1 */
-/* #define MSN_DEBUG_SLPMSG 1 */
-/* #define MSN_DEBUG_HTTP 1 */
-
-/* #define MSN_DEBUG_SLP 1 */
-/* #define MSN_DEBUG_SLP_VERBOSE 1 */
-/* #define MSN_DEBUG_SLP_FILES 1 */
-
-/* #define MSN_DEBUG_NS 1 */
-/* #define MSN_DEBUG_SB 1 */
-
#include "internal.h"
#include "account.h"
@@ -138,7 +127,7 @@
} MsnClientVerId;
#define MSN_CLIENT_ID_VERSION MSN_CLIENT_VER_7_0
-#define MSN_CLIENT_ID_CAPABILITIES MSN_CLIENT_CAP_PACKET
+#define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM|MSN_CLIENT_CAP_WINKS)
#define MSN_CLIENT_ID \
((MSN_CLIENT_ID_VERSION << 24) | \
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/network.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/network.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/network.h Sat Jul 11 17:11:11 2009 -0400
@@ -246,10 +246,10 @@
* Update the TURN server IP given the host name
* Will result in a DNS query being executed asynchronous
*
- * @param stun_server The host name of the STUN server to set
+ * @param turn_server The host name of the STUN server to set
* @since 2.6.0
*/
-void purple_network_set_turn_server(const gchar *stun_server);
+void purple_network_set_turn_server(const gchar *turn_server);
/**
* Get the IP address of the STUN server as a string representation
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/oscar.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/oscar.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/oscar.h Sat Jul 11 17:11:11 2009 -0400
@@ -307,23 +307,25 @@
/*
* We need to use the major-minor-micro versions from the official
* AIM and ICQ programs here or AOL won't let us use certain features.
+ *
+ * 0x00000611 is the distid given to us by AOL for use as the default
+ * libpurple distid.
*/
-
#define CLIENTINFO_PURPLE_AIM { \
- "Purple/" VERSION, \
+ NULL, \
0x0109, \
0x0005, 0x0001, \
0x0000, 0x0bdc, \
- 0x000000d2, \
+ 0x00000611, \
"us", "en", \
}
#define CLIENTINFO_PURPLE_ICQ { \
- "Purple/" VERSION, \
+ NULL, \
0x010a, \
0x0014, 0x0034, \
0x0000, 0x0c18, \
- 0x0000043d, \
+ 0x00000611, \
"us", "en", \
}
@@ -469,6 +471,9 @@
*/
struct _OscarData
{
+ /** Only used when connecting with clientLogin */
+ PurpleUtilFetchUrlData *url_data;
+
gboolean iconconnecting;
gboolean set_icon;
@@ -522,6 +527,8 @@
IcbmCookie *msgcookies;
struct aim_icq_info *icq_info;
+
+ /** Only used when connecting with the old-style BUCP login. */
struct aim_authresp_info *authinfo;
struct aim_emailinfo *emailinfo;
@@ -547,6 +554,7 @@
/** A linked list containing FlapConnections. */
GSList *oscar_connections;
+ guint16 default_port;
/** A linked list containing PeerConnections. */
GSList *peer_connections;
@@ -568,10 +576,9 @@
#define AIM_ICQ_STATE_DIRECTREQUIREAUTH 0x10000000
#define AIM_ICQ_STATE_DIRECTCONTACTLIST 0x20000000
-typedef int (*aim_rxcallback_t)(OscarData *od, FlapConnection *conn, FlapFrame *frame, ...);
-
-
-/* family_auth.c */
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
struct aim_clientrelease
{
char *name;
@@ -580,6 +587,9 @@
char *info;
};
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
struct aim_authresp_info
{
char *bn;
@@ -611,12 +621,29 @@
} chat;
};
+int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host, guint16 port, guint8 *cookie, guint16 cookielen);
+
+/* family_auth.c */
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
int aim_request_login(OscarData *od, FlapConnection *conn, const char *bn);
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
int aim_send_login(OscarData *od, FlapConnection *conn, const char *bn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key, gboolean allow_multiple_logins);
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
/* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);
-void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags);
-aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype);
+/**
+ * Only used when connecting with clientLogin.
+ */
+void send_client_login(OscarData *od, const char *username);
/* flap_connection.c */
FlapConnection *flap_connection_new(OscarData *, int type);
@@ -632,13 +659,19 @@
void flap_connection_send(FlapConnection *conn, FlapFrame *frame);
void flap_connection_send_version(OscarData *od, FlapConnection *conn);
void flap_connection_send_version_with_cookie(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy);
+void flap_connection_send_version_with_cookie_and_clientinfo(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy, ClientInfo *ci);
void flap_connection_send_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data);
void flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data, gboolean high_priority);
void flap_connection_send_keepalive(OscarData *od, FlapConnection *conn);
FlapFrame *flap_frame_new(OscarData *od, guint16 channel, int datalen);
+/* oscar_data.c */
+typedef int (*aim_rxcallback_t)(OscarData *od, FlapConnection *conn, FlapFrame *frame, ...);
+
OscarData *oscar_data_new(void);
void oscar_data_destroy(OscarData *);
+void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags);
+aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype);
/* misc.c */
#define AIM_VISIBILITYCHANGE_PERMITADD 0x05
@@ -1496,6 +1529,10 @@
(((*((buf)+2)) << 16) & 0x00ff0000) + \
(((*((buf)+3)) << 24) & 0xff000000))
+int oscar_get_ui_info_int(const char *str, int default_value);
+const char *oscar_get_ui_info_string(const char *str, const char *default_value);
+gchar *oscar_get_clientstring(void);
+
guint16 aimutil_iconsum(const guint8 *buf, int buflen);
int aimutil_tokslen(char *toSearch, int theindex, char dl);
int aimutil_itemcnt(char *toSearch, char dl);
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h Sat Jul 11 17:11:11 2009 -0400
@@ -512,6 +512,15 @@
void purple_plugins_add_search_path(const char *path);
/**
+ * Returns a list of plugin search paths.
+ *
+ * @constreturn A list of searched paths.
+ *
+ * @since 2.6.0
+ */
+GList *purple_plugins_get_search_paths(void);
+
+/**
* Unloads all loaded plugins.
*/
void purple_plugins_unload_all(void);
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/slpmsg.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/slpmsg.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/slpmsg.h Sat Jul 11 17:11:11 2009 -0400
@@ -68,10 +68,8 @@
MsnMessage *msg; /**< The temporary real message that will be sent. */
#endif
-#ifdef MSN_DEBUG_SLP
- char *info;
+ const char *info;
gboolean text_body;
-#endif
};
/**
@@ -100,8 +98,6 @@
const char *content_type,
const char *content);
-#ifdef MSN_DEBUG_SLP
void msn_slpmsg_show(MsnMessage *msg);
-#endif
#endif /* _MSN_SLPMSG_H_ */
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/switchboard.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/switchboard.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/switchboard.h Sat Jul 11 17:11:11 2009 -0400
@@ -280,4 +280,14 @@
*/
void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+/**
+ * Shows an ink message from this switchboard.
+ *
+ * @param swboard The switchboard.
+ * @param passport The user that sent the ink.
+ * @param data The ink data.
+ */
+void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
+ const char *data);
+
#endif /* _MSN_SWITCHBOARD_H_ */
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/theme-manager.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/theme-manager.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/theme-manager.h Sat Jul 11 17:11:11 2009 -0400
@@ -127,5 +127,13 @@
*/
void purple_theme_manager_for_each_theme(PTFunc func);
+/**
+ * Loads a theme of the given type without adding it to the manager
+ *
+ * @param theme_dir the directory of the theme to load
+ * @param type the type of theme to load
+ */
+PurpleTheme *purple_theme_manager_load_theme(const gchar *theme_dir, const gchar *type);
+
G_END_DECLS
#endif /* PURPLE_THEME_MANAGER_H */
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h Fri Jul 10 22:52:39 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h Sat Jul 11 17:11:11 2009 -0400
@@ -415,6 +415,19 @@
/*@{*/
/**
+ * Escapes special characters in a plain-text string so they display
+ * correctly as HTML. For example, & is replaced with & and < is
+ * replaced with <
+ *
+ * This is exactly the same as g_markup_escape_text(), except that it
+ * does not change ' to ' because ' is not a valid HTML 4 entity,
+ * and is displayed literally in IE7.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_markup_escape_text(const gchar *text, gssize length);
+
+/**
* Finds an HTML tag matching the given name.
*
* This locates an HTML tag's start and end, and stores its attributes
@@ -1190,10 +1203,33 @@
* @param ip The IP address to validate.
*
* @return True if the IP address is syntactically correct.
+ * @deprecated This function will be replaced with one that validates
+ * as either IPv4 or IPv6 in 3.0.0. If you don't want this,
+ * behavior, use one of the more specific functions.
*/
gboolean purple_ip_address_is_valid(const char *ip);
/**
+ * Checks if the given IP address is a syntactically valid IPv4 address.
+ *
+ * @param ip The IP address to validate.
+ *
+ * @return True if the IP address is syntactically correct.
+ * @since 2.6.0
+ */
+gboolean purple_ipv4_address_is_valid(const char *ip);
+
+/**
+ * Checks if the given IP address is a syntactically valid IPv6 address.
+ *
+ * @param ip The IP address to validate.
+ *
+ * @return True if the IP address is syntactically correct.
+ * @since 2.6.0
+ */
+gboolean purple_ipv6_address_is_valid(const char *ip);
+
+/**
* This function extracts a list of URIs from the a "text/uri-list"
* string. It was "borrowed" from gnome_uri_list_extract_uris
*
diff -r 1306b41fd66b -r 39c3c161de14 Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h Fri Jul 10 22:52:39 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,308 +0,0 @@
-/**
- * @file yahoo.h The Yahoo! protocol plugin
- *
- * 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
- */
-
-#ifndef _YAHOO_H_
-#define _YAHOO_H_
-
-#include "circbuffer.h"
-#include "prpl.h"
-
-#define YAHOO_PAGER_HOST "scsa.msg.yahoo.com"
-#define YAHOO_PAGER_PORT 5050
-#define YAHOO_PAGER_PORT_P2P 5101
-#define YAHOO_LOGIN_URL "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%s"
-#define YAHOO_TOKEN_URL "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
-#define YAHOO_P2P_KEEPALIVE_SECS 300
-#define YAHOO_P2P_SERVER_TIMEOUT 10
-#define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
-#define YAHOO_MAIL_URL "http://rd.yahoo.com/messenger/client/?http://mail.yahoo.com/"
-#define YAHOO_XFER_HOST "filetransfer.msg.yahoo.com"
-#define YAHOO_XFER_PORT 80
-#define YAHOO_XFER_RELAY_HOST "relay.msg.yahoo.com"
-#define YAHOO_XFER_RELAY_PORT 80
-#define YAHOO_ROOMLIST_URL "http://insider.msg.yahoo.com/ycontent/"
-#define YAHOO_ROOMLIST_LOCALE "us"
-/* really we should get the list of servers from
- http://update.messenger.yahoo.co.jp/servers.html */
-#define YAHOOJP_PAGER_HOST "cs.yahoo.co.jp"
-#define YAHOOJP_TOKEN_URL "https://login.yahoo.co.jp/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
-#define YAHOOJP_LOGIN_URL "https://login.yahoo.co.jp/config/pwtoken_login?src=ymsgr&ts=&token=%s"
-#define YAHOOJP_PROFILE_URL "http://profiles.yahoo.co.jp/"
-#define YAHOOJP_MAIL_URL "http://mail.yahoo.co.jp/"
-#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_PORT 80
-#define YAHOOJP_ROOMLIST_URL "http://insider.msg.yahoo.co.jp/ycontent/"
-#define YAHOOJP_ROOMLIST_LOCALE "ja"
-
-#define YAHOO_AUDIBLE_URL "http://us.dl1.yimg.com/download.yahoo.com/dl/aud"
-
-#define WEBMESSENGER_URL "http://login.yahoo.com/config/login?.src=pg"
-
-#define YAHOO_SMS_CARRIER_URL "http://lookup.msg.vip.mud.yahoo.com"
-
-#define YAHOO_PICURL_SETTING "picture_url"
-#define YAHOO_PICCKSUM_SETTING "picture_checksum"
-#define YAHOO_PICEXPIRE_SETTING "picture_expire"
-
-#define YAHOO_STATUS_TYPE_OFFLINE "offline"
-#define YAHOO_STATUS_TYPE_AVAILABLE "available"
-#define YAHOO_STATUS_TYPE_BRB "brb"
-#define YAHOO_STATUS_TYPE_BUSY "busy"
-#define YAHOO_STATUS_TYPE_NOTATHOME "notathome"
-#define YAHOO_STATUS_TYPE_NOTATDESK "notatdesk"
-#define YAHOO_STATUS_TYPE_NOTINOFFICE "notinoffice"
-#define YAHOO_STATUS_TYPE_ONPHONE "onphone"
-#define YAHOO_STATUS_TYPE_ONVACATION "onvacation"
-#define YAHOO_STATUS_TYPE_OUTTOLUNCH "outtolunch"
-#define YAHOO_STATUS_TYPE_STEPPEDOUT "steppedout"
-#define YAHOO_STATUS_TYPE_AWAY "away"
-#define YAHOO_STATUS_TYPE_INVISIBLE "invisible"
-#define YAHOO_STATUS_TYPE_MOBILE "mobile"
-
-#define YAHOO_CLIENT_VERSION_ID "4194239"
-#define YAHOO_CLIENT_VERSION "9.0.0.2152"
-
-#define YAHOOJP_CLIENT_VERSION_ID "4194239"
-#define YAHOOJP_CLIENT_VERSION "9.0.0.2152"
-
-#define YAHOO_CLIENT_USERAGENT "Mozilla/4.0 (compatible; MSIE 5.5)"
-
-/* Index into attention types list. */
-#define YAHOO_BUZZ 0
-
-typedef enum {
More information about the commits
mailing list