Mercurial > pidgin
changeset 17775:fcf61e3be189
propagate from branch 'im.pidgin.pidgin' (head 906d9e8b2315b314b956961566ef8062cd963241)
to branch 'org.maemo.garage.pidgin.smiley-install' (head 9d93f1f0d77e5c7bc7fcf4baa9e8f0c026f09e20)
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Wed, 30 May 2007 21:05:04 +0000 |
| parents | deb035e6d748 (diff) 6caaf5eba4e7 (current diff) |
| children | cf6b7aeae062 |
| files | pidgin/gtkprefs.c pidgin/gtkthemes.c pidgin/pixmaps/emotes/default/22/theme pidgin/pixmaps/emotes/none/theme |
| diffstat | 35 files changed, 1828 insertions(+), 523 deletions(-) [+] |
line wrap: on
line diff
--- a/.mtn-ignore Tue May 29 22:44:59 2007 +0000 +++ b/.mtn-ignore Wed May 30 21:05:04 2007 +0000 @@ -12,6 +12,7 @@ Doxyfile$ aclocal.m4 compile +config.cache config.guess config.h$ config.h.in @@ -32,6 +33,8 @@ pidgin-.*.tar.gz pidgin-.*.tar.bz2 pidgin/pidgin$ +pidgin/pixmaps/emotes/default/22/theme +pidgin/pixmaps/emotes/none/theme pidgin/plugins/musicmessaging/music-messaging-bindings.c pidgin/plugins/perl/common/Makefile.PL$ pidgin/win32/pidgin_dll_rc.rc$
--- a/COPYRIGHT Tue May 29 22:44:59 2007 +0000 +++ b/COPYRIGHT Wed May 30 21:05:04 2007 +0000 @@ -129,6 +129,7 @@ Decklin Foster Francesco Fracassi Adam Fritzler +Takao Fujiwara Max G. François Gagné Andrew Gaul @@ -334,8 +335,10 @@ Richard Stellingwerff Charlie Stockman David Stoddard +Oleg Sukhodolsky Sun Microsystems Mårten Svantesson (fursten) +Amir Szekely (kichik) Robert T. Greg Taeger Peter Tang
--- a/ChangeLog Tue May 29 22:44:59 2007 +0000 +++ b/ChangeLog Wed May 30 21:05:04 2007 +0000 @@ -1,8 +1,11 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.0.2 (??/??/????): + libpurple: * Moving an ICQ buddy from one group to another no longer re-requests authorization from that person (Rene Hausleitner) + * Added nullprpl, an example protocol plugin (Ryan Barrett) + * Fixed SOCKS5 bug which caused Jabber file receiving to fail Finch: * Auto account reconnecting
--- a/configure.ac Tue May 29 22:44:59 2007 +0000 +++ b/configure.ac Wed May 30 21:05:04 2007 +0000 @@ -2085,6 +2085,7 @@ libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/novell/Makefile + libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/qq/Makefile libpurple/protocols/sametime/Makefile
--- a/finch/gntrequest.c Tue May 29 22:44:59 2007 +0000 +++ b/finch/gntrequest.c Wed May 30 21:05:04 2007 +0000 @@ -672,10 +672,13 @@ pt = purple_prefs_get_type(id); switch (pt) { case PURPLE_PREF_INT: + { + long int tmp; if (type == PURPLE_REQUEST_FIELD_LIST) /* Lists always return string */ - sscanf(val, "%ld", (long int *)&val); - purple_prefs_set_int(id, GPOINTER_TO_INT(val)); + sscanf(val, "%ld", &tmp); + purple_prefs_set_int(id, (gint)tmp); break; + } case PURPLE_PREF_BOOLEAN: purple_prefs_set_bool(id, GPOINTER_TO_INT(val)); break;
--- a/libpurple/cipher.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/cipher.c Wed May 30 21:05:04 2007 +0000 @@ -1447,14 +1447,14 @@ * Structs ******************************************************************************/ struct _PurpleCipher { - gchar *name; - PurpleCipherOps *ops; - guint ref; + gchar *name; /**< Internal name - used for searching */ + PurpleCipherOps *ops; /**< Operations supported by this cipher */ + guint ref; /**< Reference count */ }; struct _PurpleCipherContext { - PurpleCipher *cipher; - gpointer data; + PurpleCipher *cipher; /**< Cipher this context is under */ + gpointer data; /**< Internal cipher state data */ }; /******************************************************************************
--- a/libpurple/connection.h Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/connection.h Wed May 30 21:05:04 2007 +0000 @@ -279,7 +279,7 @@ * TODO: Eventually this bad boy will be removed, because it is * a gross fix for a crashy problem. */ -#define PURPLE_CONNECTION_IS_VALID(gc) (g_list_find(purple_connections_get_all(), (gc))) +#define PURPLE_CONNECTION_IS_VALID(gc) (g_list_find(purple_connections_get_all(), (gc)) != NULL) /*@}*/
--- a/libpurple/dbus-analyze-functions.py Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/dbus-analyze-functions.py Wed May 30 21:05:04 2007 +0000 @@ -166,8 +166,11 @@ self.returncode = [] def flush(self): + paramslist = ", ".join(self.paramshdr) + if (paramslist == "") : + paramslist = "void" print "%s %s(%s)" % (self.functiontype, self.function.name, - ", ".join(self.paramshdr)), + paramslist), if self.headersonly: print ";"
--- a/libpurple/plugins/perl/perl-common.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/plugins/perl/perl-common.c Wed May 30 21:05:04 2007 +0000 @@ -205,7 +205,7 @@ purple_debug(PURPLE_DEBUG_ERROR, "perl", "Perl function %s exited abnormally: %s\n", function, SvPV(ERRSV, na)); - POPs; + (void)POPs; } else if (count != 1) { /* * This should NEVER happen. G_SCALAR ensures that we WILL
--- a/libpurple/plugins/tcl/tcl_signals.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_signals.c Wed May 30 21:05:04 2007 +0000 @@ -49,7 +49,9 @@ Tcl_DecrRefCount(handler->signal); if (handler->namespace) + { Tcl_DecrRefCount(handler->namespace); + } g_free(handler); }
--- a/libpurple/protocols/Makefile.am Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/protocols/Makefile.am Wed May 30 21:05:04 2007 +0000 @@ -1,5 +1,5 @@ -EXTRA_DIST = Makefile.mingw +EXTRA_DIST = Makefile.mingw null/ -DIST_SUBDIRS = bonjour gg irc jabber msn novell oscar qq sametime silc toc simple yahoo zephyr +DIST_SUBDIRS = bonjour gg irc jabber msn novell null oscar qq sametime silc toc simple yahoo zephyr SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
--- a/libpurple/protocols/Makefile.mingw Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/protocols/Makefile.mingw Wed May 30 21:05:04 2007 +0000 @@ -8,7 +8,7 @@ PIDGIN_TREE_TOP := ../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak -SUBDIRS = gg irc jabber msn novell oscar qq sametime silc simple yahoo +SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo .PHONY: all install clean
--- a/libpurple/protocols/gg/gg.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/protocols/gg/gg.c Wed May 30 21:05:04 2007 +0000 @@ -253,8 +253,8 @@ /* */ -/* static void ggp_callback_buddylist_save_ok(PurpleConnection *gc, gchar *file) {{{ */ -static void ggp_callback_buddylist_save_ok(PurpleConnection *gc, gchar *file) +/* static void ggp_callback_buddylist_save_ok(PurpleConnection *gc, const char *file) {{{ */ +static void ggp_callback_buddylist_save_ok(PurpleConnection *gc, const char *file) { PurpleAccount *account = purple_connection_get_account(gc); @@ -277,7 +277,7 @@ purple_debug_error("gg", "Could not open file: %s\n", file); purple_notify_error(account, _("Couldn't open file"), msg, NULL); g_free(msg); - g_free(file); + g_free(buddylist); return; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/null/Makefile.am Wed May 30 21:05:04 2007 +0000 @@ -0,0 +1,21 @@ +EXTRA_DIST = README Makefile.mingw + +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) + +NULLSOURCES = nullprpl.c + +AM_CFLAGS = $(st) + +libnull_la_LDFLAGS = -module -avoid-version + +# nullprpl isn't built by default. when it is built, it's dynamically linked. +st = +pkg_LTLIBRARIES = libnull.la +libnull_la_SOURCES = $(NULLSOURCES) +libnull_la_LIBADD = $(GLIB_LIBS) + +AM_CPPFLAGS = \ + -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ + $(GLIB_CFLAGS) \ + $(DEBUG_CFLAGS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/null/Makefile.mingw Wed May 30 21:05:04 2007 +0000 @@ -0,0 +1,77 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of libnull +# + +PIDGIN_TREE_TOP := ../../.. +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak + +TARGET = libnull +TYPE = PLUGIN + +# Static or Plugin... +ifeq ($(TYPE),STATIC) + DEFINES += -DSTATIC + DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) +else +ifeq ($(TYPE),PLUGIN) + DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) +endif +endif + +## +## INCLUDE PATHS +## +INCLUDE_PATHS += -I. \ + -I$(GTK_TOP)/include \ + -I$(GTK_TOP)/include/glib-2.0 \ + -I$(GTK_TOP)/lib/glib-2.0/include \ + -I$(PURPLE_TOP) \ + -I$(PURPLE_TOP)/win32 \ + -I$(PIDGIN_TREE_TOP) + +LIB_PATHS += -L$(GTK_TOP)/lib \ + -L$(PURPLE_TOP) + +## +## SOURCES, OBJECTS +## +C_SRC = nullprpl.c + +OBJECTS = $(C_SRC:%.c=%.o) + +## +## LIBRARIES +## +LIBS = \ + -lglib-2.0 \ + -lintl \ + -lws2_32 \ + -lpurple + +include $(PIDGIN_COMMON_RULES) + +## +## TARGET DEFINITIONS +## +.PHONY: all install clean + +all: $(TARGET).dll + +install: all $(DLL_INSTALL_DIR) $(PURPLE_INSTALL_DIR) + cp $(TARGET).dll $(DLL_INSTALL_DIR) + +$(OBJECTS): $(PURPLE_CONFIG_H) + +$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS) + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll + +## +## CLEAN RULES +## +clean: + rm -f $(OBJECTS) + rm -f $(TARGET).dll + +include $(PIDGIN_COMMON_TARGETS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/null/README Wed May 30 21:05:04 2007 +0000 @@ -0,0 +1,46 @@ +nullprpl + +-------- +OVERVIEW +-------- +Nullprpl is a mock protocol plugin for Pidgin and libpurple. You can create +accounts with it, sign on and off, add buddies, and send and receive IMs, all +without connecting to a server! + +Beyond that basic functionality, nullprpl supports presence and away/available +messages, offline messages, user info, typing notification, privacy +allow/block lists, chat rooms, whispering, room lists, and protocol icons and +emblems. Notable missing features are file transfer and account registration +and authentication. + +Nullprpl is intended as an example of how to write a libpurple protocol +plugin. It doesn't contain networking code or an event loop, but it does +demonstrate how to use the libpurple API to do pretty much everything a prpl +might need to do. + +Nullprpl is also a useful tool for hacking on Pidgin, Finch, and other +libpurple clients. It's a full-featured protocol plugin, but doesn't depend on +an external server, so it's a quick and easy way to exercise test new code. It +also allows you to work while you're disconnected. + +----------------------- +BUILDING AND INSTALLING +----------------------- + +To build, just run ./configure as usual in the root directory of the pidgin +source distribution. Then cd libpurple/protocols/null and type make. To +install, copy libnull.la and .libs/libnull.so into your ~/.purple/plugins +directory. Then run Pidgin. + +To build nullprpl on Windows (with Cygwin/MinGW), use Makefile.mingw. + +----- +USAGE +----- +To add a nullprpl account, go to the account editor window and click Add. +Select Nullprpl from the protocol drop-down list, and enter any username you +want. + +Now, use Pidgin like normal. You can add buddies, send IMs, set away messages, +etc. If you send IMs to your own username, they will be echoed back to you. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/null/nullprpl.c Wed May 30 21:05:04 2007 +0000 @@ -0,0 +1,1202 @@ +/** + * 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. + * + * Nullprpl is a mock protocol plugin for Pidgin and libpurple. You can create + * accounts with it, sign on and off, add buddies, and send and receive IMs, + * all without connecting to a server! + * + * Beyond that basic functionality, nullprpl supports presence and + * away/available messages, offline messages, user info, typing notification, + * privacy allow/block lists, chat rooms, whispering, room lists, and protocol + * icons and emblems. Notable missing features are file transfer and account + * registration and authentication. + * + * Nullprpl is intended as an example of how to write a libpurple protocol + * plugin. It doesn't contain networking code or an event loop, but it does + * demonstrate how to use the libpurple API to do pretty much everything a prpl + * might need to do. + * + * Nullprpl is also a useful tool for hacking on Pidgin, Finch, and other + * libpurple clients. It's a full-featured protocol plugin, but doesn't depend + * on an external server, so it's a quick and easy way to exercise test new + * code. It also allows you to work while you're disconnected. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include <string.h> +#include <time.h> + +#include <glib.h> + +#include "internal.h" +#include "config.h" +#include "account.h" +#include "accountopt.h" +#include "blist.h" +#include "cmds.h" +#include "conversation.h" +#include "connection.h" +#include "debug.h" +#include "notify.h" +#include "privacy.h" +#include "prpl.h" +#include "roomlist.h" +#include "status.h" +#include "util.h" +#include "version.h" + + +#define NULLPRPL_ID "prpl-null" +static PurplePlugin *_null_protocol = NULL; + +#define NULL_STATUS_ONLINE "online" +#define NULL_STATUS_AWAY "away" +#define NULL_STATUS_OFFLINE "offline" + +typedef void (*GcFunc)(PurpleConnection *from, + PurpleConnection *to, + gpointer userdata); + +typedef struct { + GcFunc fn; + PurpleConnection *from; + gpointer userdata; +} GcFuncData; + +/* + * stores offline messages that haven't been delivered yet. maps username + * (char *) to GList * of GOfflineMessages. initialized in nullprpl_init. + */ +GHashTable* goffline_messages = NULL; + +typedef struct { + char *from; + char *message; + time_t mtime; + PurpleMessageFlags flags; +} GOfflineMessage; + +/* + * helpers + */ +static PurpleConnection *get_nullprpl_gc(const char *username) { + PurpleAccount *acct = purple_accounts_find(username, NULLPRPL_ID); + if (acct && purple_account_is_connected(acct)) + return acct->gc; + else + return NULL; +} + +static void call_if_nullprpl(gpointer data, gpointer userdata) { + PurpleConnection *gc = (PurpleConnection *)(data); + GcFuncData *gcfdata = (GcFuncData *)userdata; + + if (!strcmp(gc->account->protocol_id, NULLPRPL_ID)) + gcfdata->fn(gcfdata->from, gc, gcfdata->userdata); +} + +static void foreach_nullprpl_gc(GcFunc fn, PurpleConnection *from, + gpointer userdata) { + GcFuncData gcfdata = { fn, from, userdata }; + g_list_foreach(purple_connections_get_all(), call_if_nullprpl, + &gcfdata); +} + + +typedef void(*ChatFunc)(PurpleConvChat *from, PurpleConvChat *to, + int id, const char *room, gpointer userdata); + +typedef struct { + ChatFunc fn; + PurpleConvChat *from_chat; + gpointer userdata; +} ChatFuncData; + +static void call_chat_func(gpointer data, gpointer userdata) { + PurpleConnection *to = (PurpleConnection *)data; + ChatFuncData *cfdata = (ChatFuncData *)userdata; + + int id = cfdata->from_chat->id; + PurpleConversation *conv = purple_find_chat(to, id); + if (conv) { + PurpleConvChat *chat = purple_conversation_get_chat_data(conv); + cfdata->fn(cfdata->from_chat, chat, id, conv->name, cfdata->userdata); + } +} + +static void foreach_gc_in_chat(ChatFunc fn, PurpleConnection *from, + int id, gpointer userdata) { + PurpleConversation *conv = purple_find_chat(from, id); + ChatFuncData cfdata = { fn, + purple_conversation_get_chat_data(conv), + userdata }; + + g_list_foreach(purple_connections_get_all(), call_chat_func, + &cfdata); +} + + +static void discover_status(PurpleConnection *from, PurpleConnection *to, + gpointer userdata) { + char *from_username = from->account->username; + char *to_username = to->account->username; + + if (purple_find_buddy(from->account, to_username)) { + PurpleStatus *status = purple_account_get_active_status(to->account); + const char *status_id = purple_status_get_id(status); + const char *message = purple_status_get_attr_string(status, "message"); + + if (!strcmp(status_id, NULL_STATUS_ONLINE) || + !strcmp(status_id, NULL_STATUS_AWAY) || + !strcmp(status_id, NULL_STATUS_OFFLINE)) { + purple_debug_info("nullprpl", "%s sees that %s is %s: %s\n", + from_username, to_username, status_id, message); + purple_prpl_got_user_status(from->account, to_username, status_id, + (message) ? "message" : NULL, message, NULL); + } else { + purple_debug_error("nullprpl", + "%s's buddy %s has an unknown status: %s, %s", + from_username, to_username, status_id, message); + } + } +} + +static void report_status_change(PurpleConnection *from, PurpleConnection *to, + gpointer userdata) { + purple_debug_info("nullprpl", "notifying %s that %s changed status\n", + to->account->username, from->account->username); + discover_status(to, from, NULL); +} + + +/* + * UI callbacks + */ +static void nullprpl_input_user_info(PurplePluginAction *action) +{ + PurpleConnection *gc = (PurpleConnection *)action->context; + PurpleAccount *acct = purple_connection_get_account(gc); + purple_debug_info("nullprpl", "showing 'Set User Info' dialog for %s\n", + acct->username); + + purple_account_request_change_user_info(acct); +} + +/* this is set to the actions member of the PurplePluginInfo struct at the + * bottom. + */ +static GList *nullprpl_actions(PurplePlugin *plugin, gpointer context) +{ + PurplePluginAction *action = purple_plugin_action_new( + _("Set User Info..."), nullprpl_input_user_info); + return g_list_append(NULL, action); +} + + +/* + * prpl functions + */ +static const char *nullprpl_list_icon(PurpleAccount *acct, PurpleBuddy *buddy) +{ + /* shamelessly steal (er, borrow) the meanwhile protocol icon. it's cute! */ + return "meanwhile"; +} + +static const char *nullprpl_list_emblem(PurpleBuddy *buddy) +{ + const char* emblem; + + if (get_nullprpl_gc(buddy->name)) { + PurplePresence *presence = purple_buddy_get_presence(buddy); + PurpleStatus *status = purple_presence_get_active_status(presence); + emblem = purple_status_get_name(status); + } else { + emblem = "offline"; + } + + purple_debug_info("nullprpl", "using emblem %s for %s's buddy %s\n", + emblem, buddy->account->username, buddy->name); + return emblem; +} + +static char *nullprpl_status_text(PurpleBuddy *buddy) { + purple_debug_info("nullprpl", "getting %s's status text for %s\n", + buddy->name, buddy->account->username); + + if (purple_find_buddy(buddy->account, buddy->name)) { + PurplePresence *presence = purple_buddy_get_presence(buddy); + PurpleStatus *status = purple_presence_get_active_status(presence); + const char *name = purple_status_get_name(status); + const char *message = purple_status_get_attr_string(status, "message"); + + char *text; + if (message && strlen(message) > 0) + text = g_strdup_printf("%s: %s", name, message); + else + text = g_strdup(name); + + purple_debug_info("nullprpl", "%s's status text is %s\n", buddy->name, text); + return text; + + } else { + purple_debug_info("nullprpl", "...but %s is not logged in\n", buddy->name); + return "Not logged in"; + } +} + +static void nullprpl_tooltip_text(PurpleBuddy *buddy, + PurpleNotifyUserInfo *info, + gboolean full) { + PurpleConnection *gc = get_nullprpl_gc(buddy->name); + + if (gc) { + /* they're logged in */ + PurplePresence *presence = purple_buddy_get_presence(buddy); + PurpleStatus *status = purple_presence_get_active_status(presence); + const char *msg = nullprpl_status_text(buddy); + purple_notify_user_info_add_pair(info, purple_status_get_name(status), + msg); + + if (full) { + const char *user_info = purple_account_get_user_info(gc->account); + if (user_info) + purple_notify_user_info_add_pair(info, _("User info"), user_info); + } + + } else { + /* they're not logged in */ + purple_notify_user_info_add_pair(info, _("User info"), _("not logged in")); + } + + purple_debug_info("nullprpl", "showing %s tooltip for %s\n", + (full) ? "full" : "short", buddy->name); +} + +static GList *nullprpl_status_types(PurpleAccount *acct) +{ + GList *types = NULL; + PurpleStatusType *type; + + purple_debug_info("nullprpl", "returning status types for %s: %s, %s, %s\n", + acct->username, + NULL_STATUS_ONLINE, NULL_STATUS_AWAY, NULL_STATUS_OFFLINE); + + type = purple_status_type_new(PURPLE_STATUS_AVAILABLE, NULL_STATUS_ONLINE, + NULL_STATUS_ONLINE, TRUE); + purple_status_type_add_attr(type, "message", _("Online"), + purple_value_new(PURPLE_TYPE_STRING)); + types = g_list_append(types, type); + + type = purple_status_type_new(PURPLE_STATUS_AWAY, NULL_STATUS_AWAY, + NULL_STATUS_AWAY, TRUE); + purple_status_type_add_attr(type, "message", _("Away"), + purple_value_new(PURPLE_TYPE_STRING)); + types = g_list_append(types, type); + + type = purple_status_type_new(PURPLE_STATUS_OFFLINE, NULL_STATUS_OFFLINE, + NULL_STATUS_OFFLINE, TRUE); + purple_status_type_add_attr(type, "message", _("Offline"), + purple_value_new(PURPLE_TYPE_STRING)); + types = g_list_append(types, type); + + return types; +} + +static void blist_example_menu_item(PurpleBlistNode *node, gpointer userdata) { + purple_debug_info("nullprpl", "example menu item clicked on user", + ((PurpleBuddy *)node)->name); + + purple_notify_info(NULL, /* plugin handle or PurpleConnection */ + _("Primary title"), + _("Secondary title"), + _("This is the callback for the nullprpl menu item.")); +} + +static GList *nullprpl_blist_node_menu(PurpleBlistNode *node) { + purple_debug_info("nullprpl", "providing buddy list context menu item\n"); + + if (PURPLE_BLIST_NODE_IS_BUDDY(node)) { + PurpleMenuAction *action = purple_menu_action_new( + _("Nullprpl example menu item"), + PURPLE_CALLBACK(blist_example_menu_item), + NULL, /* userdata passed to the callback */ + NULL); /* child menu items */ + return g_list_append(NULL, action); + } else { + return NULL; + } +} + +static GList *nullprpl_chat_info(PurpleConnection *gc) { + struct proto_chat_entry *pce; /* defined in prpl.h */ + + purple_debug_info("nullprpl", "returning chat setting 'room'\n"); + + pce = g_new0(struct proto_chat_entry, 1); + pce->label = _(_("Chat _room")); + pce->identifier = "room"; + pce->required = TRUE; + + return g_list_append(NULL, pce); +} + +static GHashTable *nullprpl_chat_info_defaults(PurpleConnection *gc, + const char *room) { + GHashTable *defaults; + + purple_debug_info("nullprpl", "returning chat default setting " + "'room' = 'default'\n"); + + defaults = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free); + g_hash_table_insert(defaults, "room", g_strdup("default")); + return defaults; +} + +static void nullprpl_login(PurpleAccount *acct) +{ + PurpleConnection *gc = purple_account_get_connection(acct); + GList *offline_messages; + + purple_debug_info("nullprpl", "logging in %s\n", acct->username); + + purple_connection_update_progress(gc, _("Connecting"), + 0, /* which connection step this is */ + 2); /* total number of steps */ + + purple_connection_update_progress(gc, _("Connected"), + 1, /* which connection step this is */ + 2); /* total number of steps */ + purple_connection_set_state(gc, PURPLE_CONNECTED); + + /* tell purple about everyone on our buddy list who's connected */ + foreach_nullprpl_gc(discover_status, gc, NULL); + + /* notify other nullprpl accounts */ + foreach_nullprpl_gc(report_status_change, gc, NULL); + + /* fetch stored offline messages */ + purple_debug_info("nullprpl", "checking for offline messages for %s\n", + acct->username); + offline_messages = g_hash_table_lookup(goffline_messages, acct->username); + while (offline_messages) { + GOfflineMessage *message = (GOfflineMessage *)offline_messages->data; + purple_debug_info("nullprpl", "delivering offline message to %s: %s\n", + acct->username, message->message); + serv_got_im(gc, message->from, message->message, message->flags, + message->mtime); + offline_messages = g_list_next(offline_messages); + + g_free(message->from); + g_free(message->message); + g_free(message); + } + + g_list_free(offline_messages); + g_hash_table_remove(goffline_messages, &acct->username); +} + +static void nullprpl_close(PurpleConnection *gc) +{ + /* notify other nullprpl accounts */ + foreach_nullprpl_gc(report_status_change, gc, NULL); +} + +static int nullprpl_send_im(PurpleConnection *gc, const char *who, + const char *message, PurpleMessageFlags flags) +{ + const char *from_username = gc->account->username; + PurpleMessageFlags receive_flags = ((flags & ~PURPLE_MESSAGE_SEND) + | PURPLE_MESSAGE_RECV); + PurpleAccount *to_acct = purple_accounts_find(who, NULLPRPL_ID); + PurpleConnection *to; + + purple_debug_info("nullprpl", "sending message from %s to %s: %s\n", + from_username, who, message); + + /* is the sender blocked by the recipient's privacy settings? */ + if (!purple_privacy_check(to_acct, gc->account->username)) { + char *msg = g_strdup_printf( + _("Your message was blocked by %s's privacy settings."), who); + purple_debug_info("nullprpl", + "discarding; %s is blocked by %s's privacy settings\n", + from_username, who); + purple_conv_present_error(who, gc->account, msg); + g_free(msg); + return 0; + } + + /* is the recipient online? */ + to = get_nullprpl_gc(who); + if (to) { /* yes, send */ + serv_got_im(to, from_username, message, receive_flags, time(NULL)); + + } else { /* nope, store as an offline message */ + GOfflineMessage *offline_message; + GList *messages; + + purple_debug_info("nullprpl", + "%s is offline, sending as offline message\n", who); + offline_message = g_new0(GOfflineMessage, 1); + offline_message->from = g_strdup(from_username); + offline_message->message = g_strdup(message); + offline_message->mtime = time(NULL); + offline_message->flags = receive_flags; + + messages = g_hash_table_lookup(goffline_messages, who); + messages = g_list_append(messages, offline_message); + g_hash_table_insert(goffline_messages, g_strdup(who), messages); + } + + return 1; +} + +static void nullprpl_set_info(PurpleConnection *gc, const char *info) { + purple_debug_info("nullprpl", "setting %s's user info to %s\n", + gc->account->username, info); +} + +static char *typing_state_to_string(PurpleTypingState typing) { + switch (typing) { + case PURPLE_NOT_TYPING: return "is not typing"; + case PURPLE_TYPING: return "is typing"; + case PURPLE_TYPED: return "stopped typing momentarily"; + default: return "unknown typing state"; + } +} + +static void notify_typing(PurpleConnection *from, PurpleConnection *to, + gpointer typing) { + char *from_username = from->account->username; + char *action = typing_state_to_string((PurpleTypingState)typing); + purple_debug_info("nullprpl", "notifying %s that %s %s\n", + to->account->username, from_username, action); + + serv_got_typing(to, + from_username, + 0, /* if non-zero, a timeout in seconds after which to + * reset the typing status to PURPLE_NOT_TYPING */ + (PurpleTypingState)typing); +} + +static unsigned int nullprpl_send_typing(PurpleConnection *gc, const char *name, + PurpleTypingState typing) { + purple_debug_info("nullprpl", "%s %s\n", gc->account->username, + typing_state_to_string(typing)); + foreach_nullprpl_gc(notify_typing, gc, (gpointer)typing); + return 0; +} + +static void nullprpl_get_info(PurpleConnection *gc, const char *username) { + const char *body; + PurpleNotifyUserInfo *info = purple_notify_user_info_new(); + PurpleAccount *acct; + + purple_debug_info("nullprpl", "Fetching %s's user info for %s\n", username, + gc->account->username); + + if (!get_nullprpl_gc(username)) { + char *msg = g_strdup_printf(_("%s is not logged in."), username); + purple_notify_error(gc, _("User Info"), _("User info not available. "), msg); + g_free(msg); + } + + acct = purple_accounts_find(username, NULLPRPL_ID); + if (acct) + body = purple_account_get_user_info(acct); + else + body = _("No user info."); + purple_notify_user_info_add_pair(info, "Info", body); + + /* show a buddy's user info in a nice dialog box */ + purple_notify_userinfo(gc, /* connection the buddy info came through */ + username, /* buddy's username */ + info, /* body */ + NULL, /* callback called when dialog closed */ + NULL); /* userdata for callback */ +} + +static void nullprpl_set_status(PurpleAccount *acct, PurpleStatus *status) { + const char *msg = purple_status_get_attr_string(status, "message"); + purple_debug_info("nullprpl", "setting %s's status to %s: %s\n", + acct->username, purple_status_get_name(status), msg); + + foreach_nullprpl_gc(report_status_change, get_nullprpl_gc(acct->username), + NULL); +} + +static void nullprpl_set_idle(PurpleConnection *gc, int idletime) { + purple_debug_info("nullprpl", + "purple reports that %s has been idle for %d seconds\n", + gc->account->username, idletime); +} + +static void nullprpl_change_passwd(PurpleConnection *gc, const char *old_pass, + const char *new_pass) { + purple_debug_info("nullprpl", "%s wants to change their password\n", + gc->account->username); +} + +static void nullprpl_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, + PurpleGroup *group) +{ + char *username = gc->account->username; + PurpleConnection *buddy_gc = get_nullprpl_gc(buddy->name); + + purple_debug_info("nullprpl", "adding %s to %s's buddy list\n", buddy->name, + username); + + if (buddy_gc) { + PurpleAccount *buddy_acct = buddy_gc->account; + + discover_status(gc, buddy_gc, NULL); + + if (purple_find_buddy(buddy_acct, username)) { + purple_debug_info("nullprpl", "%s is already on %s's buddy list\n", + username, buddy->name); + } else { + purple_debug_info("nullprpl", "asking %s if they want to add %s\n", + buddy->name, username); + purple_account_request_add(buddy_acct, + username, + NULL, /* local account id (rarely used) */ + NULL, /* alias */ + NULL); /* message */ + } + } +} + +static void nullprpl_add_buddies(PurpleConnection *gc, GList *buddies, + GList *groups) { + GList *buddy = buddies; + GList *group = groups; + + purple_debug_info("nullprpl", "adding multiple buddies\n"); + + while (buddy && group) { + nullprpl_add_buddy(gc, (PurpleBuddy *)buddy->data, (PurpleGroup *)group->data); + buddy = g_list_next(buddy); + group = g_list_next(group); + } +} + +static void nullprpl_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, + PurpleGroup *group) +{ + purple_debug_info("nullprpl", "removing %s from %s's buddy list\n", + buddy->name, gc->account->username); +} + +static void nullprpl_remove_buddies(PurpleConnection *gc, GList *buddies, + GList *groups) { + GList *buddy = buddies; + GList *group = groups; + + purple_debug_info("nullprpl", "removing multiple buddies\n"); + + while (buddy && group) { + nullprpl_remove_buddy(gc, (PurpleBuddy *)buddy->data, + (PurpleGroup *)group->data); + buddy = g_list_next(buddy); + group = g_list_next(group); + } +} + +/* + * nullprpl uses purple's local whitelist and blacklist, stored in blist.xml, as + * its authoritative privacy settings, and uses purple's logic (specifically + * purple_privacy_check(), from privacy.h), to determine whether messages are + * allowed or blocked. + */ +static void nullprpl_add_permit(PurpleConnection *gc, const char *name) { + purple_debug_info("nullprpl", "%s adds %s to their allowed list\n", + gc->account->username, name); +} + +static void nullprpl_add_deny(PurpleConnection *gc, const char *name) { + purple_debug_info("nullprpl", "%s adds %s to their blocked list\n", + gc->account->username, name); +} + +static void nullprpl_rem_permit(PurpleConnection *gc, const char *name) { + purple_debug_info("nullprpl", "%s removes %s from their allowed list\n", + gc->account->username, name); +} + +static void nullprpl_rem_deny(PurpleConnection *gc, const char *name) { + purple_debug_info("nullprpl", "%s removes %s from their blocked list\n", + gc->account->username, name); +} + +static void nullprpl_set_permit_deny(PurpleConnection *gc) { + /* this is for synchronizing the local black/whitelist with the server. + * for nullprpl, it's a noop. + */ +} + +static void joined_chat(PurpleConvChat *from, PurpleConvChat *to, + int id, const char *room, gpointer userdata) { + /* tell their chat window that we joined */ + purple_debug_info("nullprpl", "%s sees that %s joined chat room %s\n", + to->nick, from->nick, room); + purple_conv_chat_add_user(to, + from->nick, + NULL, /* user-provided join message, IRC style */ + PURPLE_CBFLAGS_NONE, + TRUE); /* show a join message */ + + if (from != to) { + /* add them to our chat window */ + purple_debug_info("nullprpl", "%s sees that %s is in chat room %s\n", + from->nick, to->nick, room); + purple_conv_chat_add_user(from, + to->nick, + NULL, /* user-provided join message, IRC style */ + PURPLE_CBFLAGS_NONE, + FALSE); /* show a join message */ + } +} + +static void nullprpl_join_chat(PurpleConnection *gc, GHashTable *components) { + char *username = gc->account->username; + char *room = g_hash_table_lookup(components, "room"); + int chat_id = g_str_hash(room); + purple_debug_info("nullprpl", "%s is joining chat room %s\n", username, room); + + if (!purple_find_chat(gc, chat_id)) { + serv_got_joined_chat(gc, chat_id, room); + + /* tell everyone that we joined, and add them if they're already there */ + foreach_gc_in_chat(joined_chat, gc, chat_id, NULL); + } else { + purple_debug_info("nullprpl", "%s is already in chat room %s\n", username, + room); + purple_notify_info(gc, + _("Join chat"), + _("Join chat"), + g_strdup_printf("%s is already in chat room %s.", + username, room)); + } +} + +static void nullprpl_reject_chat(PurpleConnection *gc, GHashTable *components) { + char *invited_by = g_hash_table_lookup(components, "invited_by"); + char *room = g_hash_table_lookup(components, "room"); + char *username = gc->account->username; + PurpleConnection *invited_by_gc = get_nullprpl_gc(invited_by); + char *message = g_strdup_printf( + "%s %s %s.", + username, + _("has rejected your invitation to join the chat room"), + room); + + purple_debug_info("nullprpl", + "%s has rejected %s's invitation to join chat room %s\n", + username, invited_by, room); + + purple_notify_info(invited_by_gc, + _("Chat invitation rejected"), + _("Chat invitation rejected"), + message); +} + +static char *nullprpl_get_chat_name(GHashTable *components) { + char *room = g_hash_table_lookup(components, "room"); + purple_debug_info("nullprpl", "reporting chat room name '%s'\n", room); + return room; +} + +static void nullprpl_chat_invite(PurpleConnection *gc, int id, + const char *message, const char *who) { + char *username = gc->account->username; + PurpleConversation *conv = purple_find_chat(gc, id); + char *room = conv->name; + PurpleAccount *to_acct = purple_accounts_find(who, NULLPRPL_ID); + + purple_debug_info("nullprpl", "%s is inviting %s to join chat room %s\n", + username, who, room); + + if (to_acct) { + PurpleConversation *to_conv = purple_find_chat(to_acct->gc, id); + if (to_conv) { + purple_debug_info("nullprpl", + "%s is already in chat room %s; " + "ignoring invitation from %s\n", + who, room, username); + purple_notify_info(gc, + _("Chat invitation"), + _("Chat invitation"), + g_strdup_printf("%s is already in chat room %s.", + who, room)); + } else { + GHashTable *components; + components = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, free); + g_hash_table_replace(components, "room", g_strdup(room)); + g_hash_table_replace(components, "invited_by", g_strdup(username)); + serv_got_chat_invite(to_acct->gc, room, username, message, components); + } + } +} + +static void left_chat_room(PurpleConvChat *from, PurpleConvChat *to, + int id, const char *room, gpointer userdata) { + if (from != to) { + /* tell their chat window that we left */ + purple_debug_info("nullprpl", "%s sees that %s left chat room %s\n", + to->nick, from->nick, room); + purple_conv_chat_remove_user(to, + from->nick, + NULL); /* user-provided message, IRC style */ + } +} + +static void nullprpl_chat_leave(PurpleConnection *gc, int id) { + PurpleConversation *conv = purple_find_chat(gc, id); + purple_debug_info("nullprpl", "%s is leaving chat room %s\n", + gc->account->username, conv->name); + + /* tell everyone that we left */ + foreach_gc_in_chat(left_chat_room, gc, id, NULL); +} + +static PurpleCmdRet send_whisper(PurpleConversation *conv, const gchar *cmd, + gchar **args, gchar **error, void *userdata) { + const char *to_username; + const char *message; + const char *from_username; + PurpleConvChat *chat; + PurpleConvChatBuddy *chat_buddy; + PurpleConnection *to; + + /* parse args */ + to_username = args[0]; + message = args[1]; + + if (!to_username || strlen(to_username) == 0) { + *error = g_strdup(_("Whisper is missing recipient.")); + return PURPLE_CMD_RET_FAILED; + } else if (!message || strlen(message) == 0) { + *error = g_strdup(_("Whisper is missing message.")); + return PURPLE_CMD_RET_FAILED; + } + + from_username = conv->account->username; + purple_debug_info("nullprpl", "%s whispers to %s in chat room %s: %s\n", + from_username, to_username, conv->name, message); + + chat = purple_conversation_get_chat_data(conv); + chat_buddy = purple_conv_chat_cb_find(chat, to_username); + to = get_nullprpl_gc(to_username); + + if (!chat_buddy) { + /* this will be freed by the caller */ + *error = g_strdup_printf(_("%s is not logged in."), to_username); + return PURPLE_CMD_RET_FAILED; + } else if (!to) { + *error = g_strdup_printf(_("%s is not in this chat room."), to_username); + return PURPLE_CMD_RET_FAILED; + } else { + /* write the whisper in the sender's chat window */ + char *message_to = g_strdup_printf("%s (to %s)", message, to_username); + purple_conv_chat_write(chat, from_username, message_to, + PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_WHISPER, + time(NULL)); + g_free(message_to); + + /* send the whisper */ + serv_chat_whisper(to, chat->id, from_username, message); + + return PURPLE_CMD_RET_OK; + } +} + +static void nullprpl_chat_whisper(PurpleConnection *gc, int id, const char *who, + const char *message) { + char *username = gc->account->username; + PurpleConversation *conv = purple_find_chat(gc, id); + purple_debug_info("nullprpl", + "%s receives whisper from %s in chat room %s: %s\n", + username, who, conv->name, message); + + /* receive whisper on recipient's account */ + serv_got_chat_in(gc, id, who, PURPLE_MESSAGE_RECV | PURPLE_MESSAGE_WHISPER, + message, time(NULL)); +} + +static void receive_chat_message(PurpleConvChat *from, PurpleConvChat *to, + int id, const char *room, gpointer userdata) { + const char *message = (const char *)userdata; + PurpleConnection *to_gc = get_nullprpl_gc(to->nick); + + purple_debug_info("nullprpl", + "%s receives message from %s in chat room %s: %s\n", + to->nick, from->nick, room, message); + serv_got_chat_in(to_gc, id, from->nick, PURPLE_MESSAGE_RECV, message, + time(NULL)); +} + +static int nullprpl_chat_send(PurpleConnection *gc, int id, const char *message, + PurpleMessageFlags flags) { + char *username = gc->account->username; + PurpleConversation *conv = purple_find_chat(gc, id); + + if (conv) { + purple_debug_info("nullprpl", + "%s is sending message to chat room %s: %s\n", username, + conv->name, message); + + /* send message to everyone in the chat room */ + foreach_gc_in_chat(receive_chat_message, gc, id, (gpointer)message); + return 0; + } else { + purple_debug_info("nullprpl", + "tried to send message from %s to chat room #%d: %s\n" + "but couldn't find chat room", + username, id, message); + return -1; + } +} + +static void nullprpl_register_user(PurpleAccount *acct) { + purple_debug_info("nullprpl", "registering account for %s\n", + acct->username); +} + +static void nullprpl_get_cb_info(PurpleConnection *gc, int id, const char *who) { + PurpleConversation *conv = purple_find_chat(gc, id); + purple_debug_info("nullprpl", + "retrieving %s's info for %s in chat room %s\n", who, + gc->account->username, conv->name); + + nullprpl_get_info(gc, who); +} + +static void nullprpl_alias_buddy(PurpleConnection *gc, const char *who, + const char *alias) { + purple_debug_info("nullprpl", "%s sets %'s alias to %s\n", + gc->account->username, who, alias); +} + +static void nullprpl_group_buddy(PurpleConnection *gc, const char *who, + const char *old_group, + const char *new_group) { + purple_debug_info("nullprpl", "%s has moved %s from group %s to group %s\n", + who, old_group, new_group); +} + +static void nullprpl_rename_group(PurpleConnection *gc, const char *old_name, + PurpleGroup *group, GList *moved_buddies) { + purple_debug_info("nullprpl", "%s has renamed group %s to %s\n", + gc->account->username, old_name, group->name); +} + +static void nullprpl_convo_closed(PurpleConnection *gc, const char *who) { + purple_debug_info("nullprpl", "%s's conversation with %s was closed\n", + gc->account->username, who); +} + +/* normalize a username (e.g. remove whitespace, add default domain, etc.) + * for nullprpl, this is a noop. + */ +static const char *nullprpl_normalize(const PurpleAccount *acct, + const char *input) { + return NULL; +} + +static void nullprpl_set_buddy_icon(PurpleConnection *gc, + PurpleStoredImage *img) { + purple_debug_info("nullprpl", "setting %s's buddy icon to %s\n", + gc->account->username, purple_imgstore_get_filename(img)); +} + +static void nullprpl_remove_group(PurpleConnection *gc, PurpleGroup *group) { + purple_debug_info("nullprpl", "%s has removed group %s\n", + gc->account->username, group->name); +} + + +static void set_chat_topic_fn(PurpleConvChat *from, PurpleConvChat *to, + int id, const char *room, gpointer userdata) { + const char *topic = (const char *)userdata; + const char *username = from->conv->account->username; + char *msg; + + purple_conv_chat_set_topic(to, username, topic); + + if (topic && strlen(topic) > 0) + msg = g_strdup_printf(_("%s sets topic to: %s"), username, topic); + else + msg = g_strdup_printf(_("%s clears topic"), username); + + purple_conv_chat_write(to, username, msg, + PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, + time(NULL)); + g_free(msg); +} + +static void nullprpl_set_chat_topic(PurpleConnection *gc, int id, + const char *topic) { + PurpleConversation *conv = purple_find_chat(gc, id); + PurpleConvChat *chat = purple_conversation_get_chat_data(conv); + const char *last_topic; + + if (!chat) + return; + + purple_debug_info("nullprpl", "%s sets topic of chat room '%s' to '%s'\n", + gc->account->username, conv->name, topic); + + last_topic = purple_conv_chat_get_topic(chat); + if ((!topic && !last_topic) || + (topic && last_topic && !strcmp(topic, last_topic))) + return; /* topic is unchanged, this is a noop */ + + foreach_gc_in_chat(set_chat_topic_fn, gc, id, (gpointer)topic); +} + +static gboolean nullprpl_finish_get_roomlist(gpointer roomlist) { + purple_roomlist_set_in_progress((PurpleRoomlist *)roomlist, FALSE); + return FALSE; +} + +static PurpleRoomlist *nullprpl_roomlist_get_list(PurpleConnection *gc) { + char *username = gc->account->username; + PurpleRoomlist *roomlist = purple_roomlist_new(gc->account); + GList *fields = NULL; + PurpleRoomlistField *field; + GList *chats; + GList *seen_ids = NULL; + + purple_debug_info("nullprpl", "%s asks for room list; returning:\n", username); + + /* set up the room list */ + field = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "room", + "room", TRUE /* hidden */); + fields = g_list_append(fields, field); + + field = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_INT, "Id", "Id", FALSE); + fields = g_list_append(fields, field); + + purple_roomlist_set_fields(roomlist, fields); + + /* add each chat room. the chat ids are cached in seen_ids so that each room + * is only returned once, even if multiple users are in it. */ + for (chats = purple_get_chats(); chats; chats = g_list_next(chats)) { + PurpleConversation *conv = (PurpleConversation *)chats->data; + PurpleRoomlistRoom *room; + char *name = conv->name; + int id = purple_conversation_get_chat_data(conv)->id; + + /* have we already added this room? */ + if (g_list_find_custom(seen_ids, name, (GCompareFunc)strcmp)) + continue; /* yes! try the next one. */ + + seen_ids = g_list_append(seen_ids, name); /* no, it's new. */ + purple_debug_info("nullprpl", "%s (%d), ", name, id); + + room = purple_roomlist_room_new(PURPLE_ROOMLIST_ROOMTYPE_ROOM, name, NULL); + purple_roomlist_room_add_field(roomlist, room, name); + purple_roomlist_room_add_field(roomlist, room, &id); + purple_roomlist_room_add(roomlist, room); + } + + purple_timeout_add(1 /* ms */, nullprpl_finish_get_roomlist, roomlist); + return roomlist; +} + +static void nullprpl_roomlist_cancel(PurpleRoomlist *list) { + purple_debug_info("nullprpl", "%s asked to cancel room list request\n", + list->account->username); +} + +static void nullprpl_roomlist_expand_category(PurpleRoomlist *list, + PurpleRoomlistRoom *category) { + purple_debug_info("nullprpl", "%s asked to expand room list category %s\n", + list->account->username, category->name); +} + +/* nullprpl doesn't support file transfer...yet... */ +static gboolean nullprpl_can_receive_file(PurpleConnection *gc, + const char *who) { + return FALSE; +} + +static gboolean nullprpl_offline_message(const PurpleBuddy *buddy) { + purple_debug_info("nullprpl", + "reporting that offline messages are supported for %s\n", + buddy->name); + return TRUE; +} + + +/* + * prpl stuff. see prpl.h for more information. + */ + +static PurplePluginProtocolInfo prpl_info = +{ + OPT_PROTO_NO_PASSWORD | OPT_PROTO_CHAT_TOPIC, /* options */ + NULL, /* user_splits, initialized in nullprpl_init() */ + NULL, /* protocol_options, initialized in nullprpl_init() */ + { /* icon_spec, a PurpleBuddyIconSpec */ + "png,jpg,gif", /* format */ + 0, /* min_width */ + 0, /* min_height */ + 128, /* max_width */ + 128, /* max_height */ + 10000, /* max_filesize */ + PURPLE_ICON_SCALE_DISPLAY, /* scale_rules */ + }, + nullprpl_list_icon, /* list_icon */ + nullprpl_list_emblem, /* list_emblem */ + nullprpl_status_text, /* status_text */ + nullprpl_tooltip_text, /* tooltip_text */ + nullprpl_status_types, /* status_types */ + nullprpl_blist_node_menu, /* blist_node_menu */ + nullprpl_chat_info, /* chat_info */ + nullprpl_chat_info_defaults, /* chat_info_defaults */ + nullprpl_login, /* login */ + nullprpl_close, /* close */ + nullprpl_send_im, /* send_im */ + nullprpl_set_info, /* set_info */ + nullprpl_send_typing, /* send_typing */ + nullprpl_get_info, /* get_info */ + nullprpl_set_status, /* set_status */ + nullprpl_set_idle, /* set_idle */ + nullprpl_change_passwd, /* change_passwd */ + nullprpl_add_buddy, /* add_buddy */ + nullprpl_add_buddies, /* add_buddies */ + nullprpl_remove_buddy, /* remove_buddy */ + nullprpl_remove_buddies, /* remove_buddies */ + nullprpl_add_permit, /* add_permit */ + nullprpl_add_deny, /* add_deny */ + nullprpl_rem_permit, /* rem_permit */ + nullprpl_rem_deny, /* rem_deny */ + nullprpl_set_permit_deny, /* set_permit_deny */ + nullprpl_join_chat, /* join_chat */ + nullprpl_reject_chat, /* reject_chat */ + nullprpl_get_chat_name, /* get_chat_name */ + nullprpl_chat_invite, /* chat_invite */ + nullprpl_chat_leave, /* chat_leave */ + nullprpl_chat_whisper, /* chat_whisper */ + nullprpl_chat_send, /* chat_send */ + NULL, /* keepalive */ + nullprpl_register_user, /* register_user */ + nullprpl_get_cb_info, /* get_cb_info */ + NULL, /* get_cb_away */ + nullprpl_alias_buddy, /* alias_buddy */ + nullprpl_group_buddy, /* group_buddy */ + nullprpl_rename_group, /* rename_group */ + NULL, /* buddy_free */ + nullprpl_convo_closed, /* convo_closed */ + nullprpl_normalize, /* normalize */ + nullprpl_set_buddy_icon, /* set_buddy_icon */ + nullprpl_remove_group, /* remove_group */ + NULL, /* get_cb_real_name */ + nullprpl_set_chat_topic, /* set_chat_topic */ + NULL, /* find_blist_chat */ + nullprpl_roomlist_get_list, /* roomlist_get_list */ + nullprpl_roomlist_cancel, /* roomlist_cancel */ + nullprpl_roomlist_expand_category, /* roomlist_expand_category */ + nullprpl_can_receive_file, /* can_receive_file */ + NULL, /* send_file */ + NULL, /* new_xfer */ + nullprpl_offline_message, /* offline_message */ + NULL, /* whiteboard_prpl_ops */ + NULL, /* send_raw */ + NULL, /* roomlist_room_serialize */ + NULL, /* padding... */ + NULL, + NULL, + NULL, +}; + +static void nullprpl_init(PurplePlugin *plugin) +{ + /* see accountopt.h for information about user splits and protocol options */ + PurpleAccountUserSplit *split = purple_account_user_split_new( + _("Example user split (unused)"), /* text shown to user */ + "default", /* default value */ + '@'); /* field separator */ + PurpleAccountOption *option = purple_account_option_string_new( + _("Example option (unused)"), /* text shown to user */ + "example", /* pref name */ + "default"); /* default value */ + + purple_debug_info("nullprpl", "starting up\n"); + + prpl_info.user_splits = g_list_append(NULL, split); + prpl_info.protocol_options = g_list_append(NULL, option); + + /* register whisper chat command, /msg */ + purple_cmd_register("msg", + "ws", /* args: recipient and message */ + PURPLE_CMD_P_DEFAULT, /* priority */ + PURPLE_CMD_FLAG_CHAT, + "prpl-null", + send_whisper, + "msg <username> <message>: send a private message, aka a whisper", + NULL); /* userdata */ + + /* get ready to store offline messages */ + goffline_messages = g_hash_table_new_full(g_str_hash, /* hash fn */ + g_str_equal, /* key comparison fn */ + g_free, /* key free fn */ + NULL); /* value free fn */ + + _null_protocol = plugin; +} + +static void nullprpl_destroy(PurplePlugin *plugin) { + purple_debug_info("nullprpl", "shutting down\n"); +} + + +static PurplePluginInfo info = +{ + PURPLE_PLUGIN_MAGIC, /* magic */ + PURPLE_MAJOR_VERSION, /* major_version */ + PURPLE_MINOR_VERSION, /* minor_version */ + PURPLE_PLUGIN_PROTOCOL, /* type */ + NULL, /* ui_requirement */ + 0, /* flags */ + NULL, /* dependencies */ + PURPLE_PRIORITY_DEFAULT, /* priority */ + NULLPRPL_ID, /* id */ + "Nullprpl", /* name */ + "0.3", /* version */ + "Null Protocol Plugin", /* summary */ + "Null Protocol Plugin", /* description */ + "Ryan Barrett <nullprpl@ryanb.org>", /* author */ + "http://snarfed.org/space/pidgin+null+protocol+plugin", /* homepage */ + NULL, /* load */ + NULL, /* unload */ + nullprpl_destroy, /* destroy */ + NULL, /* ui_info */ + &prpl_info, /* extra_info */ + NULL, /* prefs_info */ + nullprpl_actions, /* actions */ + NULL, /* padding... */ + NULL, + NULL, + NULL, +}; + +PURPLE_INIT_PLUGIN(null, nullprpl_init, info);
--- a/libpurple/protocols/silc/silc.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Wed May 30 21:05:04 2007 +0000 @@ -391,7 +391,7 @@ /* Send QUIT */ silc_client_command_call(sg->client, sg->conn, NULL, - "QUIT", "Download Purple: " PURPLE_WEBSITE, NULL); + "QUIT", "Download this: " PURPLE_WEBSITE, NULL); if (sg->conn) silc_client_close_connection(sg->client, sg->conn); @@ -1552,7 +1552,7 @@ return PURPLE_CMD_RET_FAILED; silc_client_command_call(sg->client, sg->conn, NULL, - "QUIT", (args && args[0]) ? args[0] : "Download Purple: " PURPLE_WEBSITE, NULL); + "QUIT", (args && args[0]) ? args[0] : "Download this: " PURPLE_WEBSITE, NULL); return PURPLE_CMD_RET_OK; }
--- a/libpurple/protocols/zephyr/zephyr.h Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/protocols/zephyr/zephyr.h Wed May 30 21:05:04 2007 +0000 @@ -109,7 +109,7 @@ ZChecksum_t z_checksum; int z_num_other_fields; char *z_other_fields[Z_MAXOTHERFIELDS]; - void *z_message; + caddr_t z_message; int z_message_len; } ZNotice_t;
--- a/libpurple/proxy.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/proxy.c Wed May 30 21:05:04 2007 +0000 @@ -1059,6 +1059,22 @@ } } +static gboolean +s5_ensure_buffer_length(PurpleProxyConnectData *connect_data, int len) +{ + if(connect_data->read_len < len) { + if(connect_data->read_buf_len < len) { + /* it's not just that we haven't read enough, it's that we haven't tried to read enough yet */ + purple_debug_info("s5", "reallocing from %d to %d\n", connect_data->read_buf_len, len); + connect_data->read_buf_len = len; + connect_data->read_buffer = g_realloc(connect_data->read_buffer, connect_data->read_buf_len); + } + return FALSE; + } + + return TRUE; +} + static void s5_canread_again(gpointer data, gint source, PurpleInputCondition cond) { @@ -1067,7 +1083,7 @@ int len; if (connect_data->read_buffer == NULL) { - connect_data->read_buf_len = 512; + connect_data->read_buf_len = 4; connect_data->read_buffer = g_malloc(connect_data->read_buf_len); connect_data->read_len = 0; } @@ -1075,8 +1091,6 @@ dest = connect_data->read_buffer + connect_data->read_len; buf = connect_data->read_buffer; - purple_debug_info("socks5 proxy", "Able to read again.\n"); - len = read(connect_data->fd, dest, (connect_data->read_buf_len - connect_data->read_len)); if (len == 0) @@ -1119,33 +1133,31 @@ /* Skip past BND.ADDR */ switch(buf[3]) { case 0x01: /* the address is a version-4 IP address, with a length of 4 octets */ - if(connect_data->read_len < 4 + 4) + if(!s5_ensure_buffer_length(connect_data, 4 + 4)) return; buf += 4 + 4; break; case 0x03: /* the address field contains a fully-qualified domain name. The first octet of the address field contains the number of octets of name that follow, there is no terminating NUL octet. */ - if(connect_data->read_len < 4 + 1) + if(!s5_ensure_buffer_length(connect_data, 4 + 1)) return; - buf += 4 + 1; - if(connect_data->read_len < 4 + 1 + buf[0]) + buf += 4; + if(!s5_ensure_buffer_length(connect_data, 4 + 1 + buf[0])) return; - buf += buf[0]; + buf += buf[0] + 1; break; case 0x04: /* the address is a version-6 IP address, with a length of 16 octets */ - if(connect_data->read_len < 4 + 16) + if(!s5_ensure_buffer_length(connect_data, 4 + 16)) return; buf += 4 + 16; break; } - if(connect_data->read_len < (buf - connect_data->read_buffer) + 2) + /* Skip past BND.PORT */ + if(!s5_ensure_buffer_length(connect_data, (buf - connect_data->read_buffer) + 2)) return; - /* Skip past BND.PORT */ - buf += 2; - purple_proxy_connect_data_connected(connect_data); }
--- a/libpurple/purple-client.c Tue May 29 22:44:59 2007 +0000 +++ b/libpurple/purple-client.c Wed May 30 21:05:04 2007 +0000 @@ -5,7 +5,7 @@ #include <stdlib.h> #include "dbus-purple.h" -#include "purple-client-bindings.h" +#include "purple-client.h" static DBusGConnection *bus; static DBusGProxy *purple_proxy;
--- a/pidgin/Makefile.mingw Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/Makefile.mingw Wed May 30 21:05:04 2007 +0000 @@ -106,26 +106,21 @@ ## ## LIBRARIES ## -LIBPURPLES = \ - -lpurple \ - -lglib-2.0 \ - -lgthread-2.0 \ - -lgobject-2.0 \ - -lgmodule-2.0 \ + +PIDGIN_LIBS = \ -lintl \ - -lws2_32 \ - -lwinmm \ - -lz - -GTKPURPLES = \ - $(LIBPURPLES) \ + -lglib-2.0 \ + -lgobject-2.0 \ + -lpurple \ + -lz \ -lidletrack \ -lgtk-win32-2.0 \ -latk-1.0 \ -lpango-1.0 \ -lgdk-win32-2.0 \ -lgdk_pixbuf-2.0 \ - -lgdi32 + -lgdi32 \ + -lwinmm include $(PIDGIN_COMMON_RULES) @@ -159,7 +154,7 @@ $(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H) $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS) - $(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(GTKPURPLES) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll + $(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll $(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS) $(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
--- a/pidgin/gtkprefs.c Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/gtkprefs.c Wed May 30 21:05:04 2007 +0000 @@ -392,7 +392,7 @@ new_theme = current_smiley_theme; description = g_strdup_printf("<span size='larger' weight='bold'>%s</span> - %s\n" "<span size='smaller' foreground='white'>%s</span>", - new_theme->name, new_theme->author, new_theme->desc); + _(new_theme->name), _(new_theme->author), _(new_theme->desc)); gtk_list_store_set(smiley_theme_store, &iter, 1, description, -1); g_free(description); @@ -401,7 +401,7 @@ if (gtk_tree_model_get_iter(model, &iter, oldpath)) { description = g_strdup_printf("<span size='larger' weight='bold'>%s</span> - %s\n" "<span size='smaller' foreground='dim grey'>%s</span>", - old_theme->name, old_theme->author, old_theme->desc); + _(old_theme->name), _(old_theme->author), _(old_theme->desc)); gtk_list_store_set(smiley_theme_store, &iter, 1, description, -1); g_free(description); @@ -436,7 +436,7 @@ struct smiley_theme *theme = themes->data; char *description = g_strdup_printf("<span size='larger' weight='bold'>%s</span> - %s\n" "<span size='smaller' foreground='dim grey'>%s</span>", - theme->name, theme->author, theme->desc); + _(theme->name), _(theme->author), _(theme->desc)); gtk_list_store_append (smiley_theme_store, &iter); /*
--- a/pidgin/gtkthemes.c Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/gtkthemes.c Wed May 30 21:05:04 2007 +0000 @@ -186,7 +186,7 @@ } else if (!g_ascii_strncasecmp(i, "Name=", strlen("Name="))) { int len; g_free(theme->name); - theme->name = g_strdup(i+ strlen("Name=")); + theme->name = g_strdup(i + strlen("Name=")); len = strlen(theme->name); theme->name[len-1] = 0; if(len > 2 && theme->name[len-2] == '\r')
--- a/pidgin/pixmaps/emotes/default/22/Makefile.am Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.am Wed May 30 21:05:04 2007 +0000 @@ -173,8 +173,15 @@ yin-yang.png pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/default +pidginsmileypix_in_files = default.theme.in pidginsmileypix_DATA = \ $(SMILEYS) \ theme -EXTRA_DIST = $(pidginsmileypix_DATA) +theme: default.theme.in + sed -e 's/^_Name=/Name=/' \ + -e 's/^_Description=/Description=/' \ + -e 's/^_Author=/Author=/' \ + $< > $@ + +EXTRA_DIST = $(pidginsmileypix_DATA) $(pidginsmileypix_in_files)
--- a/pidgin/pixmaps/emotes/default/22/Makefile.mingw Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.mingw Wed May 30 21:05:04 2007 +0000 @@ -10,11 +10,13 @@ datadir = $(PIDGIN_INSTALL_DIR) include ./Makefile.am -.PHONY: install +.PHONY: install clean -install: +install: theme if test '$(pidginsmileypix_DATA)'; then \ mkdir -p $(pidginsmileypixdir); \ cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \ fi; +clean: + rm -f theme
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/default.theme.in Wed May 30 21:05:04 2007 +0000 @@ -0,0 +1,357 @@ +_Name=Default +_Description=Pidgin smileys +Icon=smile.png +Author=Hylke Bons + +# default smileys +[default] +smile.png :) :-) +smile-big.png :-D :-d :D :d +sad.png :-( :( +wink.png ;-) ;) +tongue.png :P :-P :-p :p +shock.png =-O =-o +kiss.png :-* +glasses-cool.png 8-) +embarrassed.png :-[ +crying.png :'( +thinking.png :-/ :-\\ +angel.png O:-) o:-) +shut-mouth.png :-X +moneymouth.png :-$ +foot-in-mouth.png :-! +shout.png >:o >:O +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) + +### Following AIM 6.1 +[AIM] +smile.png :-) :) +wink.png ;-) ;) +sad.png :-( :( +tongue.png :-P :P +shock.png =-O +kiss.png :-* +shout.png >:o +smile-big.png :-D :D +moneymouth.png :-$ +foot-in-mouth.png :-! +embarrassed.png :-[ +angel.png O:-) +thinking.png :-\\ :-/ +crying.png :'( +shut-mouth.png :-X +glasses-cool.png 8-) +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) + +### Following Windows Live Messenger 8.1 +[MSN] +smile.png :) :-) +smile-big.png :D :d :-D :-d +wink.png ;) ;-) +shock.png :-O :-o :O :o +tongue.png :P :p :-P :-p +glasses-cool.png (H) (h) +angry.png :@ :-@ +embarrassed.png :$ :-$ +confused.png :S :s :-S :-s +sad.png :( :-( +crying.png :'( +neutral.png :| :-| +devil.png (6) +angel.png (A) (a) +love.png (L) (l) +love-over.png (U) (u) +msn.png (M) (m) +cat.png (@) +dog.png (&) +moon.png (S) +star.png (*) +film.png (~) +musical-note.png (8) +mail.png (E) (e) +rose.png (F) (f) +rose-dead.png (W) (w) +clock.png (O) (o) +kiss.png (K) (k) +present.png (G) (g) +cake.png (^) +camera.png (P) (p) +lamp.png (I) (i) +coffee.png (C) (c) +phone.png (T) (t) +hug-left.png ({) +hug-right.png (}) +beer.png (B) (b) +drink.png (D) (d) +boy.png (Z) (z) +girl.png (X) (x) +good.png (Y) (y) +bad.png (N) (n) +vampire.png :[ :-[ +goat.png (nah) +sun.png (#) +rainbow.png (R) (r) +quiet.png :-# +teeth.png 8o| +glasses-nerdy.png 8-| +sarcastic.png ^o) +secret.png :-* +sick.png +o( +snail.png (sn) +turtle.png (tu) +plate.png (pl) +bowl.png (||) +pizza.png (pi) +soccerball.png (so) +car.png (au) +airplane.png (ap) +umbrella.png (um) +island.png (ip) +computer.png (co) +mobile.png (mp) +brb.png (brb) +rain.png (st) +highfive.png (h5) +coins.png (mo) +sheep.png (bah) +dont-know.png :^) +thinking.png *-) +thunder.png (li) +party.png <:o) +eyeroll.png 8-) +yawn.png |-) +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) + +### Hidden MSN emotes +sigarette.png (ci) (CI) +handcuffs.png (%) +console.png (xx) (XX) +fingers-crossed.png (yn) (YN) + +### Following QQ 2006 +[QQ] +shock.png /惊讶 /:O /jy /surprised +curl-lip.png /撇嘴 /:~ /pz /curl_lip +desire.png /色 /:* /se /desire +dazed.png /发呆 /:| /dazed +party.png /得意 /8-) /dy /revel +crying.png /流泪 /:< /ll /cry +bashful.png /害羞 /:$ /hx /bashful +shut-mouth.png /闭嘴 /:X /bz /shut_mouth +sleepy.png /睡 /:Z /shui /sleep +weep.png /大哭 /:'( /dk /weep +embarrassed.png /尴尬 /:-| /gg /embarassed +pissed-off.png /发怒 /:@ /fn /pissed_off +act-up.png /调皮 /:P /tp /act_up +smile-big.png /呲牙 /:D /cy /toothy_smile +smile.png /微笑 /:) /wx /small_smile +sad.png /难过 /:( /ng /sad +glasses-cool.png /酷 /:+ /kuk /cool +doctor.png /非典 /:# /feid /SARS +silly.png /抓狂 /:Q /zk /crazy +sick.png /吐 /:T /tu /vomit +snicker.png /偷笑 /;p /tx /titter +cute.png /可爱 /;-D /ka /cute +disdain.png /白眼 /;d /by /disdain +arrogant.png /傲慢 /;o /am /arrogant +starving.png /饥饿 /:g /jie /starving +yawn.png /困 /|-) /kun /sleepy +terror.png /惊恐 /:! /jk /terror +sweat.png /流汗 /:L /sweat +smirk.png /憨笑 /:> /hanx /smirk +soldier.png /大兵 /:; /db /soldier +struggle.png /奋斗 /;f /fendou /struggle +curse.png /咒骂 /:-S /zhm /curse +question.png /疑问 /? /yiw /question +quiet.png /嘘... /;x /xu /shh +hypnotized.png /晕 /;@ /yun /dizzy +excruciating.png /折磨 /:8 /zhem /excrutiating +freaked-out.png /衰 /;! /shuai /freaked_out +skeleton.png /骷髅 /!!! /kl /skeleton +hammer.png /敲打 /xx /qiao /hammer +bye.png /再见 /bye /zj /bye +go-away.png /闪人 /go /shan /go +tremble.png /发抖 /shake /fad /shake +in-love.png /爱情 /love /aiq /love +jump.png /跳 /jump /tiao /jump +search.png /找 /find /zhao /search +lashes.png /美眉 /& /mm /beautiful_eyebrows +pig.png /猪头 /pig /zt /pig +cat.png /猫咪 /cat /mm /cat +dog.png /小狗 /dog /xg /dog +hug-left.png /拥抱 /hug /yb /hug +coins.png /钱 /$ /qianc /money +lamp.png /灯泡 /! /dp /lightbulb +bowl.png /酒杯 /cup /bei /cup +cake.png /蛋糕 /cake /dg /cake +thunder.png /闪电 /li /shd /lightning +bomb.png /炸弹 /bome /zhd /bomb +knife.png /刀 /kn /dao /knife +soccerball.png /足球 /footb /zq /soccer +musical-note.png /音乐 /music /yy /music +poop.png /便便 /shit /bb /shit +coffee.png /咖啡 /coffee /kf /coffee +eat.png /饭 /eat /fan /eat +pill.png /药丸 /pill /yw /pill +rose.png /玫瑰 /rose /mg /rose +wilt.png /凋谢 /fade /dx /wilt +kiss.png /吻 /kiss /wen /kiss +love.png /爱心 /heart /xin /heart +love-over.png /心碎 /break /xs /broken_heart +meeting.png /会议 /meeting /hy /meeting +present.png /礼物 /gift /lw /gift +phone.png /电话 /phone /dh /phone +clock.png /时间 /time /sj /time +mail.png /邮件 /email /yj /email +tv.png /电视 /TV /ds /TV +sun.png /太阳 /sun /ty /sun +moon.png /月亮 /moon /yl /moon +good.png /强 /strong /qiang /thumbs_up +bad.png /弱 /weak /ruo /thumbs_down +handshake.png /握手 /share /ws /handshake +victory.png /胜利 /v /shl /victory +beauty.png /美女 /<J> /mn /beauty +qq.png /Q仔 /<QQ> /qz /qq +blowkiss.png /飞吻 /<L> /fw /blow_kiss +angry.png /怄火 /<O> /oh /angry +liquor.png /白酒 /<B> /bj /baijiu +can.png /汽水 /<U> /qsh /soda +watermelon.png /西瓜 /<W> /xigua /watermelon +rain.png /下雨 /<!!> /xy /rain +cloudy.png /多云 /<~> /duoy /cloudy +snowman.png /雪人 /<Z> /xr /snowman +star.png /星星 /<*> /xixing /star +girl.png /女 /<00> /nv /woman +boy.png /男 /<11> /nan /man +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) + +### Following ICQ 5.1 +[ICQ] +smile.png :-) :) +sad.png :-( :( +wink.png ;-) ;) +tongue.png :-P :P +laugh.png *JOKINGLY* +crying.png :'( +#*KISSED* +kiss.png :-* +embarrassed.png :-[ +angel.png O:-) +shut-mouth.png :-X :X +thinking.png :-\\ :-/ +shout.png >:o >:O +smile-big.png :-D :D +moneymouth.png :-$ +shock.png =-O +glasses-cool.png 8-) +#[:-} +sleepy.png *TIRED* +sick.png :-! +#*STOP* +#*KISSING* +devil.png ]:-> +rose.png @}->-- +bomb.png @= +good.png *THUMBS\ UP* +beer.png *DRINK* +in-love.png *IN\ LOVE* +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) + +### Following Yahoo! Messenger 8.1 +[Yahoo] +smile.png :) :-) +question.png :-/ :-\\ +shock.png :-O :O :-o :o +devil.png >:) +angel.png O:-) o:-) 0:-) +sick.png :-& +yawn.png (:| +hypnotized.png @-) +#on_the_phone :)] MISSING: "Wait,I'm phoning!" (not phone.png) => smily showing phone and hand ("stop") +sad.png :( :-( +in-love.png :x :-x :X :-X +angry.png X-( x-( X( x( +crying.png :(( +glasses-nerdy.png :-B :-b +quiet.png :-$ +drool.png =P~ =p~ +lying.png :^O :^o +call-me.png :-c +wink.png ;) ;-) +embarrassed.png :"> +mean.png :-> :> +laugh.png :)) :-)) +bye.png =; +arrogant.png [-( +thinking.png :-? +waiting.png :-w :-W +#at_wits_end ~x( ~X( MISSING: "Why.Does.This.Not.Work.AAAAARGH!!" => angry smily shouting and pulling hair off +smile-big.png :D :-D :d :-d +tongue.png :-P :P :-p :p +glasses-cool.png B-) b-) +neutral.png :| :-| +sleepy.png I-) i-) |-) +clown.png :o) :O) +doh.png #-o #-O +weep.png :-< +go-away.png :-h +lashes.png ;;) +kiss.png :-* :* +confused.png :-S :-s +sarcastic.png /:) +eyeroll.png 8-| +silly.png 8-} +clap.png =D> =d> +mad-tongue.png >:P >:p +#timeout :-t :-T MISSING: "Let's have a break." +hug-left.png >:D< >:d< +love-over.png =(( +sweat.png #:-S #:-s +rotfl.png =)) +#loser L-) l-) MISSING/YAHOO 6: "Loser!" +party.png <:-P <:-p +nailbiting.png :-SS :-Ss :-sS :-ss +cowboy.png <):) +desire.png 8-> +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) + +### Hidden Yahoo emotes +alien.png =:) >-) +beat-up.png b-( B-( +chicken.png ~:> +coffee.png ~o) ~O) +cow.png 3:-O 3:-o +dance.png \\:D/ \\:d/ +rose.png @};- +dont-know.png :-L :-l +skeleton.png 8-X 8-x +lamp.png *-:) +monkey.png :(|) +coins.png $-) +peace.png :)>- +pig.png :@) +pray.png [-o< [-O< +pumpkin.png (~~) +shame.png [-X [-x +flag.png **== +clover.png %%- +musical-note.png :-" +giggle.png ;)) +worship.png ^:)^ +star.png (*) +#waving.png >:/ +#talktohand.png :-@ +#youkiddingme.png :-j :-J + +### These only work in a certain IMvironment +#malefighter1.png o-> O-> +#malefighter2.png o=> O=> +#femalefighter.png o-+ O-+ +yin-yang.png (%) +
--- a/pidgin/pixmaps/emotes/default/22/theme Tue May 29 22:44:59 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,357 +0,0 @@ -Name=Default -Description=Pidgin smileys -Icon=smile.png -Author=Hylke Bons - -# default smileys -[default] -smile.png :) :-) -smile-big.png :-D :-d :D :d -sad.png :-( :( -wink.png ;-) ;) -tongue.png :P :-P :-p :p -shock.png =-O =-o -kiss.png :-* -glasses-cool.png 8-) -embarrassed.png :-[ -crying.png :'( -thinking.png :-/ :-\\ -angel.png O:-) o:-) -shut-mouth.png :-X -moneymouth.png :-$ -foot-in-mouth.png :-! -shout.png >:o >:O -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) - -### Following AIM 6.1 -[AIM] -smile.png :-) :) -wink.png ;-) ;) -sad.png :-( :( -tongue.png :-P :P -shock.png =-O -kiss.png :-* -shout.png >:o -smile-big.png :-D :D -moneymouth.png :-$ -foot-in-mouth.png :-! -embarrassed.png :-[ -angel.png O:-) -thinking.png :-\\ :-/ -crying.png :'( -shut-mouth.png :-X -glasses-cool.png 8-) -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) - -### Following Windows Live Messenger 8.1 -[MSN] -smile.png :) :-) -smile-big.png :D :d :-D :-d -wink.png ;) ;-) -shock.png :-O :-o :O :o -tongue.png :P :p :-P :-p -glasses-cool.png (H) (h) -angry.png :@ :-@ -embarrassed.png :$ :-$ -confused.png :S :s :-S :-s -sad.png :( :-( -crying.png :'( -neutral.png :| :-| -devil.png (6) -angel.png (A) (a) -love.png (L) (l) -love-over.png (U) (u) -msn.png (M) (m) -cat.png (@) -dog.png (&) -moon.png (S) -star.png (*) -film.png (~) -musical-note.png (8) -mail.png (E) (e) -rose.png (F) (f) -rose-dead.png (W) (w) -clock.png (O) (o) -kiss.png (K) (k) -present.png (G) (g) -cake.png (^) -camera.png (P) (p) -lamp.png (I) (i) -coffee.png (C) (c) -phone.png (T) (t) -hug-left.png ({) -hug-right.png (}) -beer.png (B) (b) -drink.png (D) (d) -boy.png (Z) (z) -girl.png (X) (x) -good.png (Y) (y) -bad.png (N) (n) -vampire.png :[ :-[ -goat.png (nah) -sun.png (#) -rainbow.png (R) (r) -quiet.png :-# -teeth.png 8o| -glasses-nerdy.png 8-| -sarcastic.png ^o) -secret.png :-* -sick.png +o( -snail.png (sn) -turtle.png (tu) -plate.png (pl) -bowl.png (||) -pizza.png (pi) -soccerball.png (so) -car.png (au) -airplane.png (ap) -umbrella.png (um) -island.png (ip) -computer.png (co) -mobile.png (mp) -brb.png (brb) -rain.png (st) -highfive.png (h5) -coins.png (mo) -sheep.png (bah) -dont-know.png :^) -thinking.png *-) -thunder.png (li) -party.png <:o) -eyeroll.png 8-) -yawn.png |-) -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) - -### Hidden MSN emotes -sigarette.png (ci) (CI) -handcuffs.png (%) -console.png (xx) (XX) -fingers-crossed.png (yn) (YN) - -### Following QQ 2006 -[QQ] -shock.png /惊讶 /:O /jy /surprised -curl-lip.png /撇嘴 /:~ /pz /curl_lip -desire.png /色 /:* /se /desire -dazed.png /发呆 /:| /dazed -party.png /得意 /8-) /dy /revel -crying.png /流泪 /:< /ll /cry -bashful.png /害羞 /:$ /hx /bashful -shut-mouth.png /闭嘴 /:X /bz /shut_mouth -sleepy.png /睡 /:Z /shui /sleep -weep.png /大哭 /:'( /dk /weep -embarrassed.png /尴尬 /:-| /gg /embarassed -pissed-off.png /发怒 /:@ /fn /pissed_off -act-up.png /调皮 /:P /tp /act_up -smile-big.png /呲牙 /:D /cy /toothy_smile -smile.png /微笑 /:) /wx /small_smile -sad.png /难过 /:( /ng /sad -glasses-cool.png /酷 /:+ /kuk /cool -doctor.png /非典 /:# /feid /SARS -silly.png /抓狂 /:Q /zk /crazy -sick.png /吐 /:T /tu /vomit -snicker.png /偷笑 /;p /tx /titter -cute.png /可爱 /;-D /ka /cute -disdain.png /白眼 /;d /by /disdain -arrogant.png /傲慢 /;o /am /arrogant -starving.png /饥饿 /:g /jie /starving -yawn.png /困 /|-) /kun /sleepy -terror.png /惊恐 /:! /jk /terror -sweat.png /流汗 /:L /sweat -smirk.png /憨笑 /:> /hanx /smirk -soldier.png /大兵 /:; /db /soldier -struggle.png /奋斗 /;f /fendou /struggle -curse.png /咒骂 /:-S /zhm /curse -question.png /疑问 /? /yiw /question -quiet.png /嘘... /;x /xu /shh -hypnotized.png /晕 /;@ /yun /dizzy -excruciating.png /折磨 /:8 /zhem /excrutiating -freaked-out.png /衰 /;! /shuai /freaked_out -skeleton.png /骷髅 /!!! /kl /skeleton -hammer.png /敲打 /xx /qiao /hammer -bye.png /再见 /bye /zj /bye -go-away.png /闪人 /go /shan /go -tremble.png /发抖 /shake /fad /shake -in-love.png /爱情 /love /aiq /love -jump.png /跳 /jump /tiao /jump -search.png /找 /find /zhao /search -lashes.png /美眉 /& /mm /beautiful_eyebrows -pig.png /猪头 /pig /zt /pig -cat.png /猫咪 /cat /mm /cat -dog.png /小狗 /dog /xg /dog -hug-left.png /拥抱 /hug /yb /hug -coins.png /钱 /$ /qianc /money -lamp.png /灯泡 /! /dp /lightbulb -bowl.png /酒杯 /cup /bei /cup -cake.png /蛋糕 /cake /dg /cake -thunder.png /闪电 /li /shd /lightning -bomb.png /炸弹 /bome /zhd /bomb -knife.png /刀 /kn /dao /knife -soccerball.png /足球 /footb /zq /soccer -musical-note.png /音乐 /music /yy /music -poop.png /便便 /shit /bb /shit -coffee.png /咖啡 /coffee /kf /coffee -eat.png /饭 /eat /fan /eat -pill.png /药丸 /pill /yw /pill -rose.png /玫瑰 /rose /mg /rose -wilt.png /凋谢 /fade /dx /wilt -kiss.png /吻 /kiss /wen /kiss -love.png /爱心 /heart /xin /heart -love-over.png /心碎 /break /xs /broken_heart -meeting.png /会议 /meeting /hy /meeting -present.png /礼物 /gift /lw /gift -phone.png /电话 /phone /dh /phone -clock.png /时间 /time /sj /time -mail.png /邮件 /email /yj /email -tv.png /电视 /TV /ds /TV -sun.png /太阳 /sun /ty /sun -moon.png /月亮 /moon /yl /moon -good.png /强 /strong /qiang /thumbs_up -bad.png /弱 /weak /ruo /thumbs_down -handshake.png /握手 /share /ws /handshake -victory.png /胜利 /v /shl /victory -beauty.png /美女 /<J> /mn /beauty -qq.png /Q仔 /<QQ> /qz /qq -blowkiss.png /飞吻 /<L> /fw /blow_kiss -angry.png /怄火 /<O> /oh /angry -liquor.png /白酒 /<B> /bj /baijiu -can.png /汽水 /<U> /qsh /soda -watermelon.png /西瓜 /<W> /xigua /watermelon -rain.png /下雨 /<!!> /xy /rain -cloudy.png /多云 /<~> /duoy /cloudy -snowman.png /雪人 /<Z> /xr /snowman -star.png /星星 /<*> /xixing /star -girl.png /女 /<00> /nv /woman -boy.png /男 /<11> /nan /man -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) - -### Following ICQ 5.1 -[ICQ] -smile.png :-) :) -sad.png :-( :( -wink.png ;-) ;) -tongue.png :-P :P -laugh.png *JOKINGLY* -crying.png :'( -#*KISSED* -kiss.png :-* -embarrassed.png :-[ -angel.png O:-) -shut-mouth.png :-X :X -thinking.png :-\\ :-/ -shout.png >:o >:O -smile-big.png :-D :D -moneymouth.png :-$ -shock.png =-O -glasses-cool.png 8-) -#[:-} -sleepy.png *TIRED* -sick.png :-! -#*STOP* -#*KISSING* -devil.png ]:-> -rose.png @}->-- -bomb.png @= -good.png *THUMBS\ UP* -beer.png *DRINK* -in-love.png *IN\ LOVE* -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) - -### Following Yahoo! Messenger 8.1 -[Yahoo] -smile.png :) :-) -question.png :-/ :-\\ -shock.png :-O :O :-o :o -devil.png >:) -angel.png O:-) o:-) 0:-) -sick.png :-& -yawn.png (:| -hypnotized.png @-) -#on_the_phone :)] MISSING: "Wait,I'm phoning!" (not phone.png) => smily showing phone and hand ("stop") -sad.png :( :-( -in-love.png :x :-x :X :-X -angry.png X-( x-( X( x( -crying.png :(( -glasses-nerdy.png :-B :-b -quiet.png :-$ -drool.png =P~ =p~ -lying.png :^O :^o -call-me.png :-c -wink.png ;) ;-) -embarrassed.png :"> -mean.png :-> :> -laugh.png :)) :-)) -bye.png =; -arrogant.png [-( -thinking.png :-? -waiting.png :-w :-W -#at_wits_end ~x( ~X( MISSING: "Why.Does.This.Not.Work.AAAAARGH!!" => angry smily shouting and pulling hair off -smile-big.png :D :-D :d :-d -tongue.png :-P :P :-p :p -glasses-cool.png B-) b-) -neutral.png :| :-| -sleepy.png I-) i-) |-) -clown.png :o) :O) -doh.png #-o #-O -weep.png :-< -go-away.png :-h -lashes.png ;;) -kiss.png :-* :* -confused.png :-S :-s -sarcastic.png /:) -eyeroll.png 8-| -silly.png 8-} -clap.png =D> =d> -mad-tongue.png >:P >:p -#timeout :-t :-T MISSING: "Let's have a break." -hug-left.png >:D< >:d< -love-over.png =(( -sweat.png #:-S #:-s -rotfl.png =)) -#loser L-) l-) MISSING/YAHOO 6: "Loser!" -party.png <:-P <:-p -nailbiting.png :-SS :-Ss :-sS :-ss -cowboy.png <):) -desire.png 8-> -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) - -### Hidden Yahoo emotes -alien.png =:) >-) -beat-up.png b-( B-( -chicken.png ~:> -coffee.png ~o) ~O) -cow.png 3:-O 3:-o -dance.png \\:D/ \\:d/ -rose.png @};- -dont-know.png :-L :-l -skeleton.png 8-X 8-x -lamp.png *-:) -monkey.png :(|) -coins.png $-) -peace.png :)>- -pig.png :@) -pray.png [-o< [-O< -pumpkin.png (~~) -shame.png [-X [-x -flag.png **== -clover.png %%- -musical-note.png :-" -giggle.png ;)) -worship.png ^:)^ -star.png (*) -#waving.png >:/ -#talktohand.png :-@ -#youkiddingme.png :-j :-J - -### These only work in a certain IMvironment -#malefighter1.png o-> O-> -#malefighter2.png o=> O=> -#femalefighter.png o-+ O-+ -yin-yang.png (%) -
--- a/pidgin/pixmaps/emotes/none/Makefile.am Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/none/Makefile.am Wed May 30 21:05:04 2007 +0000 @@ -1,5 +1,13 @@ pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/none +pidginsmileypix_in_files = none.theme.in pidginsmileypix_DATA = theme +theme: none.theme.in + sed -e 's/^_Name=/Name=/' \ + -e 's/^_Description=/Description=/' \ + -e 's/^_Author=/Author=/' \ + $< > $@ + EXTRA_DIST = $(pidginsmileypix_DATA) \ + $(pidginsmileypix_in_files) \ Makefile.mingw
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/none/Makefile.mingw Wed May 30 21:05:04 2007 +0000 @@ -10,11 +10,14 @@ datadir = $(PIDGIN_INSTALL_DIR) include ./Makefile.am -.PHONY: install +.PHONY: install clean -install: +install: theme if test '$(pidginsmileypix_DATA)'; then \ mkdir -p $(pidginsmileypixdir); \ cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \ fi; +clean: + rm -f theme +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/none/none.theme.in Wed May 30 21:05:04 2007 +0000 @@ -0,0 +1,3 @@ +_Name=none +_Description=Selecting this disables graphical emoticons. +_Author=Penguin Pimps
--- a/pidgin/pixmaps/emotes/none/theme Tue May 29 22:44:59 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -Name=none -Description=Selecting this disables graphical emoticons. -Author=Penguin Pimps
--- a/pidgin/win32/nsis/pidgin-installer.nsi Tue May 29 22:44:59 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed May 30 21:05:04 2007 +0000 @@ -2,7 +2,7 @@ ; Original Author: Herman Bloggs <hermanator12002@yahoo.com> ; Updated By: Daniel Atallah <daniel_atallah@yahoo.com> -; NOTE: this .NSI script is intended for NSIS 2.08 +; NOTE: this .NSI script is intended for NSIS 2.27 ; ;-------------------------------- @@ -38,6 +38,8 @@ !include "MUI.nsh" !include "Sections.nsh" +!include "WinVer.nsh" +!include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters @@ -94,6 +96,13 @@ !endif ;-------------------------------- +;Reserve files used in .onInit +;for faster start-up +ReserveFile "${NSISDIR}\Plugins\System.dll" +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +!insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- ;Modern UI Configuration !define MUI_ICON ".\pixmaps\pidgin-install.ico" @@ -481,12 +490,12 @@ ; If this is under NT4, delete the SILC support stuff ; there is a bug that will prevent any account from connecting ; See https://lists.silcnet.org/pipermail/silc-devel/2005-January/001588.html - Call GetWindowsVersion - Pop $R2 - StrCmp $R2 "NT 4.0" +1 +4 - Delete "$INSTDIR\plugins\libsilc.dll" - Delete "$INSTDIR\silcclient.dll" - Delete "$INSTDIR\silc.dll" + ${If} ${IsNT} + ${AndIf} ${IsWinNT4} + Delete "$INSTDIR\plugins\libsilc.dll" + Delete "$INSTDIR\silcclient.dll" + Delete "$INSTDIR\silc.dll" + ${EndIf} SetOutPath "$INSTDIR" @@ -1310,19 +1319,13 @@ gtk_not_mandatory: ; If on Win95/98/ME warn them that the GTK+ version wont work - Call GetWindowsVersion - Pop $R1 - StrCmp $R1 "95" win_ver_bad - StrCmp $R1 "98" win_ver_bad - StrCmp $R1 "ME" win_ver_bad - Goto done - - win_ver_bad: + ${Unless} ${IsNT} !insertmacro UnselectSection ${SecGtk} !insertmacro SetSectionFlag ${SecGtk} ${SF_RO} MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version Quit + ${EndIf} done: Pop $R2 @@ -1385,98 +1388,6 @@ FunctionEnd !endif -; GetWindowsVersion -; -; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/ -; Updated by Joost Verburg -; -; Returns on top of stack -; -; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista) -; or -; '' (Unknown Windows Version) -; -; Usage: -; Call GetWindowsVersion -; Pop $R0 -; -; at this point $R0 is "NT 4.0" or whatnot -Function GetWindowsVersion - - Push $R0 - Push $R1 - - ClearErrors - ReadRegStr $R0 HKLM \ - "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - - IfErrors 0 lbl_winnt - - ; we are not NT - ReadRegStr $R0 HKLM \ - "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber - - StrCpy $R1 $R0 1 - StrCmp $R1 '4' 0 lbl_error - - StrCpy $R1 $R0 3 - - StrCmp $R1 '4.0' lbl_win32_95 - StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98 - - lbl_win32_95: - StrCpy $R0 '95' - Goto lbl_done - - lbl_win32_98: - StrCpy $R0 '98' - Goto lbl_done - - lbl_win32_ME: - StrCpy $R0 'ME' - Goto lbl_done - - lbl_winnt: - StrCpy $R1 $R0 1 - - StrCmp $R1 '3' lbl_winnt_x - StrCmp $R1 '4' lbl_winnt_x - - StrCpy $R1 $R0 3 - - StrCmp $R1 '5.0' lbl_winnt_2000 - StrCmp $R1 '5.1' lbl_winnt_XP - StrCmp $R1 '5.2' lbl_winnt_2003 - StrCmp $R1 '6.0' lbl_winnt_vista lbl_error - - lbl_winnt_x: - StrCpy $R0 "NT $R0" 6 - Goto lbl_done - - lbl_winnt_2000: - Strcpy $R0 '2000' - Goto lbl_done - - lbl_winnt_XP: - Strcpy $R0 'XP' - Goto lbl_done - - lbl_winnt_2003: - Strcpy $R0 '2003' - Goto lbl_done - - lbl_winnt_vista: - Strcpy $R0 'Vista' - Goto lbl_done - - lbl_error: - Strcpy $R0 '' - lbl_done: - - Pop $R1 - Exch $R0 -FunctionEnd - ; SpellChecker Related Functions ;-------------------------------
--- a/po/POTFILES.in Tue May 29 22:44:59 2007 +0000 +++ b/po/POTFILES.in Wed May 30 21:05:04 2007 +0000 @@ -179,6 +179,8 @@ pidgin/pidgincombobox.c pidgin/pidgin.h pidgin/pidginstock.c +pidgin/pixmaps/emotes/default/22/default.theme.in +pidgin/pixmaps/emotes/none/none.theme.in pidgin/plugins/cap/cap.c pidgin/plugins/contact_priority.c pidgin/plugins/convcolors.c