# HG changeset patch # User Nathan Walp # Date 1170219232 0 # Node ID 4222b5790e0b531d5b8db706fda548712106bc1e # Parent 8fc14c228ca895dea5355879f4b0810a1ef3420e# Parent ce0cd7474b6422da9e6cb70ef3c02d68182ba1cd merge of 'c2ca8d77fad6142251001c2545c83a2f56eb3660' and 'df9e73e952c29bcf2bf3d2f7c6e1f89e622fc8dc' diff -r ce0cd7474b64 -r 4222b5790e0b .mtn-ignore --- a/.mtn-ignore Wed Jan 31 01:48:35 2007 +0000 +++ b/.mtn-ignore Wed Jan 31 04:53:52 2007 +0000 @@ -48,6 +48,7 @@ libpurple/plugins/perl/common/lib libpurple/win32/libpurplerc.rc libtool +local.mak ltmain.sh missing mkinstalldirs diff -r ce0cd7474b64 -r 4222b5790e0b Makefile.mingw --- a/Makefile.mingw Wed Jan 31 01:48:35 2007 +0000 +++ b/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -72,13 +72,13 @@ rm -rf $(GAIM_INSTALL_DIR).release cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \ - -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';' + -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';' installer: create_release_install_dir $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_nogtk: create_release_install_dir - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi + $(MAKENSIS) -V3 -DGAIM_VERSION="$(GAIM_VERSION)" -DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" -DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_debug: install $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi diff -r ce0cd7474b64 -r 4222b5790e0b config.h.mingw --- a/config.h.mingw Wed Jan 31 01:48:35 2007 +0000 +++ b/config.h.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -643,3 +643,5 @@ #define HAVE_VSNPRINTF 1 #define SIZEOF_TIME_T 4 + +#define PIDGIN_NAME "Pidgin" diff -r ce0cd7474b64 -r 4222b5790e0b configure.ac --- a/configure.ac Wed Jan 31 01:48:35 2007 +0000 +++ b/configure.ac Wed Jan 31 04:53:52 2007 +0000 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([gaim], [2.0.0beta6], [gaim-devel@lists.sourceforge.net]) +AC_INIT([pidgin], [2.0.0beta7devel], [gaim-devel@lists.sourceforge.net]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -7,6 +7,8 @@ AC_PREREQ([2.50]) +AC_DEFINE(PIDGIN_NAME, "Pidgin", [The user-visible application name]) + AC_PATH_PROG(sedpath, sed) dnl Storing configure arguments @@ -24,6 +26,7 @@ GETTEXT_PACKAGE=gaim AC_SUBST(GETTEXT_PACKAGE) + # before gettexting, in case iconv matters case "$host_os" in darwin*) @@ -1892,13 +1895,30 @@ m4macros/Makefile pidgin/Makefile pidgin/pixmaps/Makefile + pidgin/pixmaps/animations/Makefile + pidgin/pixmaps/animations/16/Makefile pidgin/pixmaps/buddy_icons/Makefile pidgin/pixmaps/buddy_icons/qq/Makefile + pidgin/pixmaps/dialogs/Makefile + pidgin/pixmaps/dialogs/16/Makefile + pidgin/pixmaps/dialogs/16/scalable/Makefile + pidgin/pixmaps/dialogs/64/Makefile + pidgin/pixmaps/dialogs/64/scalable/Makefile + pidgin/pixmaps/emblems/Makefile + pidgin/pixmaps/emblems/16/Makefile + pidgin/pixmaps/emblems/16/scalable/Makefile pidgin/pixmaps/emotes/Makefile pidgin/pixmaps/emotes/default/Makefile pidgin/pixmaps/emotes/default/22/Makefile - pidgin/pixmaps/emotes/default/scalable/Makefile + pidgin/pixmaps/emotes/default/22/scalable/Makefile pidgin/pixmaps/emotes/none/Makefile + pidgin/pixmaps/protocols/Makefile + pidgin/pixmaps/protocols/16/Makefile + pidgin/pixmaps/protocols/16/scalable/Makefile + pidgin/pixmaps/protocols/22/Makefile + pidgin/pixmaps/protocols/22/scalable/Makefile + pidgin/pixmaps/protocols/48/Makefile + pidgin/pixmaps/protocols/48/scalable/Makefile pidgin/pixmaps/status/Makefile pidgin/pixmaps/status/16/Makefile pidgin/pixmaps/status/16/scalable/Makefile diff -r ce0cd7474b64 -r 4222b5790e0b console/Makefile.am --- a/console/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/console/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -46,7 +46,7 @@ $(LIBXML_LIBS) \ $(GNT_LIBS) \ ./libgnt/libgnt.la \ - $(top_builddir)/libpurple/libgaim.la + $(top_builddir)/libpurple/libpurple.la AM_CPPFLAGS = \ -DSTANDALONE \ diff -r ce0cd7474b64 -r 4222b5790e0b console/libgnt/wms/Makefile.am --- a/console/libgnt/wms/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/console/libgnt/wms/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -9,7 +9,7 @@ s_la_LIBADD = \ $(GLIB_LIBS) \ $(top_builddir)/console/libgnt/libgnt.la \ - $(top_builddir)/libpurple/libgaim.la + $(top_builddir)/libpurple/libpurple.la EXTRA_DIST = diff -r ce0cd7474b64 -r 4222b5790e0b console/plugins/gntgf.c --- a/console/plugins/gntgf.c Wed Jan 31 01:48:35 2007 +0000 +++ b/console/plugins/gntgf.c Wed Jan 31 04:53:52 2007 +0000 @@ -354,8 +354,8 @@ "gntgf", N_("GntGf"), VERSION, - N_("Toaster plugin for Gaim-Text."), - N_("Toaster plugin for Gaim-Text."), + N_("Toaster plugin"), + N_("Toaster plugin"), "Sadrul H Chowdhury ", "http://gaim.sourceforge.net", plugin_load, diff -r ce0cd7474b64 -r 4222b5790e0b console/plugins/lastlog.c --- a/console/plugins/lastlog.c Wed Jan 31 01:48:35 2007 +0000 +++ b/console/plugins/lastlog.c Wed Jan 31 04:53:52 2007 +0000 @@ -120,8 +120,8 @@ "gntlastlog", N_("GntLastlog"), VERSION, - N_("Lastlog plugin for gaim-text."), - N_("Lastlog plugin for gaim-text."), + N_("Lastlog plugin."), + N_("Lastlog plugin."), "Sadrul H Chowdhury ", "http://gaim.sourceforge.net", plugin_load, diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/Makefile.am --- a/libpurple/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -11,7 +11,7 @@ win32/libc_interface.c \ win32/libc_interface.h \ win32/libc_internal.h \ - win32/libgaimrc.rc.in \ + win32/libpurplerc.rc.in \ win32/rules.mak \ win32/targets.mak \ win32/wgaimerror.h \ @@ -198,9 +198,9 @@ endif -lib_LTLIBRARIES = libgaim.la $(libgaim_client_lib) +lib_LTLIBRARIES = libpurple.la $(libgaim_client_lib) -libgaim_la_SOURCES = \ +libpurple_la_SOURCES = \ $(gaim_coresources) \ $(dbus_sources) @@ -208,14 +208,14 @@ internal.h \ prefix.h -libgaimincludedir=$(includedir)/gaim -libgaiminclude_HEADERS = \ +libpurpleincludedir=$(includedir)/libpurple +libpurpleinclude_HEADERS = \ $(gaim_coreheaders) \ $(dbus_headers) -libgaim_la_DEPENDENCIES = $(STATIC_LINK_LIBS) -libgaim_la_LDFLAGS = -export-dynamic -libgaim_la_LIBADD = \ +libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS) +libpurple_la_LDFLAGS = -export-dynamic +libpurple_la_LIBADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(LIBXML_LIBS) \ @@ -227,7 +227,7 @@ AM_CPPFLAGS = \ -DBR_PTHREADS=0 \ -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)/gaim/\" \ + -DLIBDIR=\"$(libdir)/libpurple/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ $(GLIB_CFLAGS) \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/gaim-compat.h --- a/libpurple/gaim-compat.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/gaim-compat.h Wed Jan 31 04:53:52 2007 +0000 @@ -370,6 +370,8 @@ #define gaim_buddy_icon_get_scale_size purple_buddy_icon_get_scale_size +/* from cipher.h */ + #define GAIM_CIPHER PURPLE_CIPHER #define GAIM_CIPHER_OPS PURPLE_CIPHER_OPS #define GAIM_CIPHER_CONTEXT PURPLE_CIPHER_CONTEXT @@ -433,4 +435,717 @@ #define gaim_cipher_http_digest_calculate_response \ purple_cipher_http_digest_calculate_response +/* from circbuffer.h */ + +#define GaimCircBuffer PurpleCircBuffer + +#define gaim_circ_buffer_new purple_circ_buffer_new +#define gaim_circ_buffer_destroy purple_circ_buffer_destroy +#define gaim_circ_buffer_append purple_circ_buffer_append +#define gaim_circ_buffer_get_max_read purple_circ_buffer_get_max_read +#define gaim_circ_buffer_mark_read purple_circ_buffer_mark_read + +/* from cmds.h */ + +#define GaimCmdPriority PurpleCmdPriority +#define GaimCmdFlag PurpleCmdFlag +#define GaimCmdStatus PurpleCmdStatus +#define GaimCmdRet PurpleCmdRet + +#define GAIM_CMD_FUNC PURPLE_CMD_FUNC + +#define GaimCmdFunc PurpleCmdFunc + +#define GaimCmdId PurpleCmdId + +#define gaim_cmd_register purple_cmd_register +#define gaim_cmd_unregister purple_cmd_unregister +#define gaim_cmd_do_command purple_cmd_do_command +#define gaim_cmd_list purple_cmd_list +#define gaim_cmd_help purple_cmd_help + +/* from connection.h */ + +#define GaimConnection PurpleConnection + +#define GAIM_CONNECTION_HTML PURPLE_CONNECTION_HTML +#define GAIM_CONNECTION_NO_BGCOLOR PURPLE_CONNECTION_NO_BGCOLOR +#define GAIM_CONNECTION_AUTO_RESP PURPLE_CONNECTION_AUTO_RESP +#define GAIM_CONNECTION_FORMATTING_WBFO PURPLE_CONNECTION_FORMATTING_WBFO +#define GAIM_CONNECTION_NO_NEWLINES PURPLE_CONNECTION_NO_NEWLINES +#define GAIM_CONNECTION_NO_FONTSIZE PURPLE_CONNECTION_NO_FONTSIZE +#define GAIM_CONNECTION_NO_URLDESC PURPLE_CONNECTION_NO_URLDESC +#define GAIM_CONNECTION_NO_IMAGES PURPLE_CONNECTION_NO_IMAGES + +#define GaimConnectionFlags PurpleConnectionFlags + +#define GAIM_DISCONNECTED PURPLE_DISCONNECTED +#define GAIM_CONNECTED PURPLE_CONNECTED +#define GAIM_CONNECTING PURPLE_CONNECTING + +#define GaimConnectionState PurpleConnectionState + +#define GaimConnectionUiOps PurpleConnectionUiOps + +#define gaim_connection_new purple_connection_new +#define gaim_connection_destroy purple_connection_destroy + +#define gaim_connection_set_state purple_connection_set_state +#define gaim_connection_set_account purple_connection_set_account +#define gaim_connection_set_display_name purple_connection_set_display_name +#define gaim_connection_get_state purple_connection_get_state + +#define GAIM_CONNECTION_IS_CONNECTED PURPLE_CONNECTION_IS_CONNECTED + +#define gaim_connection_get_account purple_connection_get_account +#define gaim_connection_get_password purple_connection_get_password +#define gaim_connection_get_display_name purple_connection_get_display_name + +#define gaim_connection_update_progress purple_connection_update_progress + +#define gaim_connection_notice purple_connection_notice +#define gaim_connection_error purple_connection_error + +#define gaim_connections_disconnect_all purple_connections_disconnect_all + +#define gaim_connections_get_all purple_connections_get_all +#define gaim_connections_get_connecting purple_connections_get_connecting + +#define GAIM_CONNECTION_IS_VALID PURPLE_CONNECTION_IS_VALID + +#define gaim_connections_set_ui_ops purple_connections_set_ui_ops +#define gaim_connections_get_ui_ops purple_connections_get_ui_ops + +#define gaim_connections_init purple_connections_init +#define gaim_connections_uninit purple_connections_uninit +#define gaim_connections_get_handle purple_connections_get_handle + + +/* from conversation.h */ + +#define GaimConversationUiOps PurpleConversationUiOps +#define GaimConversation PurpleConversation +#define GaimConvIm PurpleConvIm +#define GaimConvChat PurpleConvChat +#define GaimConvChatBuddy PurpleConvChatBuddy + +#define GAIM_CONV_TYPE_UNKNOWN PURPLE_CONV_TYPE_UNKNOWN +#define GAIM_CONV_TYPE_IM PURPLE_CONV_TYPE_IM +#define GAIM_CONV_TYPE_CHAT PURPLE_CONV_TYPE_CHAT +#define GAIM_CONV_TYPE_MISC PURPLE_CONV_TYPE_MISC +#define GAIM_CONV_TYPE_ANY PURPLE_CONV_TYPE_ANY + +#define GaimConversationType PurpleConversationType + +#define GAIM_CONV_UPDATE_ADD PURPLE_CONV_UPDATE_ADD +#define GAIM_CONV_UPDATE_REMOVE PURPLE_CONV_UPDATE_REMOVE +#define GAIM_CONV_UPDATE_ACCOUNT PURPLE_CONV_UPDATE_ACCOUNT +#define GAIM_CONV_UPDATE_TYPING PURPLE_CONV_UPDATE_TYPING +#define GAIM_CONV_UPDATE_UNSEEN PURPLE_CONV_UPDATE_UNSEEN +#define GAIM_CONV_UPDATE_LOGGING PURPLE_CONV_UPDATE_LOGGING +#define GAIM_CONV_UPDATE_TOPIC PURPLE_CONV_UPDATE_TOPIC +#define GAIM_CONV_ACCOUNT_ONLINE PURPLE_CONV_ACCOUNT_ONLINE +#define GAIM_CONV_ACCOUNT_OFFLINE PURPLE_CONV_ACCOUNT_OFFLINE +#define GAIM_CONV_UPDATE_AWAY PURPLE_CONV_UPDATE_AWAY +#define GAIM_CONV_UPDATE_ICON PURPLE_CONV_UPDATE_ICON +#define GAIM_CONV_UPDATE_TITLE PURPLE_CONV_UPDATE_TITLE +#define GAIM_CONV_UPDATE_CHATLEFT PURPLE_CONV_UPDATE_CHATLEFT +#define GAIM_CONV_UPDATE_FEATURES PURPLE_CONV_UPDATE_FEATURES + +#define GaimConvUpdateType PurpleConvUpdateType + +#define GAIM_NOT_TYPING PURPLE_NOT_TYPING +#define GAIM_TYPING PURPLE_TYPING +#define GAIM_TYPED PURPLE_TYPED + +#define GaimTypingState PurpleTypingState + +#define GAIM_MESSAGE_SEND PURPLE_MESSAGE_SEND +#define GAIM_MESSAGE_RECV PURPLE_MESSAGE_RECV +#define GAIM_MESSAGE_SYSTEM PURPLE_MESSAGE_SYSTEM +#define GAIM_MESSAGE_AUTO_RESP PURPLE_MESSAGE_AUTO_RESP +#define GAIM_MESSAGE_ACTIVE_ONLY PURPLE_MESSAGE_ACTIVE_ONLY +#define GAIM_MESSAGE_NICK PURPLE_MESSAGE_NICK +#define GAIM_MESSAGE_NO_LOG PURPLE_MESSAGE_NO_LOG +#define GAIM_MESSAGE_WHISPER PURPLE_MESSAGE_WHISPER +#define GAIM_MESSAGE_ERROR PURPLE_MESSAGE_ERROR +#define GAIM_MESSAGE_DELAYED PURPLE_MESSAGE_DELAYED +#define GAIM_MESSAGE_RAW PURPLE_MESSAGE_RAW +#define GAIM_MESSAGE_IMAGES PURPLE_MESSAGE_IMAGES + +#define GaimMessageFlags PurpleMessageFlags + +#define GAIM_CBFLAGS_NONE PURPLE_CBFLAGS_NONE +#define GAIM_CBFLAGS_VOICE PURPLE_CBFLAGS_VOICE +#define GAIM_CBFLAGS_HALFOP PURPLE_CBFLAGS_HALFOP +#define GAIM_CBFLAGS_OP PURPLE_CBFLAGS_OP +#define GAIM_CBFLAGS_FOUNDER PURPLE_CBFLAGS_FOUNDER +#define GAIM_CBFLAGS_TYPING PURPLE_CBFLAGS_TYPING + +#define GaimConvChatBuddyFlags PurpleConvChatBuddyFlags + +#define gaim_conversations_set_ui_ops purple_conversations_set_ui_ops + +#define gaim_conversation_new purple_conversation_new +#define gaim_conversation_destroy purple_conversation_destroy +#define gaim_conversation_present purple_conversation_present +#define gaim_conversation_get_type purple_conversation_get_type +#define gaim_conversation_set_ui_ops purple_conversation_set_ui_ops +#define gaim_conversation_get_ui_ops purple_conversation_get_ui_ops +#define gaim_conversation_set_account purple_conversation_set_account +#define gaim_conversation_get_account purple_conversation_get_account +#define gaim_conversation_get_gc purple_conversation_get_gc +#define gaim_conversation_set_title purple_conversation_set_title +#define gaim_conversation_get_title purple_conversation_get_title +#define gaim_conversation_autoset_title purple_conversation_autoset_title +#define gaim_conversation_set_name purple_conversation_set_name +#define gaim_conversation_get_name purple_conversation_get_name +#define gaim_conversation_set_logging purple_conversation_set_logging +#define gaim_conversation_is_logging purple_conversation_is_logging +#define gaim_conversation_close_logs purple_conversation_close_logs +#define gaim_conversation_get_im_data purple_conversation_get_im_data + +#define GAIM_CONV_IM PURPLE_CONV_IM + +#define gaim_conversation_get_chat_data purple_conversation_get_chat_data + +#define GAIM_CONV_CHAT PURPLE_CONV_CHAT + +#define gaim_conversation_set_data purple_conversation_set_data +#define gaim_conversation_get_data purple_conversation_get_data + +#define gaim_get_conversations purple_get_conversations +#define gaim_get_ims purple_get_ims +#define gaim_get_chats purple_get_chats + +#define gaim_find_conversation_with_account \ + purple_find_conversation_with_account + +#define gaim_conversation_write purple_conversation_write +#define gaim_conversation_set_features purple_conversation_set_features +#define gaim_conversation_get_features purple_conversation_get_features +#define gaim_conversation_has_focus purple_conversation_has_focus +#define gaim_conversation_update purple_conversation_update +#define gaim_conversation_foreach purple_conversation_foreach + +#define gaim_conv_im_get_conversation purple_conv_im_get_conversation +#define gaim_conv_im_set_icon purple_conv_im_set_icon +#define gaim_conv_im_get_icon purple_conv_im_get_icon +#define gaim_conv_im_set_typing_state purple_conv_im_set_typing_state +#define gaim_conv_im_get_typing_state purple_conv_im_get_typing_state + +#define gaim_conv_im_start_typing_timeout purple_conv_im_start_typing_timeout +#define gaim_conv_im_stop_typing_timeout purple_conv_im_stop_typing_timeout +#define gaim_conv_im_get_typing_timeout purple_conv_im_get_typing_timeout +#define gaim_conv_im_set_type_again purple_conv_im_set_type_again +#define gaim_conv_im_get_type_again purple_conv_im_get_type_again + +#define gaim_conv_im_start_send_typed_timeout \ + purple_conv_im_start_send_typed_timeout + +#define gaim_conv_im_stop_send_typed_timeout \ + purple_conv_im_stop_send_typed_timeout + +#define gaim_conv_im_get_send_typed_timeout \ + purple_conv_im_get_send_typed_timeout + +#define gaim_conv_present_error purple_conv_present_error +#define gaim_conv_send_confirm purple_conv_send_confirm + +#define gaim_conv_im_update_typing purple_conv_im_update_typing +#define gaim_conv_im_write purple_conv_im_write +#define gaim_conv_im_send purple_conv_im_send +#define gaim_conv_im_send_with_flags purple_conv_im_send_with_flags + +#define gaim_conv_custom_smiley_add purple_conv_custom_smiley_add +#define gaim_conv_custom_smiley_write purple_conv_custom_smiley_write +#define gaim_conv_custom_smiley_close purple_conv_custom_smiley_close + +#define gaim_conv_chat_get_conversation purple_conv_chat_get_conversation +#define gaim_conv_chat_set_users purple_conv_chat_set_users +#define gaim_conv_chat_get_users purple_conv_chat_get_users +#define gaim_conv_chat_ignore purple_conv_chat_ignore +#define gaim_conv_chat_unignore purple_conv_chat_unignore +#define gaim_conv_chat_set_ignored purple_conv_chat_set_ignored +#define gaim_conv_chat_get_ignored purple_conv_chat_get_ignored +#define gaim_conv_chat_get_ignored_user purple_conv_chat_get_ignored_user +#define gaim_conv_chat_is_user_ignored purple_conv_chat_is_user_ignored +#define gaim_conv_chat_set_topic purple_conv_chat_set_topic +#define gaim_conv_chat_get_topic purple_conv_chat_get_topic +#define gaim_conv_chat_set_id purple_conv_chat_set_id +#define gaim_conv_chat_get_id purple_conv_chat_get_id +#define gaim_conv_chat_write purple_conv_chat_write +#define gaim_conv_chat_send purple_conv_chat_send +#define gaim_conv_chat_send_with_flags purple_conv_chat_send_with_flags +#define gaim_conv_chat_add_user purple_conv_chat_add_user +#define gaim_conv_chat_add_users purple_conv_chat_add_users +#define gaim_conv_chat_rename_user purple_conv_chat_rename_user +#define gaim_conv_chat_remove_user purple_conv_chat_remove_user +#define gaim_conv_chat_remove_users purple_conv_chat_remove_users +#define gaim_conv_chat_find_user purple_conv_chat_find_user +#define gaim_conv_chat_user_set_flags purple_conv_chat_user_set_flags +#define gaim_conv_chat_user_get_flags purple_conv_chat_user_get_flags +#define gaim_conv_chat_clear_users purple_conv_chat_clear_users +#define gaim_conv_chat_set_nick purple_conv_chat_set_nick +#define gaim_conv_chat_get_nick purple_conv_chat_get_nick +#define gaim_conv_chat_left purple_conv_chat_left +#define gaim_conv_chat_has_left purple_conv_chat_has_left + +#define gaim_find_chat purple_find_chat + +#define gaim_conv_chat_cb_new purple_conv_chat_cb_new +#define gaim_conv_chat_cb_find purple_conv_chat_cb_find +#define gaim_conv_chat_cb_get_name purple_conv_chat_cb_get_name +#define gaim_conv_chat_cb_destroy purple_conv_chat_cb_destroy + +#define gaim_conversations_get_handle purple_conversations_get_handle +#define gaim_conversations_init purple_conversations_init +#define gaim_conversations_uninit purple_conversations_uninit + +/* from core.h */ + +#define GaimCore PurpleCore + +#define GaimCoreUiOps PurpleCoreUiOps + +#define gaim_core_init purple_core_init +#define gaim_core_quit purple_core_quit + +#define gaim_core_quit_cb purple_core_quit_cb +#define gaim_core_get_version purple_core_get_version +#define gaim_core_get_ui purple_core_get_ui +#define gaim_get_core purple_get_core +#define gaim_core_set_ui_ops purple_core_set_ui_ops +#define gaim_core_get_ui_ops purple_core_get_ui_ops + +/* from debug.h */ + +#define GAIM_DEBUG_ALL PURPLE_DEBUG_ALL +#define GAIM_DEBUG_MISC PURPLE_DEBUG_MISC +#define GAIM_DEBUG_INFO PURPLE_DEBUG_INFO +#define GAIM_DEBUG_WARNING PURPLE_DEBUG_WARNING +#define GAIM_DEBUG_ERROR PURPLE_DEBUG_ERROR +#define GAIM_DEBUG_FATAL PURPLE_DEBUG_FATAL + +#define GaimDebugLevel PurpleDebugLevel + +#define GaimDebugUiOps PurpleDebugUiOps + + +#define gaim_debug purple_debug +#define gaim_debug_misc purple_debug_misc +#define gaim_debug_info purple_debug_info +#define gaim_debug_warning purple_debug_warning +#define gaim_debug_error purple_debug_error +#define gaim_debug_fatal purple_debug_fatal + +#define gaim_debug_set_enabled purple_debug_set_enabled +#define gaim_debug_is_enabled purple_debug_is_enabled + +#define gaim_debug_set_ui_ops purple_debug_set_ui_ops +#define gaim_debug_get_ui_ops purple_debug_get_ui_ops + +#define gaim_debug_init purple_debug_init + +/* from desktopitem.h */ + +#define GAIM_DESKTOP_ITEM_TYPE_NULL PURPLE_DESKTOP_ITEM_TYPE_NULL +#define GAIM_DESKTOP_ITEM_TYPE_OTHER PURPLE_DESKTOP_ITEM_TYPE_OTHER +#define GAIM_DESKTOP_ITEM_TYPE_APPLICATION PURPLE_DESKTOP_ITEM_TYPE_APPLICATION +#define GAIM_DESKTOP_ITEM_TYPE_LINK PURPLE_DESKTOP_ITEM_TYPE_LINK +#define GAIM_DESKTOP_ITEM_TYPE_FSDEVICE PURPLE_DESKTOP_ITEM_TYPE_FSDEVICE +#define GAIM_DESKTOP_ITEM_TYPE_MIME_TYPE PURPLE_DESKTOP_ITEM_TYPE_MIME_TYPE +#define GAIM_DESKTOP_ITEM_TYPE_DIRECTORY PURPLE_DESKTOP_ITEM_TYPE_DIRECTORY +#define GAIM_DESKTOP_ITEM_TYPE_SERVICE PURPLE_DESKTOP_ITEM_TYPE_SERVICE +#define GAIM_DESKTOP_ITEM_TYPE_SERVICE_TYPE PURPLE_DESKTOP_ITEM_TYPE_SERVICE_TYPE + +#define GaimDesktopItemType PurpleDesktopItemType + +#define GaimDesktopItem PurpleDesktopItem + +#define GAIM_TYPE_DESKTOP_ITEM PURPLE_TYPE_DESKTOP_ITEM +#define gaim_desktop_item_get_type purple_desktop_item_get_type + +/* standard */ +/* ugh, i'm just copying these as strings, rather than pidginifying them */ +#define GAIM_DESKTOP_ITEM_ENCODING "Encoding" /* string */ +#define GAIM_DESKTOP_ITEM_VERSION "Version" /* numeric */ +#define GAIM_DESKTOP_ITEM_NAME "Name" /* localestring */ +#define GAIM_DESKTOP_ITEM_GENERIC_NAME "GenericName" /* localestring */ +#define GAIM_DESKTOP_ITEM_TYPE "Type" /* string */ +#define GAIM_DESKTOP_ITEM_FILE_PATTERN "FilePattern" /* regexp(s) */ +#define GAIM_DESKTOP_ITEM_TRY_EXEC "TryExec" /* string */ +#define GAIM_DESKTOP_ITEM_NO_DISPLAY "NoDisplay" /* boolean */ +#define GAIM_DESKTOP_ITEM_COMMENT "Comment" /* localestring */ +#define GAIM_DESKTOP_ITEM_EXEC "Exec" /* string */ +#define GAIM_DESKTOP_ITEM_ACTIONS "Actions" /* strings */ +#define GAIM_DESKTOP_ITEM_ICON "Icon" /* string */ +#define GAIM_DESKTOP_ITEM_MINI_ICON "MiniIcon" /* string */ +#define GAIM_DESKTOP_ITEM_HIDDEN "Hidden" /* boolean */ +#define GAIM_DESKTOP_ITEM_PATH "Path" /* string */ +#define GAIM_DESKTOP_ITEM_TERMINAL "Terminal" /* boolean */ +#define GAIM_DESKTOP_ITEM_TERMINAL_OPTIONS "TerminalOptions" /* string */ +#define GAIM_DESKTOP_ITEM_SWALLOW_TITLE "SwallowTitle" /* string */ +#define GAIM_DESKTOP_ITEM_SWALLOW_EXEC "SwallowExec" /* string */ +#define GAIM_DESKTOP_ITEM_MIME_TYPE "MimeType" /* regexp(s) */ +#define GAIM_DESKTOP_ITEM_PATTERNS "Patterns" /* regexp(s) */ +#define GAIM_DESKTOP_ITEM_DEFAULT_APP "DefaultApp" /* string */ +#define GAIM_DESKTOP_ITEM_DEV "Dev" /* string */ +#define GAIM_DESKTOP_ITEM_FS_TYPE "FSType" /* string */ +#define GAIM_DESKTOP_ITEM_MOUNT_POINT "MountPoint" /* string */ +#define GAIM_DESKTOP_ITEM_READ_ONLY "ReadOnly" /* boolean */ +#define GAIM_DESKTOP_ITEM_UNMOUNT_ICON "UnmountIcon" /* string */ +#define GAIM_DESKTOP_ITEM_SORT_ORDER "SortOrder" /* strings */ +#define GAIM_DESKTOP_ITEM_URL "URL" /* string */ +#define GAIM_DESKTOP_ITEM_DOC_PATH "X-GNOME-DocPath" /* string */ + +#define gaim_desktop_item_new_from_file purple_desktop_item_new_from_file +#define gaim_desktop_item_get_entry_type purple_desktop_item_get_entry_type +#define gaim_desktop_item_get_string purple_desktop_item_get_string +#define gaim_desktop_item_copy purple_desktop_item_copy +#define gaim_desktop_item_unref purple_desktop_item_unref + +/* from dnsquery.h */ + +#define GaimDnsQueryData PurpleDnsQueryData +#define GaimDnsQueryConnectFunction PurpleDnsQueryConnectFunction + +#define gaim_dnsquery_a purple_dnsquery_a +#define gaim_dnsquery_destroy purple_dnsquery_destroy +#define gaim_dnsquery_init purple_dnsquery_init +#define gaim_dnsquery_uninit purple_dnsquery_uninit + +/* from dnssrv.h */ + +#define GaimSrvResponse PurpleSrvResponse +#define GaimSrvQueryData PurpleSrvQueryData +#define GaimSrvCallback PurpleSrvCallback + +#define gaim_srv_resolve purple_srv_resolve +#define gaim_srv_cancel purple_srv_cancel + +/* from eventloop.h */ + +#define GAIM_INPUT_READ PURPLE_INPUT_READ +#define GAIM_INPUT_WRITE PURPLE_INPUT_WRITE + +#define GaimInputCondition PurpleInputCondition +#define GaimInputFunction PurpleInputFunction +#define GaimEventLoopUiOps PurpleEventLoopUiOps + +#define gaim_timeout_add purple_timeout_add +#define gaim_timeout_remove purple_timeout_remove +#define gaim_input_add purple_input_add +#define gaim_input_remove purple_input_remove + +#define gaim_eventloop_set_ui_ops purple_eventloop_set_ui_ops +#define gaim_eventloop_get_ui_ops purple_eventloop_get_ui_ops + +/* from ft.h */ + +#define GaimXfer PurpleXfer + +#define GAIM_XFER_UNKNOWN PURPLE_XFER_UNKNOWN +#define GAIM_XFER_SEND PURPLE_XFER_SEND +#define GAIM_XFER_RECEIVE PURPLE_XFER_RECEIVE + +#define GaimXferType PurpleXferType + +#define GAIM_XFER_STATUS_UNKNOWN PURPLE_XFER_STATUS_UNKNOWN +#define GAIM_XFER_STATUS_NOT_STARTED PURPLE_XFER_STATUS_NOT_STARTED +#define GAIM_XFER_STATUS_ACCEPTED PURPLE_XFER_STATUS_ACCEPTED +#define GAIM_XFER_STATUS_STARTED PURPLE_XFER_STATUS_STARTED +#define GAIM_XFER_STATUS_DONE PURPLE_XFER_STATUS_DONE +#define GAIM_XFER_STATUS_CANCEL_LOCAL PURPLE_XFER_STATUS_CANCEL_LOCAL +#define GAIM_XFER_STATUS_CANCEL_REMOTE PURPLE_XFER_STATUS_CANCEL_REMOTE + +#define GaimXferStatusType PurpleXferStatusType + +#define GaimXferUiOps PurpleXferUiOps + +#define gaim_xfer_new purple_xfer_new +#define gaim_xfer_ref purple_xfer_ref +#define gaim_xfer_unref purple_xfer_unref +#define gaim_xfer_request purple_xfer_request +#define gaim_xfer_request_accepted purple_xfer_request_accepted +#define gaim_xfer_request_denied purple_xfer_request_denied +#define gaim_xfer_get_type purple_xfer_get_type +#define gaim_xfer_get_account purple_xfer_get_account +#define gaim_xfer_get_status purple_xfer_get_status +#define gaim_xfer_is_canceled purple_xfer_is_canceled +#define gaim_xfer_is_completed purple_xfer_is_completed +#define gaim_xfer_get_filename purple_xfer_get_filename +#define gaim_xfer_get_local_filename purple_xfer_get_local_filename +#define gaim_xfer_get_bytes_sent purple_xfer_get_bytes_sent +#define gaim_xfer_get_bytes_remaining purple_xfer_get_bytes_remaining +#define gaim_xfer_get_size purple_xfer_get_size +#define gaim_xfer_get_progress purple_xfer_get_progress +#define gaim_xfer_get_local_port purple_xfer_get_local_port +#define gaim_xfer_get_remote_ip purple_xfer_get_remote_ip +#define gaim_xfer_get_remote_port purple_xfer_get_remote_port +#define gaim_xfer_set_completed purple_xfer_set_completed +#define gaim_xfer_set_message purple_xfer_set_message +#define gaim_xfer_set_filename purple_xfer_set_filename +#define gaim_xfer_set_local_filename purple_xfer_set_local_filename +#define gaim_xfer_set_size purple_xfer_set_size +#define gaim_xfer_set_bytes_sent purple_xfer_set_bytes_sent +#define gaim_xfer_get_ui_ops purple_xfer_get_ui_ops +#define gaim_xfer_set_read_fnc purple_xfer_set_read_fnc +#define gaim_xfer_set_write_fnc purple_xfer_set_write_fnc +#define gaim_xfer_set_ack_fnc purple_xfer_set_ack_fnc +#define gaim_xfer_set_request_denied_fnc purple_xfer_set_request_denied_fnc +#define gaim_xfer_set_init_fnc purple_xfer_set_init_fnc +#define gaim_xfer_set_start_fnc purple_xfer_set_start_fnc +#define gaim_xfer_set_end_fnc purple_xfer_set_end_fnc +#define gaim_xfer_set_cancel_send_fnc purple_xfer_set_cancel_send_fnc +#define gaim_xfer_set_cancel_recv_fnc purple_xfer_set_cancel_recv_fnc + +#define gaim_xfer_read purple_xfer_read +#define gaim_xfer_write purple_xfer_write +#define gaim_xfer_start purple_xfer_start +#define gaim_xfer_end purple_xfer_end +#define gaim_xfer_add purple_xfer_add +#define gaim_xfer_cancel_local purple_xfer_cancel_local +#define gaim_xfer_cancel_remote purple_xfer_cancel_remote +#define gaim_xfer_error purple_xfer_error +#define gaim_xfer_update_progress purple_xfer_update_progress +#define gaim_xfer_conversation_write purple_xfer_conversation_write + +#define gaim_xfers_get_handle purple_xfers_get_handle +#define gaim_xfers_init purple_xfers_init +#define gaim_xfers_uninit purple_xfers_uninit +#define gaim_xfers_set_ui_ops purple_xfers_set_ui_ops +#define gaim_xfers_get_ui_ops purple_xfers_get_ui_ops + +/* from gaim-client.h */ + +/* XXX: should this be purple_init, or pidgin_init */ +#define gaim_init purple_init + +/* from idle.h */ + +#define GaimIdleUiOps PurpleIdleUiOps + +#define gaim_idle_touch purple_idle_touch +#define gaim_idle_set purple_idle_set +#define gaim_idle_set_ui_ops purple_idle_set_ui_ops +#define gaim_idle_get_ui_ops purple_idle_get_ui_ops +#define gaim_idle_init purple_idle_init +#define gaim_idle_uninit purple_idle_uninit + +/* from imgstore.h */ + +#define GaimStoredImage PurpleStoredImage + +#define gaim_imgstore_add purple_imgstore_add +#define gaim_imgstore_get purple_imgstore_get +#define gaim_imgstore_get_data purple_imgstore_get_data +#define gaim_imgstore_get_size purple_imgstore_get_size +#define gaim_imgstore_get_filename purple_imgstore_get_filename +#define gaim_imgstore_ref purple_imgstore_ref +#define gaim_imgstore_unref purple_imgstore_unref + + +/* from log.h */ + +#define GaimLog PurpleLog +#define GaimLogLogger PurpleLogLogger +#define GaimLogCommonLoggerData PurpleLogCommonLoggerData +#define GaimLogSet PurpleLogSet + +#define GAIM_LOG_IM PURPLE_LOG_IM +#define GAIM_LOG_CHAT PURPLE_LOG_CHAT +#define GAIM_LOG_SYSTEM PURPLE_LOG_SYSTEM + +#define GaimLogType PurpleLogType + +#define GAIM_LOG_READ_NO_NEWLINE PURPLE_LOG_READ_NO_NEWLINE + +#define GaimLogReadFlags PurpleLogReadFlags + +#define GaimLogSetCallback PurpleLogSetCallback + +#define gaim_log_new purple_log_new +#define gaim_log_free purple_log_free +#define gaim_log_write purple_log_write +#define gaim_log_read purple_log_read + +#define gaim_log_get_logs purple_log_get_logs +#define gaim_log_get_log_sets purple_log_get_log_sets +#define gaim_log_get_system_logs purple_log_get_system_logs +#define gaim_log_get_size purple_log_get_size +#define gaim_log_get_total_size purple_log_get_total_size +#define gaim_log_get_log_dir purple_log_get_log_dir +#define gaim_log_compare purple_log_compare +#define gaim_log_set_compare purple_log_set_compare +#define gaim_log_set_free purple_log_set_free + +#define gaim_log_common_writer purple_log_common_writer +#define gaim_log_common_lister purple_log_common_lister +#define gaim_log_common_total_sizer purple_log_common_total_sizer +#define gaim_log_common_sizer purple_log_common_sizer + +#define gaim_log_logger_new purple_log_logger_new +#define gaim_log_logger_free purple_log_logger_free +#define gaim_log_logger_add purple_log_logger_add +#define gaim_log_logger_remove purple_log_logger_remove +#define gaim_log_logger_set purple_log_logger_set +#define gaim_log_logger_get purple_log_logger_get + +#define gaim_log_logger_get_options purple_log_logger_get_options + +#define gaim_log_init purple_log_init +#define gaim_log_get_handle purple_log_get_handle +#define gaim_log_uninit purple_log_uninit + +/* from mime.h */ + +#define GaimMimeDocument PurpleMimeDocument +#define GaimMimePart PurpleMimePart + +#define gaim_mime_document_new purple_mime_document_new +#define gaim_mime_document_free purple_mime_document_free +#define gaim_mime_document_parse purple_mime_document_parse +#define gaim_mime_document_parsen purple_mime_document_parsen +#define gaim_mime_document_write purple_mime_document_write +#define gaim_mime_document_get_fields purple_mime_document_get_fields +#define gaim_mime_document_get_field purple_mime_document_get_field +#define gaim_mime_document_set_field purple_mime_document_set_field +#define gaim_mime_document_get_parts purple_mime_document_get_parts + +#define gaim_mime_part_new purple_mime_part_new +#define gaim_mime_part_get_fields purple_mime_part_get_fields +#define gaim_mime_part_get_field purple_mime_part_get_field +#define gaim_mime_part_get_field_decoded purple_mime_part_get_field_decoded +#define gaim_mime_part_set_field purple_mime_part_set_field +#define gaim_mime_part_get_data purple_mime_part_get_data +#define gaim_mime_part_get_data_decoded purple_mime_part_get_data_decoded +#define gaim_mime_part_get_length purple_mime_part_get_length +#define gaim_mime_part_set_data purple_mime_part_set_data + + +/* from network.h */ + +#define GaimNetworkListenData PurpleNetworkListenData + +#define GaimNetworkListenCallback PurpleNetworkListenCallback + +#define gaim_network_ip_atoi purple_network_ip_atoi +#define gaim_network_set_public_ip purple_network_set_public_ip +#define gaim_network_get_public_ip purple_network_get_public_ip +#define gaim_network_get_local_system_ip purple_network_get_local_system_ip +#define gaim_network_get_my_ip purple_network_get_my_ip + +#define gaim_network_listen purple_network_listen +#define gaim_network_listen_range purple_network_listen_range +#define gaim_network_listen_cancel purple_network_listen_cancel +#define gaim_network_get_port_from_fd purple_network_get_port_from_fd + +#define gaim_network_is_available purple_network_is_available + +#define gaim_network_init purple_network_init +#define gaim_network_uninit purple_network_uninit + +/* from notify.h */ + + +#define GaimNotifyUserInfoEntry PurpleNotifyUserInfoEntry +#define GaimNotifyUserInfo PurpleNotifyUserInfo + +#define GaimNotifyCloseCallback PurpleNotifyCloseCallback + +#define GAIM_NOTIFY_MESSAGE PURPLE_NOTIFY_MESSAGE +#define GAIM_NOTIFY_EMAIL PURPLE_NOTIFY_EMAIL +#define GAIM_NOTIFY_EMAILS PURPLE_NOTIFY_EMAILS +#define GAIM_NOTIFY_FORMATTED PURPLE_NOTIFY_FORMATTED +#define GAIM_NOTIFY_SEARCHRESULTS PURPLE_NOTIFY_SEARCHRESULTS +#define GAIM_NOTIFY_USERINFO PURPLE_NOTIFY_USERINFO +#define GAIM_NOTIFY_URI PURPLE_NOTIFY_URI + +#define GaimNotifyType PurpleNotifyType + +#define GAIM_NOTIFY_MSG_ERROR PURPLE_NOTIFY_MSG_ERROR +#define GAIM_NOTIFY_MSG_WARNING PURPLE_NOTIFY_MSG_WARNING +#define GAIM_NOTIFY_MSG_INFO PURPLE_NOTIFY_MSG_INFO + +#define GaimNotifyMsgType PurpleNotifyMsgType + +#define GAIM_NOTIFY_BUTTON_LABELED PURPLE_NOTIFY_BUTTON_LABELED +#define GAIM_NOTIFY_BUTTON_CONTINUE PURPLE_NOTIFY_BUTTON_CONTINUE +#define GAIM_NOTIFY_BUTTON_ADD PURPLE_NOTIFY_BUTTON_ADD +#define GAIM_NOTIFY_BUTTON_INFO PURPLE_NOTIFY_BUTTON_INFO +#define GAIM_NOTIFY_BUTTON_IM PURPLE_NOTIFY_BUTTON_IM +#define GAIM_NOTIFY_BUTTON_JOIN PURPLE_NOTIFY_BUTTON_JOIN +#define GAIM_NOTIFY_BUTTON_INVITE PURPLE_NOTIFY_BUTTON_INVITE + +#define GaimNotifySearchButtonType PurpleNotifySearchButtonType + +#define GaimNotifySearchResults PurpleNotifySearchResult + +#define GAIM_NOTIFY_USER_INFO_ENTRY_PAIR PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR +#define GAIM_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK +#define GAIM_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER + +#define GaimNotifyUserInfoEntryType PurpleNotifyUserInfoEntryType + +#define GaimNotifySearchColumn PurpleNotifySearchColumn +#define GaimNotifySearchResultsCallback PurpleNotifySearchResultsCallback +#define GaimNotifySearchButton PurpleNotifySearchButton + +#define GaimNotifyUiOps PurpleNotifyUiOps + +#define gaim_notify_searchresults purple_notify_searchresults +#define gaim_notify_searchresults_free purple_notify_searchresults_free +#define gaim_notify_searchresults_new_rows purple_notify_searchresults_new_rows +#define gaim_notify_searchresults_button_add purple_notify_searchresults_button_add +#define gaim_notify_searchresults_button_add_labeled purple_notify_searchresults_button_add_labeled +#define gaim_notify_searchresults_new purple_notify_searchresults_new +#define gaim_notify_searchresults_column_new purple_notify_searchresults_column_new +#define gaim_notify_searchresults_column_add purple_notify_searchresults_column_add +#define gaim_notify_searchresults_row_add purple_notify_searchresults_row_add +#define gaim_notify_searchresults_get_rows_count purple_notify_searchresults_get_rows_count +#define gaim_notify_searchresults_get_columns_count purple_notify_searchresults_get_columns_count +#define gaim_notify_searchresults_row_get purple_notify_searchresults_row_get +#define gaim_notify_searchresults_column_get_title purple_notify_searchresults_column_get_title + +#define gaim_notify_message purple_notify_message +#define gaim_notify_email purple_notify_email +#define gaim_notify_emails purple_notify_emails +#define gaim_notify_formatted purple_notify_formatted +#define gaim_notify_userinfo purple_notify_userinfo + +#define gaim_notify_user_info_new purple_notify_user_info_new +#define gaim_notify_user_info_destroy purple_notify_user_info_destroy +#define gaim_notify_user_info_get_entries purple_notify_user_info_get_entries +#define gaim_notify_user_info_get_text_with_newline purple_notify_user_info_get_text_with_newline +#define gaim_notify_user_info_add_pair purple_notify_user_info_add_pair +#define gaim_notify_user_info_prepend_pair purple_notify_user_info_prepend_pair +#define gaim_notify_user_info_remove_entry purple_notify_user_info_remove_entry +#define gaim_notify_user_info_entry_new purple_notify_user_info_entry_new +#define gaim_notify_user_info_add_section_break purple_notify_user_info_add_section_break +#define gaim_notify_user_info_add_section_header purple_notify_user_info_add_section_header +#define gaim_notify_user_info_remove_last_item purple_notify_user_info_remove_last_item +#define gaim_notify_user_info_entry_get_label purple_notify_user_info_entry_get_label +#define gaim_notify_user_info_entry_set_label purple_notify_user_info_entry_set_label +#define gaim_notify_user_info_entry_get_value purple_notify_user_info_entry_get_value +#define gaim_notify_user_info_entry_set_value purple_notify_user_info_entry_set_value +#define gaim_notify_user_info_entry_get_type purple_notify_user_info_entry_get_type +#define gaim_notify_user_info_entry_set_type purple_notify_user_info_entry_set_type + +#define gaim_notify_uri purple_notify_uri +#define gaim_notify_close purple_notify_close +#define gaim_notify_close_with_handle purple_notify_close_with_handle + +#define gaim_notify_info purple_notify_info +#define gaim_notify_warning purple_notify_warning +#define gaim_notify_error purple_notify_error + +#define gaim_notify_set_ui_ops purple_notify_set_ui_ops +#define gaim_notify_get_ui_ops purple_notify_get_ui_ops + +#define gaim_notify_get_handle purple_notify_get_handle + +#define gaim_notify_init purple_notify_init +#define gaim_notify_uninit purple_notify_uninit + #endif /* _GAIM_COMPAT_H_ */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/network.c --- a/libpurple/network.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/network.c Wed Jan 31 04:53:52 2007 +0000 @@ -74,6 +74,7 @@ gboolean adding; GaimNetworkListenCallback cb; gpointer cb_data; + UPnPMappingAddRemove *mapping_data; }; #ifdef HAVE_LIBNM @@ -210,28 +211,29 @@ if (listen_data->retry) { listen_data->retry = FALSE; listen_data->adding = FALSE; - /* TODO: Need to keep track of this return value! */ - gaim_upnp_remove_port_mapping( - gaim_network_get_port_from_fd(listen_data->listenfd), - (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP", - gaim_network_set_upnp_port_mapping_cb, listen_data); + listen_data->mapping_data = gaim_upnp_remove_port_mapping( + gaim_network_get_port_from_fd(listen_data->listenfd), + (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP", + gaim_network_set_upnp_port_mapping_cb, listen_data); return; } } else if (!listen_data->adding) { /* We've tried successfully to remove the port mapping. * Try to add it again */ listen_data->adding = TRUE; - /* TODO: Need to keep track of this return value! */ - gaim_upnp_set_port_mapping( - gaim_network_get_port_from_fd(listen_data->listenfd), - (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP", - gaim_network_set_upnp_port_mapping_cb, listen_data); + listen_data->mapping_data = gaim_upnp_set_port_mapping( + gaim_network_get_port_from_fd(listen_data->listenfd), + (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP", + gaim_network_set_upnp_port_mapping_cb, listen_data); return; } if (listen_data->cb) listen_data->cb(listen_data->listenfd, listen_data->cb_data); + /* Clear the UPnP mapping data, since it's complete and gaim_netweork_listen_cancel() will try to cancel + * it otherwise. */ + listen_data->mapping_data = NULL; gaim_network_listen_cancel(listen_data); } @@ -327,11 +329,10 @@ listen_data->cb = cb; listen_data->cb_data = cb_data; - /* TODO: Need to keep track of this return value! */ - gaim_upnp_set_port_mapping( - gaim_network_get_port_from_fd(listenfd), - (socket_type == SOCK_STREAM) ? "TCP" : "UDP", - gaim_network_set_upnp_port_mapping_cb, listen_data); + listen_data->mapping_data = gaim_upnp_set_port_mapping( + gaim_network_get_port_from_fd(listenfd), + (socket_type == SOCK_STREAM) ? "TCP" : "UDP", + gaim_network_set_upnp_port_mapping_cb, listen_data); return listen_data; } @@ -370,6 +371,9 @@ void gaim_network_listen_cancel(GaimNetworkListenData *listen_data) { + if (listen_data->mapping_data != NULL) + gaim_upnp_cancel_port_mapping(listen_data->mapping_data); + g_free(listen_data); } diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugin.c --- a/libpurple/plugin.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugin.c Wed Jan 31 04:53:52 2007 +0000 @@ -1146,6 +1146,8 @@ gaim_plugins_init(void) { void *handle = gaim_plugins_get_handle(); + gaim_plugins_add_search_path(LIBDIR); + gaim_signal_register(handle, "plugin-load", gaim_marshal_VOID__POINTER, NULL, 1, diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/Makefile.am --- a/libpurple/plugins/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -22,7 +22,7 @@ ssl \ $(TCL_DIR) -plugindir = $(libdir)/gaim +plugindir = $(libdir)/libpurple autoaccept_la_LDFLAGS = -module -avoid-version autoreply_la_LDFLAGS = -module -avoid-version diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/ciphertest.c --- a/libpurple/plugins/ciphertest.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/ciphertest.c Wed Jan 31 04:53:52 2007 +0000 @@ -264,9 +264,9 @@ N_("Cipher Test"), /**< name */ VERSION, /**< version */ /** summary */ - N_("Tests the ciphers that ship with gaim."), + N_("Tests the ciphers that ship with libpurple."), /** description */ - N_("Tests the ciphers that ship with gaim."), + N_("Tests the ciphers that ship with libpurple."), "Gary Kramlich ", /**< author */ GAIM_WEBSITE, /**< homepage */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/mono/Makefile.am --- a/libpurple/plugins/mono/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/mono/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -5,7 +5,7 @@ EXTRA_DIST = $(mono_sources) -monodir = $(libdir)/gaim +monodir = $(libdir)/libpurple mono_SCRIPTS = MPlugin.dll GetBuddyBack.dll mono_build_sources = $(addprefix $(srcdir)/, $(mono_sources)) diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/perl/Makefile.am --- a/libpurple/plugins/perl/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/perl/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gaim +plugindir = $(libdir)/libpurple hackdir = $(plugindir)/private perl_dirs = common diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/perl/common/Makefile.mingw --- a/libpurple/plugins/perl/common/Makefile.mingw Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/perl/common/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -9,7 +9,7 @@ TARGET = Gaim AUTOSPLIT = lib/auto/Gaim/autosplit.ix -EXTUTILS := C:/perl/lib/ExtUtils +EXTUTILS ?= C:/perl/lib/ExtUtils PERL_PLUGIN_TOP := .. CFLAGS += -Wno-comment diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/ssl/Makefile.am --- a/libpurple/plugins/ssl/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/ssl/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -plugindir = $(libdir)/gaim +plugindir = $(libdir)/libpurple ssl_la_LDFLAGS = -module -avoid-version ssl_gnutls_la_LDFLAGS = -module -avoid-version diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/plugins/tcl/Makefile.am --- a/libpurple/plugins/tcl/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/plugins/tcl/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gaim +plugindir = $(libdir)/libpurple tcl_la_LDFLAGS = -module -avoid-version diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/prefix.h --- a/libpurple/prefix.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/prefix.h Wed Jan 31 04:53:52 2007 +0000 @@ -76,7 +76,7 @@ #define BINDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/bin"))) #define SBINDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/sbin"))) #define DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) - #define LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib/gaim"))) + #define LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib/libpurple"))) #define LIBEXECDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/libexec"))) #define ETCDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/etc"))) #define SYSCONFDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/etc"))) diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/bonjour/Makefile.am --- a/libpurple/protocols/bonjour/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/bonjour/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple BONJOURSOURCES = \ bonjour.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/bonjour/bonjour.c --- a/libpurple/protocols/bonjour/bonjour.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Wed Jan 31 04:53:52 2007 +0000 @@ -289,19 +289,6 @@ bonjour_jabber_close_conversation(((BonjourData*)(connection->proto_data))->jabber_data, buddy); } -static void -bonjour_list_emblems(GaimBuddy *buddy, - const char **se, const char **sw, - const char **nw, const char **ne) -{ - GaimPresence *presence; - - presence = gaim_buddy_get_presence(buddy); - - if (gaim_presence_is_online(presence) && !gaim_presence_is_available(presence)) - *se = "away"; -} - static char * bonjour_status_text(GaimBuddy *buddy) { @@ -359,7 +346,7 @@ /* {"png", 0, 0, 96, 96, 0, GAIM_ICON_SCALE_DISPLAY}, */ /* icon_spec */ NO_BUDDY_ICONS, /* not yet */ /* icon_spec */ bonjour_list_icon, /* list_icon */ - bonjour_list_emblems, /* list_emblems */ + NULL, /* list_emblem */ bonjour_status_text, /* status_text */ bonjour_tooltip_text, /* tooltip_text */ bonjour_status_types, /* status_types */ @@ -478,7 +465,7 @@ gchar *tmp; tmp = g_locale_to_utf8(fullname, -1, NULL, NULL, NULL); if ((tmp == NULL) || (*tmp == '\0')) - fullname = _("Gaim User"); + fullname = _("Purple Person"); } #else @@ -536,7 +523,7 @@ } if (!fullname) - fullname = g_strdup(_("Gaim User")); + fullname = g_strdup(_("Purple Person")); #endif /* Split the real name into a first and last name */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/gg/Makefile.am --- a/libpurple/protocols/gg/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/gg/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -13,7 +13,7 @@ lib/pubdir50.c \ lib/pubdir.c -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple if USE_INTERNAL_LIBGADU INTGGSOURCES = \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/gg/gg.c --- a/libpurple/protocols/gg/gg.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/gg/gg.c Wed Jan 31 04:53:52 2007 +0000 @@ -1515,31 +1515,6 @@ } /* }}} */ -/* static void ggp_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) {{{ */ -static void ggp_list_emblems(GaimBuddy *b, const char **se, const char **sw, - const char **nw, const char **ne) -{ - GaimPresence *presence = gaim_buddy_get_presence(b); - - /* - * Note to myself: - * The only valid status types are those defined - * in prpl_info->status_types. - * - * Usable icons: away, blocked, dnd, extended_away, - * freeforchat, ignored, invisible, na, offline. - */ - - if (!GAIM_BUDDY_IS_ONLINE(b)) { - *se = "offline"; - } else if (gaim_presence_is_status_primitive_active(presence, GAIM_STATUS_AWAY)) { - *se = "away"; - } else if (gaim_presence_is_status_active(presence, "blocked")) { - *se = "blocked"; - } -} -/* }}} */ - /* static char *ggp_status_text(GaimBuddy *b) {{{ */ static char *ggp_status_text(GaimBuddy *b) { @@ -2081,7 +2056,7 @@ NULL, /* protocol_options */ NO_BUDDY_ICONS, /* icon_spec */ ggp_list_icon, /* list_icon */ - ggp_list_emblems, /* list_emblems */ + NULL, /* list_emblem */ ggp_status_text, /* status_text */ ggp_tooltip_text, /* tooltip_text */ ggp_status_types, /* status_types */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/irc/Makefile.am --- a/libpurple/protocols/irc/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/irc/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,6 +1,6 @@ EXTRA_DIST = PROTOCOL Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple IRCSOURCES = irc.c parse.c cmds.c msgs.c irc.h dcc_send.c diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/irc/cmds.c --- a/libpurple/protocols/irc/cmds.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/irc/cmds.c Wed Jan 31 04:53:52 2007 +0000 @@ -245,8 +245,6 @@ irc_send(irc, buf); g_free(buf); - irc->nameconv = g_strdup(target); - return 0; } diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/irc/irc.c --- a/libpurple/protocols/irc/irc.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/irc/irc.c Wed Jan 31 04:53:52 2007 +0000 @@ -42,7 +42,6 @@ static void irc_buddy_append(char *name, struct irc_buddy *ib, GString *string); static const char *irc_blist_icon(GaimAccount *a, GaimBuddy *b); -static void irc_blist_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne); static GList *irc_status_types(GaimAccount *account); static GList *irc_actions(GaimPlugin *plugin, gpointer context); /* static GList *irc_chat_info(GaimConnection *gc); */ @@ -222,15 +221,6 @@ return "irc"; } -static void irc_blist_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) -{ - GaimPresence *presence = gaim_buddy_get_presence(b); - - if (gaim_presence_is_online(presence) == FALSE) { - *se = "offline"; - } -} - static GList *irc_status_types(GaimAccount *account) { GaimStatusType *type; @@ -813,7 +803,7 @@ NULL, /* protocol_options */ NO_BUDDY_ICONS, /* icon_spec */ irc_blist_icon, /* list_icon */ - irc_blist_emblems, /* list_emblems */ + NULL, /* list_emblems */ NULL, /* status_text */ NULL, /* tooltip_text */ irc_status_types, /* away_states */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/irc/irc.h --- a/libpurple/protocols/irc/irc.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/irc/irc.h Wed Jan 31 04:53:52 2007 +0000 @@ -41,6 +41,8 @@ #define IRC_INITIAL_BUFSIZE 1024 +#define IRC_NAMES_FLAG "irc-namelist" + enum { IRC_USEROPT_SERVER, IRC_USEROPT_PORT, IRC_USEROPT_CHARSET }; enum irc_state { IRC_STATE_NEW, IRC_STATE_ESTABLISHED }; @@ -60,7 +62,6 @@ GString *motd; GString *names; - char *nameconv; struct _whois { char *nick; char *away; @@ -115,13 +116,14 @@ void irc_msg_banned(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from, char **args); -void irc_msg_endmotd(struct irc_conn *irc, const char *name, const char *from, char **args); +void irc_msg_features(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_invite(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_inviteonly(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_ison(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_join(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_kick(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_list(struct irc_conn *irc, const char *name, const char *from, char **args); +void irc_msg_luser(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_mode(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_motd(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_names(struct irc_conn *irc, const char *name, const char *from, char **args); diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/irc/msgs.c --- a/libpurple/protocols/irc/msgs.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/irc/msgs.c Wed Jan 31 04:53:52 2007 +0000 @@ -40,6 +40,8 @@ const char *from, const char *to, const char *rawmsg, gboolean notice); +static char *mode_chars = NULL; + static char *irc_mask_nick(const char *mask) { char *end, *buf; @@ -75,6 +77,77 @@ gaim_debug(GAIM_DEBUG_INFO, "irc", "Unrecognized message: %s\n", args[0]); } +void irc_msg_features(struct irc_conn *irc, const char *name, const char *from, char **args) +{ + gchar **features; + int i; + + if (!args || !args[0] || !args[1]) + return; + + features = g_strsplit(args[1], " ", -1); + for (i = 0; features[i]; i++) { + char *val; + if (!strncmp(features[i], "PREFIX=", 7)) { + if ((val = strchr(features[i] + 7, ')')) != NULL) + mode_chars = g_strdup(val + 1); + } + } +} + +void irc_msg_luser(struct irc_conn *irc, const char *name, const char *from, char **args) +{ + GaimConnection *gc; + GaimStatus *status; + GaimBlistNode *gnode, *cnode, *bnode; + + if (!args || !args[0] || !args[1]) + return; + + gc = gaim_account_get_connection(irc->account); + if (!gc) + return; + + if (!strcmp(name, "251")) { + /* 251 is required, so we pluck our nick from here */ + gaim_connection_set_display_name(gc, args[0]); + } else if (!strcmp(name, "255")) { + gaim_connection_set_state(gc, GAIM_CONNECTED); + + /* If we're away then set our away message */ + status = gaim_account_get_active_status(irc->account); + if (!gaim_status_get_type(status) != GAIM_STATUS_AVAILABLE) { + GaimPluginProtocolInfo *prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info->set_status(irc->account, status); + } + + /* this used to be in the core, but it's not now */ + for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) { + if(!GAIM_BLIST_NODE_IS_GROUP(gnode)) + continue; + for(cnode = gnode->child; cnode; cnode = cnode->next) { + if(!GAIM_BLIST_NODE_IS_CONTACT(cnode)) + continue; + for(bnode = cnode->child; bnode; bnode = bnode->next) { + GaimBuddy *b; + if(!GAIM_BLIST_NODE_IS_BUDDY(bnode)) + continue; + b = (GaimBuddy *)bnode; + if(b->account == gc->account) { + struct irc_buddy *ib = g_new0(struct irc_buddy, 1); + ib->name = g_strdup(b->name); + g_hash_table_insert(irc->buddies, ib->name, ib); + } + } + } + } + + irc_blist_timeout(irc); + if (!irc->timer) + irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc); + } +} + void irc_msg_away(struct irc_conn *irc, const char *name, const char *from, char **args) { GaimConnection *gc; @@ -369,27 +442,23 @@ GaimConversation *convo; if (!strcmp(name, "366")) { - convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, irc->nameconv ? irc->nameconv : args[1], irc->account); + convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, args[1], irc->account); if (!convo) { gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a NAMES list for %s, which doesn't exist\n", args[1]); g_string_free(irc->names, TRUE); irc->names = NULL; - g_free(irc->nameconv); - irc->nameconv = NULL; return; } names = cur = g_string_free(irc->names, FALSE); irc->names = NULL; - if (irc->nameconv) { + if (gaim_conversation_get_data(convo, IRC_NAMES_FLAG)) { msg = g_strdup_printf(_("Users on %s: %s"), args[1], names ? names : ""); if (gaim_conversation_get_type(convo) == GAIM_CONV_TYPE_CHAT) gaim_conv_chat_write(GAIM_CONV_CHAT(convo), "", msg, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL)); else gaim_conv_im_write(GAIM_CONV_IM(convo), "", msg, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL)); g_free(msg); - g_free(irc->nameconv); - irc->nameconv = NULL; } else { GList *users = NULL; GList *flags = NULL; @@ -408,6 +477,9 @@ } else if(*cur == '+') { f = GAIM_CBFLAGS_VOICE; cur++; + } else if(mode_chars + && strchr(mode_chars, *cur)) { + cur++; } tmp = g_strndup(cur, end - cur); users = g_list_prepend(users, tmp); @@ -428,6 +500,9 @@ g_list_free(users); g_list_free(flags); } + + gaim_conversation_set_data(convo, IRC_NAMES_FLAG, + GINT_TO_POINTER(TRUE)); } g_free(names); } else { @@ -442,68 +517,31 @@ void irc_msg_motd(struct irc_conn *irc, const char *name, const char *from, char **args) { - GaimConnection *gc; char *escaped; - if (!strcmp(name, "375")) { - gc = gaim_account_get_connection(irc->account); - if (gc) - gaim_connection_set_display_name(gc, args[0]); - } if (!irc->motd) irc->motd = g_string_new(""); + if (!strcmp(name, "375")) { + if (irc->motd) + g_string_free(irc->motd, TRUE); + irc->motd = g_string_new(""); + return; + } else if (!strcmp(name, "376")) { + /* We no longer have to do anything for ENDMOTD */ + return; + } + + if (!irc->motd) { + gaim_debug_error("irc", "IRC server sent MOTD without STARTMOTD\n"); + return; + } + escaped = g_markup_escape_text(args[1], -1); g_string_append_printf(irc->motd, "%s
", escaped); g_free(escaped); } -void irc_msg_endmotd(struct irc_conn *irc, const char *name, const char *from, char **args) -{ - GaimConnection *gc; - GaimStatus *status; - GaimBlistNode *gnode, *cnode, *bnode; - - gc = gaim_account_get_connection(irc->account); - if (!gc) - return; - - gaim_connection_set_state(gc, GAIM_CONNECTED); - - /* If we're away then set our away message */ - status = gaim_account_get_active_status(irc->account); - if (!gaim_status_get_type(status) != GAIM_STATUS_AVAILABLE) - { - GaimPluginProtocolInfo *prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - prpl_info->set_status(irc->account, status); - } - - /* this used to be in the core, but it's not now */ - for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) { - if(!GAIM_BLIST_NODE_IS_GROUP(gnode)) - continue; - for(cnode = gnode->child; cnode; cnode = cnode->next) { - if(!GAIM_BLIST_NODE_IS_CONTACT(cnode)) - continue; - for(bnode = cnode->child; bnode; bnode = bnode->next) { - GaimBuddy *b; - if(!GAIM_BLIST_NODE_IS_BUDDY(bnode)) - continue; - b = (GaimBuddy *)bnode; - if(b->account == gc->account) { - struct irc_buddy *ib = g_new0(struct irc_buddy, 1); - ib->name = g_strdup(b->name); - g_hash_table_insert(irc->buddies, ib->name, ib); - } - } - } - } - - irc_blist_timeout(irc); - if (!irc->timer) - irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc); -} - void irc_msg_time(struct irc_conn *irc, const char *name, const char *from, char **args) { GaimConnection *gc; @@ -684,10 +722,13 @@ convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, args[0], irc->account); + if (convo == NULL) { gaim_debug_error("irc", "tried to join %s but couldn't\n", args[0]); return; } + gaim_conversation_set_data(convo, IRC_NAMES_FLAG, + GINT_TO_POINTER(FALSE)); gaim_conversation_present(convo); return; } diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/irc/parse.c --- a/libpurple/protocols/irc/parse.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/irc/parse.c Wed Jan 31 04:53:52 2007 +0000 @@ -52,6 +52,9 @@ char *format; void (*cb)(struct irc_conn *irc, const char *name, const char *from, char **args); } _irc_msgs[] = { + { "005", "n*", irc_msg_features }, /* Feature list */ + { "251", "n:", irc_msg_luser }, /* Client & Server count */ + { "255", "n:", irc_msg_luser }, /* Client & Server count Mk. II */ { "301", "nn:", irc_msg_away }, /* User is away */ { "303", "n:", irc_msg_ison }, /* ISON reply */ { "311", "nnvvv:", irc_msg_whois }, /* Whois user */ @@ -72,13 +75,12 @@ { "366", "nc:", irc_msg_names }, /* End of names */ { "372", "n:", irc_msg_motd }, /* MOTD */ { "375", "n:", irc_msg_motd }, /* Start MOTD */ - { "376", "n:", irc_msg_endmotd }, /* End of MOTD */ + { "376", "n:", irc_msg_motd }, /* End of MOTD */ { "391", "nv:", irc_msg_time }, /* Time reply */ { "401", "nt:", irc_msg_nonick }, /* No such nick/chan */ { "403", "nc:", irc_msg_nochan }, /* No such channel */ { "404", "nt:", irc_msg_nosend }, /* Cannot send to chan */ { "421", "nv:", irc_msg_unknown }, /* Unknown command */ - { "422", "nv:", irc_msg_endmotd }, /* No MOTD available */ { "432", "vn:", irc_msg_badnick }, /* Erroneous nickname */ { "433", "vn:", irc_msg_nickused }, /* Nickname already in use */ { "437", "nc:", irc_msg_unavailable }, /* Nick/channel is unavailable */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/jabber/Makefile.am --- a/libpurple/protocols/jabber/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/jabber/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -3,7 +3,7 @@ win32/posix.uname.c \ win32/utsname.h -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple JABBERSOURCES = auth.c \ auth.h \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/jabber/google.c --- a/libpurple/protocols/jabber/google.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Wed Jan 31 04:53:52 2007 +0000 @@ -206,7 +206,7 @@ } -void jabber_google_roster_incoming(JabberStream *js, xmlnode *item) +gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item) { GaimAccount *account = gaim_connection_get_account(js->gc); GSList *list = account->deny; @@ -225,6 +225,12 @@ list = list->next; } + if (grt && (*grt == 'H' || *grt == 'h')) { + GaimBuddy *buddy = gaim_find_buddy(account, jid_norm); + gaim_blist_remove_buddy(buddy); + return FALSE; + } + if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) { gaim_debug_info("jabber", "Blocking %s\n", jid_norm); gaim_privacy_deny_add(account, jid_norm, TRUE); @@ -232,6 +238,7 @@ gaim_debug_info("jabber", "Unblocking %s\n", jid_norm); gaim_privacy_deny_remove(account, jid_norm, TRUE); } + return TRUE; } void jabber_google_roster_add_deny(GaimConnection *gc, const char *who) diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/jabber/google.h --- a/libpurple/protocols/jabber/google.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/jabber/google.h Wed Jan 31 04:53:52 2007 +0000 @@ -31,7 +31,11 @@ void jabber_google_roster_init(JabberStream *js); void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item); -void jabber_google_roster_incoming(JabberStream *js, xmlnode *item); + +/* Returns FALSE if this should short-circuit processing of this roster item, or TRUE + * if this roster item should continue to be processed + */ +gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item); void jabber_google_roster_add_deny(GaimConnection *gc, const char *who); void jabber_google_roster_rem_deny(GaimConnection *gc, const char *who); diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed Jan 31 04:53:52 2007 +0000 @@ -1068,8 +1068,7 @@ return "jabber"; } -static void jabber_list_emblems(GaimBuddy *b, const char **se, const char **sw, - const char **nw, const char **ne) +static const char* jabber_list_emblem(GaimBuddy *b) { JabberStream *js; JabberBuddy *jb = NULL; @@ -1081,22 +1080,11 @@ jb = jabber_buddy_find(js, b->name, FALSE); if(!GAIM_BUDDY_IS_ONLINE(b)) { - if(jb && jb->error_msg) - *nw = "error"; - if(jb && (jb->subscription & JABBER_SUB_PENDING || !(jb->subscription & JABBER_SUB_TO))) - *se = "notauthorized"; - else - *se = "offline"; - } else { - GaimStatusType *status_type = gaim_status_get_type(gaim_presence_get_active_status(gaim_buddy_get_presence(b))); - GaimStatusPrimitive primitive = gaim_status_type_get_primitive(status_type); - - if(primitive > GAIM_STATUS_AVAILABLE) { - *se = gaim_status_type_get_id(status_type); - } + return "not-authorized"; } + return NULL; } static char *jabber_status_text(GaimBuddy *b) @@ -1853,7 +1841,7 @@ NULL, /* protocol_options */ {"png,gif,jpeg", 32, 32, 96, 96, 8191, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ jabber_list_icon, /* list_icon */ - jabber_list_emblems, /* list_emblems */ + jabber_list_emblem, /* list_emblems */ jabber_status_text, /* status_text */ jabber_tooltip_text, /* tooltip_text */ jabber_status_types, /* status_types */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/jabber/roster.c --- a/libpurple/protocols/jabber/roster.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/jabber/roster.c Wed Jan 31 04:53:52 2007 +0000 @@ -226,7 +226,8 @@ groups = g_slist_append(groups, group_name); } if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) - jabber_google_roster_incoming(js, item); + if (!jabber_google_roster_incoming(js, item)) + continue; add_gaim_buddies_in_groups(js, jid, name, groups); } } diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/msn/Makefile.am --- a/libpurple/protocols/msn/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/msn/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple MSNSOURCES = \ cmdproc.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Wed Jan 31 04:53:52 2007 +0000 @@ -479,40 +479,14 @@ return "msn"; } -static void -msn_list_emblems(GaimBuddy *b, const char **se, const char **sw, - const char **nw, const char **ne) +static const char* +msn_list_emblem(GaimBuddy *b) { MsnUser *user; - GaimPresence *presence; - const char *emblems[4] = { NULL, NULL, NULL, NULL }; - int i = 0; - user = b->proto_data; - presence = gaim_buddy_get_presence(b); - - if (!gaim_presence_is_online(presence)) - emblems[i++] = "offline"; - else if (gaim_presence_is_status_active(presence, "busy") || - gaim_presence_is_status_active(presence, "phone")) - emblems[i++] = "occupied"; - else if (!gaim_presence_is_available(presence)) - emblems[i++] = "away"; - - if (user == NULL) - { - emblems[0] = "offline"; - } - else - { - if (user->mobile) - emblems[i++] = "wireless"; - } - - *se = emblems[0]; - *sw = emblems[1]; - *nw = emblems[2]; - *ne = emblems[3]; + if (user && user->mobile) + return "mobile"; + return NULL; } static char * @@ -723,9 +697,7 @@ gc->wants_to_die = TRUE; gaim_connection_error(gc, _("SSL support is needed for MSN. Please install a supported " - "SSL library. See http://gaim.sf.net/faq-ssl.php for more " - "information.")); - + "SSL library.")); return; } @@ -1958,7 +1930,7 @@ NULL, /* protocol_options */ {"png", 0, 0, 96, 96, 0, GAIM_ICON_SCALE_SEND}, /* icon_spec */ msn_list_icon, /* list_icon */ - msn_list_emblems, /* list_emblems */ + msn_list_emblem, /* list_emblems */ msn_status_text, /* status_text */ msn_tooltip_text, /* tooltip_text */ msn_status_types, /* away_states */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/novell/Makefile.am --- a/libpurple/protocols/novell/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/novell/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple NOVELLSOURCES = \ nmfield.h \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/novell/novell.c --- a/libpurple/protocols/novell/novell.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Wed Jan 31 04:53:52 2007 +0000 @@ -2783,40 +2783,6 @@ } } -static void -novell_list_emblems(GaimBuddy * buddy, const char **se, const char **sw, const char **nw, const char **ne) -{ - NMUserRecord *user_record = NULL; - GaimConnection *gc; - NMUser *user; - int status = 0; - - gc = gaim_account_get_connection(buddy->account); - - if (gc == NULL || (user = gc->proto_data) == NULL) - return; - - user_record = nm_find_user_record(user, buddy->name); - - if (user_record) - status = nm_user_record_get_status(user_record); - - switch (status) { - case NM_STATUS_AVAILABLE: - *se = ""; - break; - case NM_STATUS_AWAY: - *se = "away"; - break; - case NM_STATUS_BUSY: - *se = "occupied"; - break; - case NM_STATUS_UNKNOWN: - *se = "error"; - break; - } -} - static const char * novell_list_icon(GaimAccount * account, GaimBuddy * buddy) { @@ -3472,7 +3438,7 @@ NULL, /* protocol_options */ NO_BUDDY_ICONS, /* icon_spec */ novell_list_icon, /* list_icon */ - novell_list_emblems, /* list_emblems */ + NULL, /* list_emblems */ novell_status_text, /* status_text */ novell_tooltip_text, /* tooltip_text */ novell_status_types, /* status_types */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/oscar/Makefile.am --- a/libpurple/protocols/oscar/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/oscar/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -3,7 +3,7 @@ AUTHORS \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple OSCARSOURCES = \ bstream.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/oscar/libaim.c --- a/libpurple/protocols/oscar/libaim.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/oscar/libaim.c Wed Jan 31 04:53:52 2007 +0000 @@ -35,7 +35,7 @@ {"gif,jpeg,bmp,ico", 48, 48, 50, 50, 7168, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ oscar_list_icon_aim, /* list_icon */ - oscar_list_emblems, /* list_emblems */ + oscar_list_emblem, /* list_emblems */ oscar_status_text, /* status_text */ oscar_tooltip_text, /* tooltip_text */ oscar_status_types, /* status_types */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/oscar/libicq.c --- a/libpurple/protocols/oscar/libicq.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/oscar/libicq.c Wed Jan 31 04:53:52 2007 +0000 @@ -35,7 +35,7 @@ {"gif,jpeg,bmp,ico", 48, 48, 50, 50, 7168, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ oscar_list_icon_icq, /* list_icon */ - oscar_list_emblems, /* list_emblems */ + oscar_list_emblem, /* list_emblems */ oscar_status_text, /* status_text */ oscar_tooltip_text, /* tooltip_text */ oscar_status_types, /* status_types */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Jan 31 04:53:52 2007 +0000 @@ -4503,9 +4503,9 @@ gchar *errstr; errstr = g_strdup_printf(ngettext("The maximum away message length of %d byte " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. It has been truncated for you.", "The maximum away message length of %d bytes " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. It has been truncated for you.", od->rights.maxawaymsglen), od->rights.maxawaymsglen); gaim_notify_warning(gc, NULL, _("Away message too long."), errstr); g_free(errstr); @@ -5397,7 +5397,7 @@ return "aim"; } -void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) +const char* oscar_list_emblem(GaimBuddy *b) { GaimConnection *gc = NULL; OscarData *od = NULL; @@ -5405,8 +5405,6 @@ GaimPresence *presence; GaimStatus *status; const char *status_id; - char *emblems[4] = {NULL,NULL,NULL,NULL}; - int i = 0; aim_userinfo_t *userinfo = NULL; account = b->account; @@ -5426,52 +5424,25 @@ if ((b->name) && (od) && (od->ssi.received_data) && (gname = aim_ssi_itemlist_findparentname(od->ssi.local, b->name)) && (aim_ssi_waitingforauth(od->ssi.local, gname, b->name))) { - emblems[i++] = "notauthorized"; - } else { - emblems[i++] = "offline"; + return "not-authorized"; } } - - if (b->name && aim_sn_is_icq(b->name)) { - if (!strcmp(status_id, OSCAR_STATUS_ID_INVISIBLE)) - emblems[i++] = "invisible"; - else if (!strcmp(status_id, OSCAR_STATUS_ID_FREE4CHAT)) - emblems[i++] = "freeforchat"; - else if (!strcmp(status_id, OSCAR_STATUS_ID_DND)) - emblems[i++] = "dnd"; - else if (!strcmp(status_id, OSCAR_STATUS_ID_NA)) - emblems[i++] = "unavailable"; - else if (!strcmp(status_id, OSCAR_STATUS_ID_OCCUPIED)) - emblems[i++] = "occupied"; - else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY)) - emblems[i++] = "away"; - } else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY)) { - emblems[i++] = "away"; - } - + if (userinfo != NULL ) { - /* if (userinfo->flags & AIM_FLAG_UNCONFIRMED) - emblems[i++] = "unconfirmed"; */ - if ((i < 4) && userinfo->flags & AIM_FLAG_ADMINISTRATOR) - emblems[i++] = "admin"; - if ((i < 4) && userinfo->flags & AIM_FLAG_AOL) - emblems[i++] = "aol"; - if ((i < 4) && userinfo->flags & AIM_FLAG_WIRELESS) - emblems[i++] = "wireless"; - if ((i < 4) && userinfo->flags & AIM_FLAG_ACTIVEBUDDY) - emblems[i++] = "activebuddy"; - - if ((i < 4) && (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)) - emblems[i++] = "hiptop"; - - if ((i < 4) && (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM)) - emblems[i++] = "secure"; - } - - *se = emblems[0]; - *sw = emblems[1]; - *nw = emblems[2]; - *ne = emblems[3]; + if (userinfo->flags & AIM_FLAG_ADMINISTRATOR) + return "admin"; + if (userinfo->flags & AIM_FLAG_WIRELESS) + return "mobile"; + if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP) + return "mobile"; + if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY) + return "bot"; + if (userinfo->flags & AIM_FLAG_AOL) + return "aolclient"; + if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM) + return "secure"; + } + return NULL; } void oscar_tooltip_text(GaimBuddy *b, GaimNotifyUserInfo *user_info, gboolean full) { diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/oscar/oscarcommon.h --- a/libpurple/protocols/oscar/oscarcommon.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/oscar/oscarcommon.h Wed Jan 31 04:53:52 2007 +0000 @@ -47,7 +47,7 @@ #endif const char *oscar_list_icon_icq(GaimAccount *a, GaimBuddy *b); const char *oscar_list_icon_aim(GaimAccount *a, GaimBuddy *b); -void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne); +const char* oscar_list_emblem(GaimBuddy *b); char *oscar_status_text(GaimBuddy *b); void oscar_tooltip_text(GaimBuddy *b, GaimNotifyUserInfo *user_info, gboolean full); GList *oscar_status_types(GaimAccount *account); diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/qq/Makefile.am --- a/libpurple/protocols/qq/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/qq/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple QQSOURCES = \ buddy_info.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/qq/buddy_info.c --- a/libpurple/protocols/qq/buddy_info.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Wed Jan 31 04:53:52 2007 +0000 @@ -562,7 +562,7 @@ gint prefix_len = strlen(QQ_ICON_PREFIX); gint suffix_len = strlen(QQ_ICON_SUFFIX); gint dir_len = strlen(buddy_icon_dir); - gchar *errmsg = g_strconcat(_("You are attempting to set a custom face. Gaim currently only allows the standard faces. Please choose an image from "), buddy_icon_dir, ".", NULL); + gchar *errmsg = g_strconcat(_("Setting custom faces is not currently supported. Please choose an image from "), buddy_icon_dir, ".", NULL); gboolean icon_global = gaim_account_get_bool(gc->account, "use-global-buddyicon", TRUE); if (!icon_path) diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/qq/qq.c --- a/libpurple/protocols/qq/qq.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/qq/qq.c Wed Jan 31 04:53:52 2007 +0000 @@ -250,38 +250,24 @@ } /* we can show tiny icons on the four corners of buddy icon, */ -static void _qq_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) +static const char *_qq_list_emblem(GaimBuddy *b) { /* each char** are refering to a filename in pixmaps/gaim/status/default/ */ qq_buddy *q_bud = b->proto_data; - const char *emblems[4] = { NULL, NULL, NULL, NULL }; - int i = 1; - if (q_bud == NULL) { - emblems[0] = "offline"; - } else { - if (q_bud->status == QQ_BUDDY_ONLINE_AWAY) - emblems[i++] = "away"; - /* + if (q_bud) { + if (q_bud->comm_flag & QQ_COMM_FLAG_BIND_MOBILE) + return "mobile"; if (q_bud->comm_flag & QQ_COMM_FLAG_QQ_MEMBER) - emblems[i++] = "qq_member"; - */ - if (q_bud->comm_flag & QQ_COMM_FLAG_BIND_MOBILE) - emblems[i++] = "wireless"; + return "qq_member"; /* if (q_bud->comm_flag & QQ_COMM_FLAG_VIDEO) - emblems[i%4] = "video"; + return "video"; */ - } - *se = emblems[0]; - *sw = emblems[1]; - *nw = emblems[2]; - *ne = emblems[3]; - - return; + return NULL; } /* QQ away status (used to initiate QQ away packet) */ @@ -655,7 +641,7 @@ NULL, /* protocol_options */ {"png", 96, 96, 96, 96, 0, GAIM_ICON_SCALE_SEND}, /* icon_spec */ _qq_list_icon, /* list_icon */ - _qq_list_emblems, /* list_emblems */ + _qq_list_emblem, /* list_emblems */ _qq_status_text, /* status_text */ _qq_tooltip_text, /* tooltip_text */ _qq_away_states, /* away_states */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/sametime/Makefile.am --- a/libpurple/protocols/sametime/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/sametime/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -2,7 +2,7 @@ EXTRA_DIST = Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple noinst_HEADERS = sametime.h diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/sametime/sametime.c --- a/libpurple/protocols/sametime/sametime.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Wed Jan 31 04:53:52 2007 +0000 @@ -3171,33 +3171,12 @@ } -static void mw_prpl_list_emblems(GaimBuddy *b, - const char **se, const char **sw, - const char **nw, const char **ne) { - - /* speaking of custom icons, the external icon here is an ugly - little example of what happens when I use Gimp */ - - GaimPresence *presence; - GaimStatus *status; - const char *status_id; - - presence = gaim_buddy_get_presence(b); - status = gaim_presence_get_active_status(presence); - status_id = gaim_status_get_id(status); - - if(! GAIM_BUDDY_IS_ONLINE(b)) { - *se = "offline"; - } else if(!strcmp(status_id, MW_STATE_AWAY)) { - *se = "away"; - } else if(!strcmp(status_id, MW_STATE_BUSY)) { - *se = "dnd"; - } - - if(buddy_is_external(b)) { - /* best assignment ever */ - *(*se?sw:se) = "external"; - } +static const char* mw_prpl_list_emblem(GaimBuddy *b) +{ + if(buddy_is_external(b)) + return "external"; + + return NULL; } @@ -5098,7 +5077,7 @@ .protocol_options = NULL, /*< set in mw_plugin_init */ .icon_spec = NO_BUDDY_ICONS, .list_icon = mw_prpl_list_icon, - .list_emblems = mw_prpl_list_emblems, + .list_emblem = mw_prpl_list_emblem, .status_text = mw_prpl_status_text, .tooltip_text = mw_prpl_tooltip_text, .status_types = mw_prpl_status_types, diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/silc/Makefile.am --- a/libpurple/protocols/silc/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/silc/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,6 +1,6 @@ EXTRA_DIST = README TODO Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple SILCSOURCES = silc.c silcgaim.h buddy.c chat.c ft.c ops.c pk.c util.c wb.c wb.h diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/silc/silc.c --- a/libpurple/protocols/silc/silc.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Wed Jan 31 04:53:52 2007 +0000 @@ -32,12 +32,6 @@ return (const char *)"silc"; } -static void -silcgaim_list_emblems(GaimBuddy *b, const char **se, const char **sw, - const char **nw, const char **ne) -{ -} - static GList * silcgaim_away_states(GaimAccount *account) { @@ -1739,7 +1733,7 @@ NO_BUDDY_ICONS, #endif silcgaim_list_icon, /* list_icon */ - silcgaim_list_emblems, /* list_emblems */ + NULL, /* list_emblems */ silcgaim_status_text, /* status_text */ silcgaim_tooltip_text, /* tooltip_text */ silcgaim_away_states, /* away_states */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/simple/Makefile.am --- a/libpurple/protocols/simple/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/simple/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple SIMPLESOURCES = \ simple.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/toc/Makefile.am --- a/libpurple/protocols/toc/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/toc/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -2,7 +2,7 @@ PROTOCOL \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple TOCSOURCES = toc.c diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/toc/toc.c --- a/libpurple/protocols/toc/toc.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/toc/toc.c Wed Jan 31 04:53:52 2007 +0000 @@ -1515,28 +1515,15 @@ return "aim"; } -static void toc_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) +static const char* toc_list_emblem(GaimBuddy *b) { - char *emblems[4] = {NULL,NULL,NULL,NULL}; - int i = 0; - - if (!GAIM_BUDDY_IS_ONLINE(b)) { - *se = "offline"; - return; - } else { - if (b->uc & UC_UNAVAILABLE) - emblems[i++] = "away"; - if (b->uc & UC_AOL) - emblems[i++] = "aol"; - if (b->uc & UC_ADMIN) - emblems[i++] = "admin"; - if (b->uc & UC_WIRELESS) - emblems[i++] = "wireless"; - } - *se = emblems[0]; - *sw = emblems[1]; - *nw = emblems[2]; - *ne = emblems[3]; + if (b->uc & UC_AOL) + return "aol"; + if (b->uc & UC_ADMIN) + return "admin"; + if (b->uc & UC_WIRELESS) + return "mobile"; + return NULL } static GList *toc_blist_node_menu(GaimBlistNode *node) @@ -2243,7 +2230,7 @@ NULL, /* protocol_options */ NO_BUDDY_ICONS, /* icon_spec */ toc_list_icon, /* list_icon */ - toc_list_emblems, /* list_emblems */ + toc_list_emblem, /* list_emblems */ NULL, /* status_text */ NULL, /* tooltip_text */ toc_away_states, /* away_states */ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/yahoo/Makefile.am --- a/libpurple/protocols/yahoo/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/yahoo/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple YAHOOSOURCES = \ util.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/yahoo/yahoo.c --- a/libpurple/protocols/yahoo/yahoo.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Wed Jan 31 04:53:52 2007 +0000 @@ -2801,10 +2801,8 @@ return "yahoo"; } -static void yahoo_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) +static const char *yahoo_list_emblem(GaimBuddy *b) { - int i = 0; - char *emblems[4] = {NULL,NULL,NULL,NULL}; GaimAccount *account; GaimConnection *gc; struct yahoo_data *yd; @@ -2817,29 +2815,20 @@ f = yahoo_friend_find(gc, b->name); if (!f) { - *se = "notauthorized"; - return; + return "not-authorized"; } presence = gaim_buddy_get_presence(b); - if (gaim_presence_is_online(presence) == FALSE) { - *se = "offline"; - return; - } else { - if (f->away) - emblems[i++] = "away"; + if (gaim_presence_is_online(presence)) { if (f->sms) - emblems[i++] = "wireless"; + return "mobile"; if (yahoo_friend_get_game(f)) - emblems[i++] = "game"; + return "game"; if (f->protocol == 2) - emblems[i] = "msn"; + return "msn"; } - *se = emblems[0]; - *sw = emblems[1]; - *nw = emblems[2]; - *ne = emblems[3]; + return NULL; } static const char *yahoo_get_status_string(enum yahoo_status a) @@ -3816,7 +3805,7 @@ NULL, /* protocol_options */ {"png,gif,jpeg", 96, 96, 96, 96, 0, GAIM_ICON_SCALE_SEND}, yahoo_list_icon, - yahoo_list_emblems, + yahoo_list_emblem, yahoo_status_text, yahoo_tooltip_text, yahoo_status_types, diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/protocols/zephyr/Makefile.am --- a/libpurple/protocols/zephyr/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/protocols/zephyr/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,4 +1,4 @@ -pkgdir = $(libdir)/gaim +pkgdir = $(libdir)/libpurple ZEPHYRSOURCES = \ ZAsyncLocate.c \ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/prpl.h --- a/libpurple/prpl.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/prpl.h Wed Jan 31 04:53:52 2007 +0000 @@ -184,8 +184,7 @@ * Fills the four char**'s with string identifiers for "emblems" * that the UI will interpret and display as relevant */ - void (*list_emblems)(GaimBuddy *buddy, const char **se, const char **sw, - const char **nw, const char **ne); + const char *(*list_emblem)(GaimBuddy *buddy); /** * Gets a short string representing this buddy's status. This will diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/tests/Makefile.am --- a/libpurple/tests/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/tests/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -9,7 +9,7 @@ test_cipher.c \ test_jabber_jutil.c \ test_util.c \ - $(top_builddir)/libgaim/util.h + $(top_builddir)/libpurple/util.h check_libgaim_CFLAGS=\ @CHECK_CFLAGS@ \ @@ -20,7 +20,7 @@ check_libgaim_LDADD=\ @CHECK_LIBS@ \ $(GLIB_LIBS) \ - $(top_builddir)/libgaim/protocols/jabber/libjabber.la \ - $(top_builddir)/libgaim/libgaim.la + $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ + $(top_builddir)/libpurple/libgaim.la endif diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/upnp.c --- a/libpurple/upnp.c Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/upnp.c Wed Jan 31 04:53:52 2007 +0000 @@ -131,13 +131,16 @@ gchar *full_url; } UPnPDiscoveryData; -typedef struct { +struct _UPnPMappingAddRemove +{ unsigned short portmap; gchar protocol[4]; gboolean add; GaimUPnPCallback cb; gpointer cb_data; -} UPnPMappingAddRemove; + guint tima; /* gaim_timeout_add handle */ + GaimUtilFetchUrlData *gfud; +}; static GaimUPnPControlInfo control_info = { GAIM_UPNP_STATUS_UNDISCOVERED, @@ -666,12 +669,12 @@ gaim_upnp_discover_send_broadcast(dd); } -static void +static GaimUtilFetchUrlData* gaim_upnp_generate_action_message_and_send(const gchar* actionName, const gchar* actionParams, GaimUtilFetchUrlCallback cb, gpointer cb_data) { - + GaimUtilFetchUrlData* gfud; gchar* soapMessage; gchar* totalSendMessage; gchar* pathOfControl; @@ -703,11 +706,13 @@ g_free(pathOfControl); g_free(soapMessage); - gaim_util_fetch_url_request(control_info.control_url, FALSE, NULL, TRUE, - totalSendMessage, TRUE, cb, cb_data); + gfud = gaim_util_fetch_url_request(control_info.control_url, FALSE, NULL, TRUE, + totalSendMessage, TRUE, cb, cb_data); g_free(totalSendMessage); g_free(addressOfControl); + + return gfud; } const gchar * @@ -884,8 +889,8 @@ ar->portmap, ar->protocol); } - gaim_upnp_generate_action_message_and_send(action_name, - action_params, done_port_mapping_cb, ar); + ar->gfud = gaim_upnp_generate_action_message_and_send(action_name, + action_params, done_port_mapping_cb, ar); g_free(action_params); return; @@ -904,7 +909,33 @@ return FALSE; } -void +void gaim_upnp_cancel_port_mapping(UPnPMappingAddRemove *ar) +{ + GSList *l; + + /* Remove ar from discovery_callbacks if present; it was inserted after a cb. + * The same cb may be in the list multple times, so be careful to remove the one assocaited with ar. */ + l = discovery_callbacks; + while (l) + { + if (l->next && (l->next->data == ar)) { + discovery_callbacks = g_slist_delete_link(discovery_callbacks, l->next); + discovery_callbacks = g_slist_delete_link(discovery_callbacks, l); + } + + l = l->next; + } + + if (ar->tima > 0) + gaim_timeout_remove(ar->tima); + + if (ar->gfud) + gaim_util_fetch_url_cancel(ar->gfud); + + g_free(ar); +} + +UPnPMappingAddRemove * gaim_upnp_set_port_mapping(unsigned short portmap, const gchar* protocol, GaimUPnPCallback cb, gpointer cb_data) { @@ -925,7 +956,7 @@ discovery_callbacks, do_port_mapping_cb); discovery_callbacks = g_slist_append( discovery_callbacks, ar); - return; + return ar; } /* If we haven't had a successful UPnP discovery, check if 5 minutes has @@ -934,22 +965,24 @@ (control_info.status == GAIM_UPNP_STATUS_UNABLE_TO_DISCOVER && (time(NULL) - control_info.lookup_time) > 300)) { gaim_upnp_discover(do_port_mapping_cb, ar); - return; + return ar; } else if(control_info.status == GAIM_UPNP_STATUS_UNABLE_TO_DISCOVER) { if (cb) { /* Asynchronously trigger a failed response */ - gaim_timeout_add(10, fire_port_mapping_failure_cb, ar); + ar->tima = gaim_timeout_add(10, fire_port_mapping_failure_cb, ar); } else { /* No need to do anything if nobody expects a response*/ g_free(ar); + ar = NULL; } - return; + return ar; } do_port_mapping_cb(TRUE, ar); + return ar; } -void +UPnPMappingAddRemove * gaim_upnp_remove_port_mapping(unsigned short portmap, const char* protocol, GaimUPnPCallback cb, gpointer cb_data) { @@ -968,7 +1001,7 @@ discovery_callbacks, do_port_mapping_cb); discovery_callbacks = g_slist_append( discovery_callbacks, ar); - return; + return ar; } /* If we haven't had a successful UPnP discovery, check if 5 minutes has @@ -977,17 +1010,19 @@ (control_info.status == GAIM_UPNP_STATUS_UNABLE_TO_DISCOVER && (time(NULL) - control_info.lookup_time) > 300)) { gaim_upnp_discover(do_port_mapping_cb, ar); - return; + return ar; } else if(control_info.status == GAIM_UPNP_STATUS_UNABLE_TO_DISCOVER) { if (cb) { /* Asynchronously trigger a failed response */ - gaim_timeout_add(10, fire_port_mapping_failure_cb, ar); + ar->tima = gaim_timeout_add(10, fire_port_mapping_failure_cb, ar); } else { /* No need to do anything if nobody expects a response*/ g_free(ar); + ar = NULL; } - return; + return ar; } do_port_mapping_cb(TRUE, ar); + return ar; } diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/upnp.h --- a/libpurple/upnp.h Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/upnp.h Wed Jan 31 04:53:52 2007 +0000 @@ -26,6 +26,7 @@ #ifndef _GAIM_UPNP_H_ #define _GAIM_UPNP_H_ +typedef struct _UPnPMappingAddRemove UPnPMappingAddRemove; #ifdef __cplusplus extern "C" { @@ -74,6 +75,14 @@ const gchar* gaim_upnp_get_public_ip(void); /** + * Cancel a pending port mapping request initiated with either + * gaim_upnp_set_port_mapping() or gaim_upnp_remove_port_mapping(). + * + * @param mapping_data The data returned when you initiated the UPnP mapping request. + */ +void gaim_upnp_cancel_port_mapping(UPnPMappingAddRemove *mapping_data); + +/** * Maps Ports in a UPnP enabled IGD that sits on the local network to * this gaim client. Essentially, this function takes care of the port * forwarding so things like file transfers can work behind NAT firewalls @@ -83,8 +92,10 @@ * @param cb an optional callback function to be notified when the mapping * addition is complete * @param cb_data Extra data to be passed to the callback + * + * @return Data which can be passed to gaim_upnp_port_mapping_cancel() to cancel */ -void gaim_upnp_set_port_mapping(unsigned short portmap, const gchar* protocol, +UPnPMappingAddRemove *gaim_upnp_set_port_mapping(unsigned short portmap, const gchar* protocol, GaimUPnPCallback cb, gpointer cb_data); /** @@ -98,8 +109,10 @@ * @param cb an optional callback function to be notified when the mapping * removal is complete * @param cb_data Extra data to be passed to the callback + * + * @return Data which can be passed to gaim_upnp_port_mapping_cancel() to cancel */ -void gaim_upnp_remove_port_mapping(unsigned short portmap, +UPnPMappingAddRemove *gaim_upnp_remove_port_mapping(unsigned short portmap, const gchar* protocol, GaimUPnPCallback cb, gpointer cb_data); /*@}*/ diff -r ce0cd7474b64 -r 4222b5790e0b libpurple/win32/global.mak --- a/libpurple/win32/global.mak Wed Jan 31 01:48:35 2007 +0000 +++ b/libpurple/win32/global.mak Wed Jan 31 04:53:52 2007 +0000 @@ -5,20 +5,23 @@ # wide definitions (after correctly defining GAIM_TOP). # +#include optional $(GAIM_TOP)/local.mak to allow overriding of any definitions +-include $(GAIM_TOP)/local.mak + # Locations of our various dependencies -WIN32_DEV_TOP := $(GAIM_TOP)/../win32-dev -ASPELL_TOP := $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3 -GTKSPELL_TOP := $(WIN32_DEV_TOP)/gtkspell-2.0.6 -GTK_TOP := $(WIN32_DEV_TOP)/gtk_2_0 -GTK_BIN := $(GTK_TOP)/bin -HOWL_TOP := $(WIN32_DEV_TOP)/howl-1.0.0 -LIBXML2_TOP := $(WIN32_DEV_TOP)/libxml2 -MEANWHILE_TOP := $(WIN32_DEV_TOP)/meanwhile-1.0.2 -NSPR_TOP := $(WIN32_DEV_TOP)/nspr-4.6.4 -NSS_TOP := $(WIN32_DEV_TOP)/nss-3.11.4 -PERL_LIB_TOP := $(WIN32_DEV_TOP)/perl58 -SILC_TOOLKIT := $(WIN32_DEV_TOP)/silc-toolkit-1.0.2 -TCL_LIB_TOP := $(WIN32_DEV_TOP)/tcl-8.4.5 +WIN32_DEV_TOP ?= $(GAIM_TOP)/../win32-dev +ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3 +GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.6 +GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0 +GTK_BIN ?= $(GTK_TOP)/bin +HOWL_TOP ?= $(WIN32_DEV_TOP)/howl-1.0.0 +LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2 +MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2 +NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4 +NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4 +PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58 +SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.0.2 +TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5 # Where we installing this stuff to? GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir @@ -44,8 +47,8 @@ GAIM_LIBGAIM_DLL := $(GAIM_LIB_TOP)/libpurple.dll GAIM_LIBGAIM_PERL_DLL := $(GAIM_LIB_PERL_TOP)/perl.dll GAIM_GTKGAIM_DLL := $(GAIM_GTK_TOP)/pidgin.dll -GAIM_EXE := $(GAIM_GTK_TOP)/gaim.exe -GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/gaim-portable.exe +GAIM_EXE := $(GAIM_GTK_TOP)/pidgin.exe +GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/pidgin-portable.exe GCCWARNINGS := -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef @@ -75,11 +78,14 @@ DLL_LD_FLAGS += -Wl,--enable-auto-image-base # Build programs -CC := gcc.exe -GMSGFMT := $(GTK_BIN)/msgfmt -MAKENSIS := makensis.exe -PERL := /cygdrive/c/perl/bin/perl -WINDRES := windres +ifeq "$(origin CC)" "default" + CC := gcc.exe +endif +GMSGFMT ?= $(GTK_BIN)/msgfmt +MAKENSIS ?= makensis.exe +PERL ?= /cygdrive/c/perl/bin/perl +WINDRES ?= windres +STRIP ?= strip GAIM_COMMON_RULES := $(GAIM_LIB_TOP)/win32/rules.mak GAIM_COMMON_TARGETS := $(GAIM_LIB_TOP)/win32/targets.mak diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/Makefile.am --- a/pidgin/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -8,15 +8,15 @@ win32/IdleTracker/idletrack.h \ win32/MinimizeToTray.h \ win32/MinimizeToTray.c \ - win32/gaimrc.rc.in \ + win32/pidgin_dll_rc.rc.in \ + win32/pidgin_exe_rc.rc.in \ win32/gtkdocklet-win32.c \ - win32/gtkgaimrc.rc.in \ win32/gtkwin32dep.c \ win32/gtkwin32dep.h \ win32/resource.h \ win32/untar.c \ win32/untar.h \ - win32/win_gaim.c \ + win32/winpidgin.c \ win32/wspell.c \ win32/wspell.h \ win32/nsis/gaim-header.bmp \ @@ -59,9 +59,9 @@ SUBDIRS = pixmaps plugins sounds -bin_PROGRAMS = gaim +bin_PROGRAMS = pidgin -gaim_SOURCES = \ +pidgin_SOURCES = \ eggtrayicon.c \ gaimcombobox.c \ gaimstock.c \ @@ -106,7 +106,7 @@ gtkutils.c \ gtkwhiteboard.c -gaim_headers = \ +pidgin_headers = \ eggtrayicon.h \ gtkaccount.h \ gtkblist.h \ @@ -154,14 +154,14 @@ gtkutils.h \ gtkwhiteboard.h -gaimincludedir=$(includedir)/gaim -gaiminclude_HEADERS = \ - $(gaim_headers) +pidginincludedir=$(includedir)/pidgin +pidgininclude_HEADERS = \ + $(pidgin_headers) -gaim_DEPENDENCIES = @LIBOBJS@ -gaim_LDFLAGS = -export-dynamic -gaim_LDADD = \ +pidgin_DEPENDENCIES = @LIBOBJS@ +pidgin_LDFLAGS = -export-dynamic +pidgin_LDADD = \ @LIBOBJS@ \ $(DBUS_LIBS) \ $(GSTREAMER_LIBS) \ @@ -172,7 +172,7 @@ $(STARTUP_NOTIFICATION_LIBS) \ $(LIBXML_LIBS) \ $(GTK_LIBS) \ - $(top_builddir)/libpurple/libgaim.la + $(top_builddir)/libpurple/libpurple.la if USE_INTERNAL_LIBGADU INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU @@ -181,7 +181,7 @@ AM_CPPFLAGS = \ -DBR_PTHREADS=0 \ -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)/gaim/\" \ + -DLIBDIR=\"$(libdir)/pidgin/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -I$(top_srcdir)/libpurple/ \ diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gaimstock.c --- a/pidgin/gaimstock.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gaimstock.c Wed Jan 31 04:53:52 2007 +0000 @@ -57,12 +57,6 @@ #endif { GAIM_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { GAIM_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, - { GAIM_STOCK_DIALOG_AUTH, "dialogs", "gaim_auth.png" }, - { GAIM_STOCK_DIALOG_COOL, "dialogs", "gaim_cool.png" }, - { GAIM_STOCK_DIALOG_ERROR, "dialogs", "gaim_error.png" }, - { GAIM_STOCK_DIALOG_INFO, "dialogs", "gaim_info.png" }, - { GAIM_STOCK_DIALOG_QUESTION, "dialogs", "gaim_question.png" }, - { GAIM_STOCK_DIALOG_WARNING, "dialogs", "gaim_warning.png" }, #if GTK_CHECK_VERSION(2,6,0) { GAIM_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, #else @@ -152,17 +146,35 @@ gboolean medium; gboolean huge; } const sized_stock_icons [] = { - { GAIM_STOCK_STATUS_AVAILABLE, "status", "available.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_AWAY, "status", "away.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_BUSY, "status", "busy.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_OPERATOR, "status", "operator.png", TRUE, FALSE, FALSE, FALSE }, - { GAIM_STOCK_STATUS_HALFOP, "status", "half-operator.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_STATUS_AVAILABLE,"status", "available.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_AWAY, "status", "away.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_BUSY, "status", "busy.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_OPERATOR, "status", "operator.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_STATUS_HALFOP, "status", "half-operator.png", TRUE, FALSE, FALSE, FALSE }, + + { PIDGIN_STOCK_DIALOG_AUTH, "dialogs", "auth.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_COOL, "dialogs", "cool.png", FALSE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_ERROR, "dialogs", "error.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_INFO, "dialogs", "info.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_MAIL, "dialogs", "mail.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_QUESTION, "dialogs", "question.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_WARNING, "dialogs", "warning.png", FALSE, FALSE, FALSE, TRUE }, + + { PIDGIN_STOCK_ANIMATION_CONNECT0, "animations", "connect0.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_CONNECT1, "animations", "connect1.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_CONNECT2, "animations", "connect2.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_CONNECT3, "animations", "connect3.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING0, "animations", "typing0.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING1, "animations", "typing1.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING2, "animations", "typing2.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING3, "animations", "typing3.png",TRUE, FALSE, FALSE, FALSE }, }; static gchar * @@ -265,11 +277,10 @@ } /* register custom icon sizes */ - gtk_icon_size_register(GAIM_ICON_SIZE_DIALOG_COOL, 40, 60); - extra_small = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16); - small = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_SMALL, 22, 22); - medium = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_MEDIUM, 32, 32); - huge = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_HUGE, 64, 64); + extra_small = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16); + small = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22); + medium = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32); + huge = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_HUGE, 64, 64); for (i = 0; i < G_N_ELEMENTS(sized_stock_icons); i++) { diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gaimstock.h --- a/pidgin/gaimstock.h Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gaimstock.h Wed Jan 31 04:53:52 2007 +0000 @@ -44,12 +44,6 @@ #define GAIM_STOCK_CLOSE_TABS "gaim-close-tab" #define GAIM_STOCK_CONNECT "gaim-connect" #define GAIM_STOCK_DEBUG "gaim-debug" -#define GAIM_STOCK_DIALOG_AUTH "gaim-dialog-auth" -#define GAIM_STOCK_DIALOG_COOL "gaim-dialog-cool" -#define GAIM_STOCK_DIALOG_ERROR "gaim-dialog-error" -#define GAIM_STOCK_DIALOG_INFO "gaim-dialog-info" -#define GAIM_STOCK_DIALOG_QUESTION "gaim-dialog-question" -#define GAIM_STOCK_DIALOG_WARNING "gaim-dialog-warning" #define GAIM_STOCK_DISCONNECT "gaim-disconnect" #define GAIM_STOCK_DOWNLOAD "gaim-download" #define GAIM_STOCK_EDIT "gaim-edit" @@ -100,29 +94,48 @@ #define GAIM_STOCK_UPLOAD "gaim-upload" #define GAIM_STOCK_VOICE_CHAT "gaim-voice-chat" -#define GAIM_STOCK_STATUS_AVAILABLE "gaim-status-available" -#define GAIM_STOCK_STATUS_AWAY "gaim-status-away" -#define GAIM_STOCK_STATUS_BUSY "gaim-status-busy" -#define GAIM_STOCK_STATUS_CHAT "gaim-status-chat" -#define GAIM_STOCK_STATUS_XA "gaim-status-xa" -#define GAIM_STOCK_STATUS_LOGIN "gaim-status-login" -#define GAIM_STOCK_STATUS_LOGOUT "gaim-status-logout" -#define GAIM_STOCK_STATUS_OFFLINE "gaim-status-offline" -#define GAIM_STOCK_STATUS_PERSON "gaim-status-person" -#define GAIM_STOCK_STATUS_OPERATOR "gaim-status-operator" -#define GAIM_STOCK_STATUS_HALFOP "gaim-status-halfop" +/* Status icons */ +#define PIDGIN_STOCK_STATUS_AVAILABLE "pidgin-status-available" +#define PIDGIN_STOCK_STATUS_AWAY "pidgin-status-away" +#define PIDGIN_STOCK_STATUS_BUSY "pidgin-status-busy" +#define PIDGIN_STOCK_STATUS_CHAT "pidgin-status-chat" +#define PIDGIN_STOCK_STATUS_INVISIBLE "pidgin-status-invisible" +#define PIDGIN_STOCK_STATUS_XA "pidgin-status-xa" +#define PIDGIN_STOCK_STATUS_LOGIN "pidgin-status-login" +#define PIDGIN_STOCK_STATUS_LOGOUT "pidgin-status-logout" +#define PIDGIN_STOCK_STATUS_OFFLINE "pidgin-status-offline" +#define PIDGIN_STOCK_STATUS_PERSON "pidgin-status-person" +#define PIDGIN_STOCK_STATUS_OPERATOR "pidgin-status-operator" +#define PIDGIN_STOCK_STATUS_HALFOP "pidgin-status-halfop" + +/* Dialog icons */ +#define PIDGIN_STOCK_DIALOG_AUTH "pidgin-dialog-auth" +#define PIDGIN_STOCK_DIALOG_ERROR "pidgin-dialog-error" +#define PIDGIN_STOCK_DIALOG_INFO "pidgin-dialog-info" +#define PIDGIN_STOCK_DIALOG_MAIL "pidgin-dialog-mail" +#define PIDGIN_STOCK_DIALOG_QUESTION "pidgin-dialog-question" +#define PIDGIN_STOCK_DIALOG_COOL "pidgin-dialog-cool" +#define PIDGIN_STOCK_DIALOG_WARNING "pidgin-dialog-warning" + +/* StatusBox Animations */ +#define PIDGIN_STOCK_ANIMATION_CONNECT0 "pidgin-anim-connect0" +#define PIDGIN_STOCK_ANIMATION_CONNECT1 "pidgin-anim-connect1" +#define PIDGIN_STOCK_ANIMATION_CONNECT2 "pidgin-anim-connect2" +#define PIDGIN_STOCK_ANIMATION_CONNECT3 "pidgin-anim-connect3" +#define PIDGIN_STOCK_ANIMATION_TYPING0 "pidgin-anim-typing0" +#define PIDGIN_STOCK_ANIMATION_TYPING1 "pidgin-anim-typing1" +#define PIDGIN_STOCK_ANIMATION_TYPING2 "pidgin-anim-typing2" +#define PIDGIN_STOCK_ANIMATION_TYPING3 "pidgin-anim-typing3" /*@}*/ /** * For using icons that aren't one of the default GTK_ICON_SIZEs */ -#define GAIM_ICON_SIZE_DIALOG_COOL "gaim-icon-size-dialog-cool" -#define GAIM_ICON_SIZE_TANGO_EXTRA_SMALL "gaim-icon-size-tango-extra-small" -#define GAIM_ICON_SIZE_TANGO_SMALL "gaim-icon-size-tango-small" -#define GAIM_ICON_SIZE_TANGO_MEDIUM "gaim-icon-size-tango-medium" -#define GAIM_ICON_SIZE_TANGO_HUGE "gaim-icon-size-tango-huge" -#define GAIM_ICON_SIZE_TANGO +#define PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL "pidgin-icon-size-tango-extra-small" +#define PIDGIN_ICON_SIZE_TANGO_SMALL "pidgin-icon-size-tango-small" +#define PIDGIN_ICON_SIZE_TANGO_MEDIUM "pidgin-icon-size-tango-medium" +#define PIDGIN_ICON_SIZE_TANGO_HUGE "pidgin-icon-size-tango-huge" /** * Sets up the gaim stock repository. */ diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkaccount.c Wed Jan 31 04:53:52 2007 +0000 @@ -159,7 +159,7 @@ static void add_account_to_liststore(GaimAccount *account, gpointer user_data); static void set_account(GtkListStore *store, GtkTreeIter *iter, - GaimAccount *account); + GaimAccount *account, GdkPixbuf *global_buddyicon); /************************************************************************** * Add/Modify Account dialog @@ -1369,7 +1369,7 @@ static const GtkTargetEntry dnd_targets[] = { - {"text/plain", 0, 0}, + {"text/plain", 0, 0}, {"text/uri-list", 0, 1}, {"STRING", 0, 2} }; @@ -1563,7 +1563,7 @@ g_free(pulse_data); } - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1626,7 +1626,7 @@ /* Remove the account from the GtkListStore */ if (accounts_window_find_account_in_treemodel(&iter, account)) gtk_list_store_remove(accounts_window->model, &iter); - + if (gaim_accounts_get_all() == NULL) gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 0); } @@ -1694,7 +1694,7 @@ gtk_list_store_insert_after(store, &new_iter, position); - set_account(store, &new_iter, account); + set_account(store, &new_iter, account, NULL); gtk_list_store_remove(store, iter); } @@ -1712,7 +1712,7 @@ gtk_list_store_insert_before(store, &new_iter, position); - set_account(store, &new_iter, account); + set_account(store, &new_iter, account, NULL); gtk_list_store_remove(store, iter); } @@ -1942,7 +1942,7 @@ gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); gtk_tree_view_column_set_resizable(column, TRUE); - /* Status Icon */ + /* Buddy Icon */ renderer = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_add_attribute(column, renderer, @@ -1975,35 +1975,35 @@ } static void -set_account(GtkListStore *store, GtkTreeIter *iter, GaimAccount *account) +set_account(GtkListStore *store, GtkTreeIter *iter, GaimAccount *account, GdkPixbuf *global_buddyicon) { - const char *path; - GdkPixbuf *pixbuf; - GdkPixbuf *statusicon_pixbuf; - GdkPixbuf *statusicon_pixbuf_scaled; - - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + GdkPixbuf *pixbuf, *buddyicon = NULL; + const char *path = NULL; + + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); - if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE)) - path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"); - else + if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE)) { + if (global_buddyicon != NULL) + buddyicon = g_object_ref(G_OBJECT(global_buddyicon)); + /* This is for when set_account() is called for a single account */ + else + path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"); + } else path = gaim_account_get_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-path", NULL); - if (path != NULL) - statusicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); - else - statusicon_pixbuf = NULL; - - if (statusicon_pixbuf) { - statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 16, 16, GDK_INTERP_HYPER); - } else { - statusicon_pixbuf_scaled = NULL; + + if (path != NULL) { + GdkPixbuf *buddyicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); + if (buddyicon_pixbuf != NULL) { + buddyicon = gdk_pixbuf_scale_simple(buddyicon_pixbuf, 22, 22, GDK_INTERP_HYPER); + g_object_unref(G_OBJECT(buddyicon_pixbuf)); + } } gtk_list_store_set(store, iter, COLUMN_ICON, pixbuf, - COLUMN_BUDDYICON, statusicon_pixbuf_scaled, + COLUMN_BUDDYICON, buddyicon, COLUMN_SCREENNAME, gaim_account_get_username(account), COLUMN_ENABLED, gaim_account_get_enabled(account, GAIM_GTK_UI), COLUMN_PROTOCOL, gaim_account_get_protocol_name(account), @@ -2012,16 +2012,15 @@ if (pixbuf != NULL) g_object_unref(G_OBJECT(pixbuf)); - if (statusicon_pixbuf != NULL) - g_object_unref(G_OBJECT(statusicon_pixbuf)); - if (statusicon_pixbuf_scaled != NULL) - g_object_unref(G_OBJECT(statusicon_pixbuf_scaled)); + if (buddyicon != NULL) + g_object_unref(G_OBJECT(buddyicon)); } static void add_account_to_liststore(GaimAccount *account, gpointer user_data) { GtkTreeIter iter; + GdkPixbuf *global_buddyicon = user_data; if (accounts_window == NULL) return; @@ -2029,7 +2028,7 @@ gtk_list_store_append(accounts_window->model, &iter); gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook),1); - set_account(accounts_window->model, &iter, account); + set_account(accounts_window->model, &iter, account, global_buddyicon); } static gboolean @@ -2037,14 +2036,27 @@ { GList *l; gboolean ret = FALSE; - + GdkPixbuf *global_buddyicon = NULL; + const char *path; + gtk_list_store_clear(dialog->model); + if ((path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon")) != NULL) { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL); + if (pixbuf != NULL) { + global_buddyicon = gdk_pixbuf_scale_simple(pixbuf, 22, 22, GDK_INTERP_HYPER); + g_object_unref(G_OBJECT(pixbuf)); + } + } + for (l = gaim_accounts_get_all(); l != NULL; l = l->next) { ret = TRUE; - add_account_to_liststore((GaimAccount *)l->data, NULL); + add_account_to_liststore((GaimAccount *)l->data, global_buddyicon); } + if (global_buddyicon != NULL) + g_object_unref(G_OBJECT(global_buddyicon)); + return ret; } @@ -2125,16 +2137,15 @@ gtk_notebook_set_show_border(GTK_NOTEBOOK(accounts_window->notebook), FALSE); gtk_container_add(GTK_CONTAINER(frame), accounts_window->notebook); - /* Create a helpful first-time-use label */ - label = gtk_label_new(NULL); + label = gtk_label_new(NULL); /* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */ pretty = gaim_gtk_make_pretty_arrows(_( - "Welcome to Gaim!\n\n" + "Welcome to " PIDGIN_NAME "!\n\n" - "You have no IM accounts configured. To start connecting with Gaim " + "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " " "press the Add button below and configure your first " - "account. If you want Gaim to connect to multiple IM accounts, " + "account. If you want " PIDGIN_NAME " to connect to multiple IM accounts, " "press Add again to configure them all.\n\n" "You can come back to this window to add, edit, or remove " @@ -2190,7 +2201,7 @@ if (populate_accounts_list(dialog)) gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 1); - else + else gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 0); /* Setup DND. I wanna be an orc! */ @@ -2205,7 +2216,7 @@ G_CALLBACK(drag_data_received_cb), dialog); g_signal_connect(G_OBJECT(treeview), "drag-data-get", G_CALLBACK(drag_data_get_cb), dialog); - + gtk_widget_show_all(frame); return frame; } @@ -2218,7 +2229,7 @@ if (!accounts_window_find_account_in_treemodel(&iter, account)) return; - set_account(window->model, &iter, account); + set_account(window->model, &iter, account, NULL); } static void @@ -2402,7 +2413,7 @@ gc = gaim_account_get_connection(account); buffer = make_info(account, gc, remote_user, id, alias, msg); - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_INFO, buffer, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_INFO, buffer, NULL, NULL, _("Close"), NULL, NULL); gaim_gtk_blist_add_alert(alert); @@ -2425,14 +2436,14 @@ data->account = account; data->username = g_strdup(remote_user); data->alias = g_strdup(alias); - + buffer = make_info(account, gc, remote_user, id, alias, msg); - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Add buddy to your list?"), buffer, data, _("Add"), G_CALLBACK(add_user_cb), _("Cancel"), G_CALLBACK(free_add_user_data), NULL); gaim_gtk_blist_add_alert(alert); - + g_free(buffer); } @@ -2479,7 +2490,7 @@ gc = gaim_account_get_connection(account); if (message != NULL && *message == '\0') message = NULL; - + buffer = g_strdup_printf(_("%s%s%s%s wants to add %s to his or her buddy list%s%s"), remote_user, (alias != NULL ? " (" : ""), @@ -2502,13 +2513,13 @@ aa->username = g_strdup(remote_user); aa->alias = g_strdup(alias); aa->account = account; - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Authorize buddy?"), buffer, aa, _("Authorize"), authorize_and_add_cb, _("Deny"), deny_no_add_cb, NULL); } else { - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Authorize buddy?"), buffer, user_data, _("Authorize"), auth_cb, _("Deny"), deny_cb, diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkblist.c --- a/pidgin/gtkblist.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkblist.c Wed Jan 31 04:53:52 2007 +0000 @@ -696,8 +696,8 @@ GaimGtkJoinChatData *data = NULL; gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); data = g_new0(GaimGtkJoinChatData, 1); data->window = gtk_dialog_new_with_buttons(_("Join a Chat"), @@ -2059,16 +2059,29 @@ GaimBuddyIcon *icon; const guchar *data = NULL; gsize len; - GaimBuddy *buddy = (GaimBuddy *)node; + GaimBuddy *buddy = NULL; + GaimChat *chat = NULL; + GaimAccount *account = NULL; + GaimPluginProtocolInfo *prpl_info = NULL; if(GAIM_BLIST_NODE_IS_CONTACT(node)) { buddy = gaim_contact_get_priority_buddy((GaimContact*)node); } else if(GAIM_BLIST_NODE_IS_BUDDY(node)) { buddy = (GaimBuddy*)node; + } else if(GAIM_BLIST_NODE_IS_CHAT(node)) { + chat = (GaimChat*)node; } else { return NULL; } + if(buddy != NULL) + account = gaim_buddy_get_account(buddy); + else if(chat != NULL) + account = chat->account; + + if(account && account->gc) + prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl); + #if 0 if (!gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons")) return NULL; @@ -2090,13 +2103,33 @@ } if (data == NULL) { - if (!(icon = gaim_buddy_get_icon(buddy))) - if (!(icon = gaim_buddy_icons_find(buddy->account, buddy->name))) /* Not sure I like this...*/ - return NULL; - data = gaim_buddy_icon_get_data(icon, &len); + if(buddy != NULL) { + if (!(icon = gaim_buddy_get_icon(buddy))) + if (!(icon = gaim_buddy_icons_find(buddy->account, buddy->name))) /* Not sure I like this...*/ + return NULL; + data = gaim_buddy_icon_get_data(icon, &len); + } else if(chat != NULL) { + if(prpl_info && prpl_info->list_icon) { + char *contents; + char *image = g_strdup_printf("%s.png", prpl_info->list_icon(account, NULL)); + char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "32", image, NULL); + g_free(image); + + gaim_debug_info("icon", "Using %s as a buddy icon for a chat\n"); + + /* we'll exit below with data == NULL if this fails */ + if(g_file_get_contents(filename, &contents, &len, NULL)) { + data = (const guchar*)contents; + } + g_free(filename); + } + } custom = FALSE; /* We are not using the custom icon */ } + if(data == NULL) + return NULL; + loader = gdk_pixbuf_loader_new(); gdk_pixbuf_loader_write(loader, data, len, NULL); gdk_pixbuf_loader_close(loader, NULL); @@ -2108,14 +2141,9 @@ if (custom) g_free((void*)data); if (buf) { - GaimAccount *account = gaim_buddy_get_account(buddy); - GaimPluginProtocolInfo *prpl_info = NULL; int orig_width, orig_height; int scale_width, scale_height; - if(account && account->gc) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl); - if (greyed) { GaimPresence *presence = gaim_buddy_get_presence(buddy); if (!GAIM_BUDDY_IS_ONLINE(buddy)) @@ -2153,124 +2181,177 @@ return ret; } - +/* # - Status Icon + * P - Protocol Icon + * A - Buddy Icon + * [ - SMALL_SPACE + * = - LARGE_SPACE + * +--- STATUS_SIZE +--- td->avatar_width + * | +-- td->name_width | + * +----+ +-------+ +---------+ + * | | | | | | + * +-------------------------------------------+ + * | [ = [ |--- TOOLTIP_BORDER + *name_height --+-| ######[BuddyName = PP [ AAAAAAAAAAA |--+ + * | | ######[ = PP [ AAAAAAAAAAA | | + * STATUS SIZE -| | ######[[[[[[[[[[[[[[[[[[[[[ AAAAAAAAAAA | | + * +--+-| ######[Account: So-and-so [ AAAAAAAAAAA | |-- td->avatar_height + * | | [Idle: 4h 15m [ AAAAAAAAAAA | | + * height --+ | [Foo: Bar, Baz [ AAAAAAAAAAA | | + * | | [Status: Awesome [ AAAAAAAAAAA |--+ + * +----| [Stop: Hammer Time [ | + * | [ [ |--- TOOLTIP_BORDER + * +-------------------------------------------+ + * | | | | + * | +----------------+ | + * | | | + * | +-- td->width | + * | | + * +---- TOOLTIP_BORDER +---- TOOLTIP_BORDER + * + * + */ +#define STATUS_SIZE 32 +#define TOOLTIP_BORDER 12 +#define SMALL_SPACE 6 +#define LARGE_SPACE 12 +#define PRPL_SIZE 22 struct tooltip_data { - PangoLayout *layout; - GdkPixbuf *status_icon; - GdkPixbuf *avatar; - const char *protocol; - int avatar_width; - int avatar_height; - int width; - int height; + PangoLayout *layout; + PangoLayout *name_layout; + GdkPixbuf *prpl_icon; + GdkPixbuf *status_icon; + GdkPixbuf *avatar; + gboolean avatar_is_prpl_icon; + int avatar_width; + int avatar_height; + int name_height; + int name_width; + int width; + int height; }; static struct tooltip_data * create_tip_for_node(GaimBlistNode *node, gboolean full) { - char *tooltip_text = NULL; - struct tooltip_data *td = g_new0(struct tooltip_data, 1); - GaimAccount *account = NULL; - GaimPlugin *prpl = NULL; - GaimPluginProtocolInfo *prpl_info; - - if(GAIM_BLIST_NODE_IS_BUDDY(node)) { - account = ((GaimBuddy*)(node))->account; - } else if(GAIM_BLIST_NODE_IS_CHAT(node)) { - account = ((GaimChat*)(node))->account; - } - - if(account != NULL) { - prpl = gaim_find_prpl(gaim_account_get_protocol_id(account)); - } - - td->protocol = NULL; - if (prpl) { - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); - if(prpl_info && prpl_info->list_icon) { - td->protocol = prpl_info->list_icon(account, (GaimBuddy*)node); - } - } - td->status_icon = gaim_gtk_blist_get_status_icon(node, GAIM_STATUS_ICON_LARGE); - td->avatar = gaim_gtk_blist_get_buddy_icon(node, !full, FALSE, TRUE); - tooltip_text = gaim_get_tooltip_text(node, full); - td->layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL); - pango_layout_set_markup(td->layout, tooltip_text, -1); - pango_layout_set_wrap(td->layout, PANGO_WRAP_WORD); - pango_layout_set_width(td->layout, 300000); - - pango_layout_get_size (td->layout, &td->width, &td->height); - td->width = PANGO_PIXELS(td->width) + 12 + 32 + 6 + 12; - td->height = MAX(PANGO_PIXELS(td->height + 4) + 24, 56); - - if(td->avatar) { - int height_with_protocol = 0; - td->avatar_width = gdk_pixbuf_get_width(td->avatar); - td->avatar_height = gdk_pixbuf_get_height(td->avatar); - height_with_protocol = td->avatar_height; - if (td->avatar_height < 50 && td->protocol != NULL) - height_with_protocol += 24; - td->width += td->avatar_width + 8; - td->height = MAX(td->height, height_with_protocol + 24); - } - - g_free(tooltip_text); - return td; + char *tooltip_text = NULL; + struct tooltip_data *td = g_new0(struct tooltip_data, 1); + GaimAccount *account = NULL; + char *tmp, *node_name; + + if(GAIM_BLIST_NODE_IS_BUDDY(node)) { + account = ((GaimBuddy*)(node))->account; + } else if(GAIM_BLIST_NODE_IS_CHAT(node)) { + account = ((GaimChat*)(node))->account; + } + + td->status_icon = gaim_gtk_blist_get_status_icon(node, GAIM_STATUS_ICON_LARGE); + td->avatar = gaim_gtk_blist_get_buddy_icon(node, !full, FALSE, TRUE); + td->prpl_icon = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); + tooltip_text = gaim_get_tooltip_text(node, full); + td->layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL); + td->name_layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL); + + if (GAIM_BLIST_NODE_IS_BUDDY(node)) + tmp = g_markup_escape_text(gaim_buddy_get_name((GaimBuddy*)node), -1); + else + tmp = g_markup_escape_text(gaim_chat_get_name((GaimChat*)node), -1); + node_name = g_strdup_printf("%s", tmp); + + pango_layout_set_markup(td->layout, tooltip_text, -1); + pango_layout_set_wrap(td->layout, PANGO_WRAP_WORD); + pango_layout_set_width(td->layout, 300000); + + pango_layout_get_size (td->layout, &td->width, &td->height); + td->width = PANGO_PIXELS(td->width); + td->height = PANGO_PIXELS(td->height); + + pango_layout_set_markup(td->name_layout, node_name, -1); + pango_layout_set_wrap(td->name_layout, PANGO_WRAP_WORD); + pango_layout_set_width(td->name_layout, 300000); + + pango_layout_get_size (td->name_layout, &td->name_width, &td->name_height); + td->name_width = PANGO_PIXELS(td->name_width) + SMALL_SPACE + PRPL_SIZE; + td->name_height = MAX(PANGO_PIXELS(td->name_height), PRPL_SIZE + SMALL_SPACE); + + if(!td->avatar && full) { + td->avatar = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_LARGE); + td->avatar_is_prpl_icon = TRUE; + } + td->avatar_width = gdk_pixbuf_get_width(td->avatar); + td->avatar_height = gdk_pixbuf_get_height(td->avatar); + + g_free(tooltip_text); + return td; } static void gaim_gtk_blist_paint_tip(GtkWidget *widget, GdkEventExpose *event, GaimBlistNode *node) { - GtkStyle *style; - int current_height, max_width; - GList *l; - - if(gtkblist->tooltipdata == NULL) - return; - - style = gtkblist->tipwindow->style; - gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, gtkblist->tipwindow, "tooltip", 0, 0, -1, -1); - - max_width = 0; - for(l = gtkblist->tooltipdata; l; l = l->next) - { - struct tooltip_data *td = l->data; - max_width = MAX(max_width, td->width); - } - - current_height = 12; - for(l = gtkblist->tooltipdata; l; l = l->next) - { - struct tooltip_data *td = l->data; - if (td->avatar && gaim_gdk_pixbuf_is_opaque(td->avatar)) - gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, gtkblist->tipwindow, "tooltip", max_width - (td->avatar_width+12)-1, current_height-1,td->avatar_width+2, td->avatar_height+2); + GtkStyle *style; + int current_height, max_width; + GList *l; + + if(gtkblist->tooltipdata == NULL) + return; + + style = gtkblist->tipwindow->style; + gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, + NULL, gtkblist->tipwindow, "tooltip", 0, 0, -1, -1); + + max_width = 0; + for(l = gtkblist->tooltipdata; l; l = l->next) + { + struct tooltip_data *td = l->data; + max_width = MAX(max_width, + TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + + MAX(td->width, td->name_width) + SMALL_SPACE + td->avatar_width + TOOLTIP_BORDER); + } + + current_height = 12; + for(l = gtkblist->tooltipdata; l; l = l->next) + { + struct tooltip_data *td = l->data; + + if (td->avatar && gaim_gdk_pixbuf_is_opaque(td->avatar)) + gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, + NULL, gtkblist->tipwindow, "tooltip", + max_width - (td->avatar_width+ TOOLTIP_BORDER)-1, + current_height-1,td->avatar_width+2, td->avatar_height+2); #if GTK_CHECK_VERSION(2,2,0) - gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon, - 0, 0, 12, current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); - if(td->avatar) - gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, - td->avatar, 0, 0, max_width - (td->avatar_width + 12), current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); + gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon, + 0, 0, TOOLTIP_BORDER, current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); + if(td->avatar) + gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, + td->avatar, 0, 0, max_width - (td->avatar_width + TOOLTIP_BORDER), + current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); + if (!td->avatar_is_prpl_icon) + gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->prpl_icon, + 0, 0, + TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + td->name_width - PRPL_SIZE, + current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)), + -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); #else - gdk_pixbuf_render_to_drawable(td->status_icon, GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, 12, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); - if(td->avatar) - gdk_pixbuf_render_to_drawable(td->avatar, - GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, - max_width - (td->avatar_width + 12), - current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); + gdk_pixbuf_render_to_drawable(td->status_icon, GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, 12, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); + if(td->avatar) + gdk_pixbuf_render_to_drawable(td->avatar, + GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, + max_width - (td->avatar_width + 12), + current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); #endif - gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE, - NULL, gtkblist->tipwindow, "tooltip", 44 + 6, current_height, td->layout); - - current_height += td->height; - - if(l->next) - gtk_paint_hline(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, NULL, NULL, NULL, 12, max_width - 12, current_height-6); - - } + gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE, + NULL, gtkblist->tipwindow, "tooltip", + TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE, current_height, td->name_layout); + current_height += td->name_height; + + gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE, + NULL, gtkblist->tipwindow, "tooltip", + TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE, current_height, td->layout); + + current_height += td->height + TOOLTIP_BORDER; + } } @@ -2283,7 +2364,10 @@ g_object_unref(td->avatar); if(td->status_icon) g_object_unref(td->status_icon); + if(td->prpl_icon) + g_object_unref(td->prpl_icon); g_object_unref(td->layout); + g_object_unref(td->name_layout); g_free(td); gtkblist->tooltipdata = g_list_delete_link(gtkblist->tooltipdata, gtkblist->tooltipdata); } @@ -2388,8 +2472,10 @@ if(GAIM_BLIST_NODE_IS_CHAT(node) || GAIM_BLIST_NODE_IS_BUDDY(node)) { struct tooltip_data *td = create_tip_for_node(node, TRUE); gtkblist->tooltipdata = g_list_append(gtkblist->tooltipdata, td); - w = td->width; - h = td->height; + w = TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + + MAX(td->width, td->name_width) + SMALL_SPACE + td->avatar_width + TOOLTIP_BORDER; + h = TOOLTIP_BORDER + MAX(td->height + td->name_height, MAX(STATUS_SIZE, td->avatar_height)) + + TOOLTIP_BORDER; } else if(GAIM_BLIST_NODE_IS_CONTACT(node)) { GaimBlistNode *child; GaimBuddy *b = gaim_contact_get_priority_buddy((GaimContact *)node); @@ -2403,8 +2489,11 @@ } else { gtkblist->tooltipdata = g_list_append(gtkblist->tooltipdata, td); } - w = MAX(w, td->width); - h += td->height; + w = MAX(w, TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + + MAX(td->width, td->name_width) + SMALL_SPACE + + td->avatar_width + TOOLTIP_BORDER); + h += MAX(TOOLTIP_BORDER + MAX(STATUS_SIZE,td->avatar_height) + TOOLTIP_BORDER, + TOOLTIP_BORDER + td->height + td->name_height + TOOLTIP_BORDER); } } } else { @@ -2618,7 +2707,7 @@ { N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, "", GAIM_STOCK_POUNCE }, { N_("/Tools/Plu_gins"), "U", gaim_gtk_plugin_dialog_show, 0, "", GAIM_STOCK_PLUGIN }, { N_("/Tools/Pr_eferences"), "P", gaim_gtk_prefs_show, 0, "", GTK_STOCK_PREFERENCES }, - { N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "", GTK_STOCK_DIALOG_ERROR }, + { N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "", PIDGIN_STOCK_DIALOG_ERROR }, { "/Tools/sep2", NULL, NULL, 0, "", NULL }, { N_("/Tools/_File Transfers"), "T", gaim_gtkxfer_dialog_show, 0, "", GAIM_STOCK_FILE_TRANSFER }, { N_("/Tools/R_oom List"), NULL, gaim_gtk_roomlist_dialog_show, 0, "", GTK_STOCK_INDEX }, @@ -2655,10 +2744,6 @@ prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account)); prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); - tmp = g_markup_escape_text(gaim_chat_get_name(chat), -1); - g_string_append_printf(str, "%s", tmp); - g_free(tmp); - if (g_list_length(gaim_connections_get_all()) > 1) { tmp = g_markup_escape_text(chat->account->username, -1); @@ -2721,12 +2806,6 @@ prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); presence = gaim_buddy_get_presence(b); - - /* Buddy Name */ - tmp = g_markup_escape_text(gaim_buddy_get_name(b), -1); - g_string_append_printf(str, "%s\n", tmp); - g_free(tmp); - user_info = gaim_notify_user_info_new(); /* Account */ @@ -2852,11 +2931,51 @@ return g_string_free(str, FALSE); } -struct _emblem_data { - const char *filename; - int x; - int y; -}; +GdkPixbuf * +gaim_gtk_blist_get_emblem(GaimBlistNode *node) +{ + GaimBuddy *buddy = NULL; + struct _gaim_gtk_blist_node *gtknode = node->ui_data; + struct _gaim_gtk_blist_node *gtkbuddynode = NULL; + GaimPlugin *prpl; + GaimPluginProtocolInfo *prpl_info; + const char *name = NULL; + char *filename, *path; + GdkPixbuf *ret; + if(GAIM_BLIST_NODE_IS_CONTACT(node)) { + if(!gtknode->contact_expanded) { + buddy = gaim_contact_get_priority_buddy((GaimContact*)node); + gtkbuddynode = ((GaimBlistNode*)buddy)->ui_data; + } + } else if(GAIM_BLIST_NODE_IS_BUDDY(node)) { + buddy = (GaimBuddy*)node; + gtkbuddynode = node->ui_data; + } else { + return NULL; + } + + prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account)); + if (!prpl) + return NULL; + + prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); + if (prpl_info && prpl_info->list_emblem) + name = prpl_info->list_emblem(buddy); + + if (name == NULL) + return NULL; + + filename = g_strdup_printf("%s.png", name); + + path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL); + ret = gdk_pixbuf_new_from_file(path, NULL); + + g_free(filename); + g_free(path); + + return ret; +} + GdkPixbuf * gaim_gtk_blist_get_status_icon(GaimBlistNode *node, GaimStatusIconSize size) @@ -2865,12 +2984,10 @@ const char *protoname = NULL; struct _gaim_gtk_blist_node *gtknode = node->ui_data; struct _gaim_gtk_blist_node *gtkbuddynode = NULL; - struct _emblem_data emblems[4] = {{NULL, 15, 15}, {NULL, 0, 15}, - {NULL, 0, 0}, {NULL, 15, 0}}; GaimBuddy *buddy = NULL; GaimChat *chat = NULL; - GtkIconSize icon_size = gtk_icon_size_from_name((size == GAIM_STATUS_ICON_LARGE) ? GAIM_ICON_SIZE_TANGO_MEDIUM : - GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name((size == GAIM_STATUS_ICON_LARGE) ? PIDGIN_ICON_SIZE_TANGO_MEDIUM : + PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if(GAIM_BLIST_NODE_IS_CONTACT(node)) { if(!gtknode->contact_expanded) { @@ -2905,44 +3022,38 @@ if(prpl_info && prpl_info->list_icon) { protoname = prpl_info->list_icon(account, buddy); } - if(prpl_info && prpl_info->list_emblems && buddy) { - if(gtknode && !gtknode->recent_signonoff) - prpl_info->list_emblems(buddy, &emblems[0].filename, - &emblems[1].filename, &emblems[2].filename, - &emblems[3].filename); - } } if(buddy) { - GaimPresence *p = gaim_buddy_get_presence(buddy); - if (GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_LOGIN, - icon_size, "GtkTreeView"); - else if (gtkbuddynode && gtkbuddynode->recent_signonoff) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_LOGOUT, - icon_size, "GtkTreeView"); - else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_UNAVAILABLE)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); - else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_AWAY)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); - else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_EXTENDED_AWAY)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); - else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_OFFLINE)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); - else - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); - } else if (chat) { - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_CHAT, - icon_size, "GtkTreeView"); - } else { - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_PERSON, - icon_size, "GtkTreeView"); - } + GaimPresence *p = gaim_buddy_get_presence(buddy); + if (GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGIN, + icon_size, "GtkTreeView"); + else if (gtkbuddynode && gtkbuddynode->recent_signonoff) + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGOUT, + icon_size, "GtkTreeView"); + else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_UNAVAILABLE)) + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "GtkTreeView"); + else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_AWAY)) + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "GtkTreeView"); + else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_EXTENDED_AWAY)) + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA, + icon_size, "GtkTreeView"); + else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_OFFLINE)) + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "GtkTreeView"); + else + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "GtkTreeView"); + } else if (chat) { + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_CHAT, + icon_size, "GtkTreeView"); + } else { + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_PERSON, + icon_size, "GtkTreeView"); + } return ret; @@ -2966,12 +3077,6 @@ if(prpl_info && prpl_info->list_icon) { protoname = prpl_info->list_icon(account, buddy); } - if(prpl_info && prpl_info->list_emblems) { - if(gtknode && !gtknode->recent_signonoff) - prpl_info->list_emblems(buddy, &emblems[0].filename, - &emblems[1].filename, &emblems[2].filename, - &emblems[3].filename); - } if(conv != NULL) { GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -2988,12 +3093,6 @@ } } - if(size == GAIM_STATUS_ICON_SMALL) { - scalesize = 15; - /* So that only the se icon will composite */ - emblems[1].filename = emblems[2].filename = emblems[3].filename = NULL; - } - if(buddy && GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) { filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "login.png", NULL); } else if(buddy && !GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) { @@ -3019,45 +3118,6 @@ GDK_INTERP_BILINEAR); g_object_unref(status); - for(i=0; i<4; i++) { - if(emblems[i].filename) { - GdkPixbuf *emblem; - char *image = g_strdup_printf("%s.png", emblems[i].filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL); - g_free(image); - emblem = gdk_pixbuf_new_from_file(filename, NULL); - g_free(filename); - if(emblem) { - if(i == 0 && size == GAIM_STATUS_ICON_SMALL) { - double scale_factor = 0.6; - if(gdk_pixbuf_get_width(emblem) > 20) - scale_factor = 9.0 / gdk_pixbuf_get_width(emblem); - - gdk_pixbuf_composite(emblem, - scale, 5, 5, - 10, 10, - 5, 5, - scale_factor, scale_factor, - GDK_INTERP_BILINEAR, - 255); - } else { - double scale_factor = 1.0; - if(gdk_pixbuf_get_width(emblem) > 20) - scale_factor = 15.0 / gdk_pixbuf_get_width(emblem); - - gdk_pixbuf_composite(emblem, - scale, emblems[i].x, emblems[i].y, - 15, 15, - emblems[i].x, emblems[i].y, - scale_factor, scale_factor, - GDK_INTERP_BILINEAR, - 255); - } - g_object_unref(emblem); - } - } - } - if(buddy) { presence = gaim_buddy_get_presence(buddy); if (!GAIM_BUDDY_IS_ONLINE(buddy)) @@ -3994,8 +4054,8 @@ gtkblist = GAIM_GTK_BLIST(list); - gtkblist->empty_avatar = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32); - gdk_pixbuf_fill(gtkblist->empty_avatar, 0x00000000); + gtkblist->empty_avatar = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32); + gdk_pixbuf_fill(gtkblist->empty_avatar, 0x00000000); gtkblist->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_role(GTK_WINDOW(gtkblist->window), "buddy_list"); @@ -4049,7 +4109,7 @@ #endif /* Translators: Please maintain the use of -> and <- to refer to menu heirarchy */ - pretty = gaim_gtk_make_pretty_arrows(_("Welcome to Gaim!\n\n" + pretty = gaim_gtk_make_pretty_arrows(_("Welcome to " PIDGIN_NAME "!\n\n" "You have no accounts enabled. Enable your IM accounts from the " "Accounts window at Accounts->Add/Edit. Once you " @@ -4133,7 +4193,9 @@ GDK_TYPE_COLOR, /* bgcolor */ G_TYPE_BOOLEAN, /* Group expander */ G_TYPE_BOOLEAN, /* Contact expander */ - G_TYPE_BOOLEAN); /* Contact expander visible */ + G_TYPE_BOOLEAN, /* Contact expander visible */ + GDK_TYPE_PIXBUF, /* Emblem */ + G_TYPE_BOOLEAN); /* Emblem visible */ gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel)); @@ -4232,6 +4294,15 @@ NULL); rend = gtk_cell_renderer_pixbuf_new(); + g_object_set(rend, "xalign", 1.0, "yalign", 0.5, "ypad", 0, NULL); + gtk_tree_view_column_pack_start(column, rend, FALSE); + gtk_tree_view_column_set_attributes(column, rend, "pixbuf", EMBLEM_COLUMN, +#if GTK_CHECK_VERSION(2,6,0) + "cell-background-gdk", BGCOLOR_COLUMN, +#endif + "visible", EMBLEM_VISIBLE_COLUMN, NULL); + + rend = gtk_cell_renderer_pixbuf_new(); g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL); gtk_tree_view_column_pack_start(column, rend, FALSE); gtk_tree_view_column_set_attributes(column, rend, "pixbuf", BUDDY_ICON_COLUMN, @@ -4623,6 +4694,7 @@ CONTACT_EXPANDER_VISIBLE_COLUMN, FALSE, BUDDY_ICON_VISIBLE_COLUMN, FALSE, IDLE_VISIBLE_COLUMN, FALSE, + EMBLEM_VISIBLE_COLUMN, FALSE, -1); g_free(title); } else { @@ -4663,7 +4735,7 @@ static void buddy_node(GaimBuddy *buddy, GtkTreeIter *iter, GaimBlistNode *node) { GaimPresence *presence; - GdkPixbuf *status, *avatar; + GdkPixbuf *status, *avatar, *emblem; char *mark; char *idle = NULL; gboolean expanded = ((struct _gaim_gtk_blist_node *)(node->parent->ui_data))->contact_expanded; @@ -4679,7 +4751,7 @@ g_object_ref(G_OBJECT(gtkblist->empty_avatar)); avatar = gtkblist->empty_avatar; } - + emblem = gaim_gtk_blist_get_emblem((GaimBlistNode*) buddy); mark = gaim_gtk_blist_get_name_markup(buddy, selected); if (gaim_prefs_get_bool("/gaim/gtk/blist/show_idle_time") && @@ -4717,6 +4789,8 @@ IDLE_VISIBLE_COLUMN, !biglist && idle, BUDDY_ICON_COLUMN, avatar, BUDDY_ICON_VISIBLE_COLUMN, biglist, + EMBLEM_COLUMN, emblem, + EMBLEM_VISIBLE_COLUMN, emblem, BGCOLOR_COLUMN, NULL, CONTACT_EXPANDER_COLUMN, NULL, CONTACT_EXPANDER_VISIBLE_COLUMN, expanded, @@ -4842,6 +4916,8 @@ if(gaim_account_is_connected(chat->account)) { GtkTreeIter iter; GdkPixbuf *status; + GdkPixbuf *avatar; + GdkPixbuf *emblem; char *mark; if(!insert_node(list, node, &iter)) @@ -4849,20 +4925,26 @@ status = gaim_gtk_blist_get_status_icon(node, GAIM_STATUS_ICON_SMALL); + emblem = gaim_gtk_blist_get_emblem(node); + avatar = gaim_gtk_blist_get_buddy_icon(node, TRUE, FALSE, TRUE); mark = g_markup_escape_text(gaim_chat_get_name(chat), -1); gtk_tree_store_set(gtkblist->treemodel, &iter, STATUS_ICON_COLUMN, status, STATUS_ICON_VISIBLE_COLUMN, TRUE, - BUDDY_ICON_COLUMN, gtkblist->empty_avatar, - BUDDY_ICON_VISIBLE_COLUMN, TRUE, + BUDDY_ICON_COLUMN, avatar ? avatar : gtkblist->empty_avatar, + BUDDY_ICON_VISIBLE_COLUMN, gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons"), + EMBLEM_COLUMN, emblem, + EMBLEM_VISIBLE_COLUMN, emblem != NULL, NAME_COLUMN, mark, -1); g_free(mark); if(status) g_object_unref(status); + if(avatar) + g_object_unref(avatar); } else { gaim_gtk_blist_hide_node(list, node, TRUE); } @@ -5079,8 +5161,8 @@ ? account : gaim_connection_get_account(gaim_connections_get_all()->data)); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); @@ -5453,8 +5535,8 @@ data->account = account; data->default_chat_name = g_strdup(name); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); @@ -5651,7 +5733,7 @@ GaimGtkBuddyList *gaim_gtk_blist_get_default_gtk_blist() { - return gtkblist; + return gtkblist; } static void account_signon_cb(GaimConnection *gc, gpointer z) @@ -6310,7 +6392,7 @@ gaim_account_get_protocol_name(account), ")", NULL); menuitem = gtk_image_menu_item_new_with_label(buf); g_free(buf); - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL); if (pixbuf != NULL) { if (!gaim_account_is_connected(account)) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkblist.h --- a/pidgin/gtkblist.h Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkblist.h Wed Jan 31 04:53:52 2007 +0000 @@ -40,6 +40,8 @@ GROUP_EXPANDER_COLUMN, CONTACT_EXPANDER_COLUMN, CONTACT_EXPANDER_VISIBLE_COLUMN, + EMBLEM_COLUMN, + EMBLEM_VISIBLE_COLUMN, BLIST_COLUMNS }; @@ -178,6 +180,16 @@ void gaim_gtk_blist_update_refresh_timeout(void); /** + * Returns the blist emblem + * + * @param node The node to return an emblem for + * + * @return A newly created GdkPixbuf, or NULL + */ +GdkPixbuf * +gaim_gtk_blist_get_emblem(GaimBlistNode *node); + +/** * Useful for the buddy ticker */ GdkPixbuf *gaim_gtk_blist_get_status_icon(GaimBlistNode *node, diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkconv.c --- a/pidgin/gtkconv.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkconv.c Wed Jan 31 04:53:52 2007 +0000 @@ -260,7 +260,7 @@ if (conv->features & GAIM_CONNECTION_HTML) { - char *color; + char color[8]; GdkColor fg_color, bg_color; if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold") != GTK_IMHTML(c->entry)->edit.bold) @@ -281,42 +281,35 @@ /* 3 is the default. */ if (size != 3) - { gtk_imhtml_font_set_size(GTK_IMHTML(c->entry), size); - } } if(strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), "") != 0) { gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), &fg_color); - color = g_strdup_printf("#%02x%02x%02x", + g_snprintf(color, sizeof(color), "#%02x%02x%02x", fg_color.red / 256, fg_color.green / 256, fg_color.blue / 256); - } - else - color = g_strdup(""); + } else + strcpy(color, ""); gtk_imhtml_toggle_forecolor(GTK_IMHTML(c->entry), color); - g_free(color); if(!(conv->features & GAIM_CONNECTION_NO_BGCOLOR) && strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"), "") != 0) { gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"), &bg_color); - color = g_strdup_printf("#%02x%02x%02x", + g_snprintf(color, sizeof(color), "#%02x%02x%02x", bg_color.red / 256, bg_color.green / 256, bg_color.blue / 256); - } - else - color = g_strdup(""); + } else + strcpy(color, ""); gtk_imhtml_toggle_background(GTK_IMHTML(c->entry), color); - g_free(color); - if (conv->features & GAIM_CONNECTION_FORMATTING_WBFO) gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(c->entry), TRUE); @@ -374,7 +367,7 @@ GaimCmdStatus status; if (!g_ascii_strcasecmp(args[0], "version")) { - tmp = g_strdup_printf("me is using Gaim v%s.", VERSION); + tmp = g_strdup_printf("me is using " PIDGIN_NAME " v%s.", VERSION); markup = g_markup_escape_text(tmp, -1); status = gaim_cmd_do_command(conv, tmp, markup, error); @@ -839,8 +832,8 @@ GtkWidget *table; GtkWidget *img; - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); info = g_new0(InviteBuddyInfo, 1); info->conv = conv; @@ -1142,8 +1135,8 @@ { GaimGtkWindow *gtkwin = data; GtkWidget *hbox; - GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + GtkWidget *img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); GtkWidget *label; struct _search *s; @@ -2274,7 +2267,7 @@ /* If they don't have a buddy icon, then use the PRPL icon */ if (status == NULL) - status = gaim_gtk_create_prpl_icon(account, small_icon ? 0.5 : 1.0); + status = gaim_gtk_create_prpl_icon(account, small_icon ? PIDGIN_PRPL_ICON_SMALL : PIDGIN_PRPL_ICON_LARGE); return status; } @@ -7050,8 +7043,8 @@ gtk_box_set_spacing(GTK_BOX(vbox), 12); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_WARNING, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); /* Setup the inner hbox and put the dialog's icon in it. */ hbox = gtk_hbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(vbox), hbox); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkdebug.c Wed Jan 31 04:53:52 2007 +0000 @@ -182,7 +182,7 @@ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), hbox); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -220,7 +220,7 @@ } tmp = gtk_imhtml_get_text(GTK_IMHTML(win->text), NULL, NULL); - fprintf(fp, "Gaim Debug Log : %s\n", gaim_date_format_full(NULL)); + fprintf(fp, "Pidgin Debug Log : %s\n", gaim_date_format_full(NULL)); fprintf(fp, "%s", tmp); g_free(tmp); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkdialogs.c Wed Jan 31 04:53:52 2007 +0000 @@ -358,10 +358,10 @@ GAIM_WEBSITE "\">" GAIM_WEBSITE "

"); #ifdef _WIN32 g_string_append_printf(str, _("IRC: " - "#wingaim on irc.freenode.net

")); + "#pidgwin on irc.freenode.net

")); #else g_string_append_printf(str, _("IRC: " - "#gaim on irc.freenode.net

")); + "#pidgin on irc.freenode.net

")); #endif /* Current Developers */ @@ -781,7 +781,7 @@ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL)); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkdocklet-x11.c --- a/pidgin/gtkdocklet-x11.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Wed Jan 31 04:53:52 2007 +0000 @@ -254,7 +254,7 @@ docklet_x11_destroy(); } - docklet = egg_tray_icon_new("Gaim"); + docklet = egg_tray_icon_new(PIDGIN_NAME); box = gtk_event_box_new(); image = gtk_image_new(); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkgaim.h --- a/pidgin/gtkgaim.h Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkgaim.h Wed Jan 31 04:53:52 2007 +0000 @@ -37,11 +37,6 @@ #endif /** - * Our user-readable name - */ -#define PIDGIN_NAME "Pidgin" - -/** * Our UI's identifier. */ #define GAIM_GTK_UI "gtk-gaim" diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtklog.c --- a/pidgin/gtklog.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtklog.c Wed Jan 31 04:53:52 2007 +0000 @@ -365,18 +365,15 @@ /* Icon *************/ if (pixbuf != NULL) { - GdkPixbuf *scale; GtkWidget *icon; title_box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_set_border_width(GTK_CONTAINER(title_box), GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); - scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR); - icon = gtk_image_new_from_pixbuf(scale); + icon = gtk_image_new_from_pixbuf(pixbuf); gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); g_object_unref(G_OBJECT(pixbuf)); - g_object_unref(G_OBJECT(scale)); } else title_box = GTK_DIALOG(lv->window)->vbox; @@ -503,7 +500,8 @@ } display_log_viewer(ht, gaim_log_get_logs(type, screenname, account), - title, gaim_gtk_create_prpl_icon(account, 0.5), gaim_log_get_total_size(type, screenname, account)); + title, gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM), + gaim_log_get_total_size(type, screenname, account)); g_free(title); } diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkmain.c --- a/pidgin/gtkmain.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkmain.c Wed Jan 31 04:53:52 2007 +0000 @@ -528,7 +528,7 @@ PIDGIN_NAME " has segfaulted and attempted to dump a core file.\n" "This is a bug in the software and has happened through\n" "no fault of your own.\n\n" - "If you can reproduce the crash, please notify the gaim\n" + "If you can reproduce the crash, please notify the Pidgin\n" "developers by reporting a bug at\n" "%sbug.php\n\n" "Please make sure to specify what you were doing at the time\n" diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtknotify.c --- a/pidgin/gtknotify.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtknotify.c Wed Jan 31 04:53:52 2007 +0000 @@ -213,15 +213,15 @@ switch (type) { case GAIM_NOTIFY_MSG_ERROR: - icon_name = GAIM_STOCK_DIALOG_ERROR; + icon_name = PIDGIN_STOCK_DIALOG_ERROR; break; case GAIM_NOTIFY_MSG_WARNING: - icon_name = GAIM_STOCK_DIALOG_WARNING; + icon_name = PIDGIN_STOCK_DIALOG_WARNING; break; case GAIM_NOTIFY_MSG_INFO: - icon_name = GAIM_STOCK_DIALOG_INFO; + icon_name = PIDGIN_STOCK_DIALOG_INFO; break; default: @@ -231,7 +231,7 @@ if (icon_name != NULL) { - img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); } @@ -398,7 +398,7 @@ GdkPixbuf *icon; gboolean new_n = TRUE; - icon = gaim_gtk_create_prpl_icon(account, 1); + icon = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if (count > 0) { /* Allow only one non-detailed email notification for each account */ @@ -506,8 +506,8 @@ } if (!GTK_WIDGET_VISIBLE(dialog)) { - GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, GAIM_STOCK_ICON_ONLINE_MSG, - GTK_ICON_SIZE_BUTTON, NULL); + GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, PIDGIN_STOCK_DIALOG_MAIL, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), NULL); char *label_text = g_strdup_printf(ngettext("You have %d new e-mail.", "You have %d new e-mails.", mail_dialog->total_count), mail_dialog->total_count); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkpounce.c --- a/pidgin/gtkpounce.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkpounce.c Wed Jan 31 04:53:52 2007 +0000 @@ -186,7 +186,7 @@ events = gaim_pounce_get_events(pounce); - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); pouncer = gaim_account_get_username(account); pouncee = gaim_pounce_get_pouncee(pounce); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkrequest.c --- a/pidgin/gtkrequest.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkrequest.c Wed Jan 31 04:53:52 2007 +0000 @@ -332,8 +332,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -493,8 +493,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -602,8 +602,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -1077,8 +1077,8 @@ gtk_widget_show(hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_widget_show(img); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtksavedstatuses.c --- a/pidgin/gtksavedstatuses.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Wed Jan 31 04:53:52 2007 +0000 @@ -969,7 +969,7 @@ GdkPixbuf *pixbuf; const char *id = NULL, *name = NULL, *message = NULL; - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && !gaim_account_is_connected(account)) { gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1538,7 +1538,7 @@ continue; id = gaim_status_type_get_id(status_type); - pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, 0.5); + pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, PIDGIN_PRPL_ICON_MEDIUM); name = gaim_status_type_get_name(status_type); gtk_list_store_append(dialog->model, &iter); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkstatusbox.c Wed Jan 31 04:53:52 2007 +0000 @@ -518,7 +518,7 @@ gboolean account_status = FALSE; GaimAccount *acct = (status_box->token_status_account) ? status_box->token_status_account : status_box->account; - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); style = gtk_widget_get_style(GTK_WIDGET(status_box)); snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x", @@ -596,7 +596,7 @@ { GaimStatusType *status_type; GaimStatusPrimitive prim; - GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (account_status) { status_type = gaim_status_get_type(gaim_account_get_active_status(acct)); prim = gaim_status_type_get_primitive(status_type); @@ -605,20 +605,20 @@ } if (prim == GAIM_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); #if 0 if (account_status) pixbuf = gaim_gtk_create_prpl_icon_with_status(acct, @@ -846,7 +846,7 @@ /* Odd... oh well, nothing we can do about it. */ return; - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); gtk_gaim_status_box_add_separator(statusbox); @@ -861,20 +861,20 @@ prim = gaim_savedstatus_get_type(saved); if (prim == GAIM_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); if (gaim_savedstatus_is_transient(saved)) { @@ -980,7 +980,7 @@ { GaimStatusType *status_type = (GaimStatusType *)l->data; GaimStatusPrimitive prim; - GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (!gaim_status_type_is_user_settable(status_type)) continue; @@ -988,20 +988,20 @@ prim = gaim_status_type_get_primitive(status_type); if (prim == GAIM_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, @@ -1019,7 +1019,7 @@ GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4; GtkIconSize icon_size; - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); /* Unset the model while clearing it */ gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), NULL); @@ -1031,7 +1031,7 @@ if (status_box->account == NULL) { - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_AVAILABLE, + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AVAILABLE, icon_size, "GtkGaimStatusBox"); /* Do all the currently enabled accounts have the same statuses? * If so, display them instead of our global list. @@ -1040,12 +1040,12 @@ add_account_statuses(status_box, status_box->token_status_account); } else { /* Global */ - pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkGaimStatusBox"); - pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkGaimStatusBox"); - pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_INVISIBLE, - icon_size, "GtkGaimStatusBox"); + pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); + pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); + pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_INVISIBLE, + icon_size, "PidginStatusBox"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE)); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf2, _("Away"), NULL, GINT_TO_POINTER(GAIM_STATUS_AWAY)); @@ -1149,7 +1149,7 @@ GtkIconSize icon_size; g_object_set(G_OBJECT(status_box->icon_rend), "xpad", 3, NULL); - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (status_box->connecting_pixbufs[0] != NULL) gdk_pixbuf_unref(status_box->connecting_pixbufs[0]); @@ -1161,14 +1161,14 @@ gdk_pixbuf_unref(status_box->connecting_pixbufs[3]); status_box->connecting_index = 0; - status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT0, - icon_size, "GtkGaimStatusBox"); - status_box->connecting_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT1, - icon_size, "GtkGaimStatusBox"); - status_box->connecting_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT2, - icon_size, "GtkGaimStatusBox"); - status_box->connecting_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT3, - icon_size, "GtkGaimStatusBox"); + status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT0, + icon_size, "PidginStatusBox"); + status_box->connecting_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT1, + icon_size, "PidginStatusBox"); + status_box->connecting_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT2, + icon_size, "PidginStatusBox"); + status_box->connecting_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT3, + icon_size, "PidginStatusBox"); if (status_box->typing_pixbufs[0] != NULL) gdk_pixbuf_unref(status_box->typing_pixbufs[0]); @@ -1180,14 +1180,14 @@ gdk_pixbuf_unref(status_box->typing_pixbufs[3]); status_box->typing_index = 0; - status_box->typing_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING0, - icon_size, "GtkGaimStatusBox"); - status_box->typing_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING1, - icon_size, "GtkGaimStatusBox"); - status_box->typing_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING2, - icon_size, "GtkGaimStatusBox"); - status_box->typing_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING3, - icon_size, "GtkGaimStatusBox"); + status_box->typing_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING0, + icon_size, "PidginStatusBox"); + status_box->typing_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING1, + icon_size, "PidginStatusBox"); + status_box->typing_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING2, + icon_size, "PidginStatusBox"); + status_box->typing_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING3, + icon_size, "PidginStatusBox"); } static void account_enabled_cb(GaimAccount *acct, GtkGaimStatusBox *status_box) { diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkutils.c --- a/pidgin/gtkutils.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkutils.c Wed Jan 31 04:53:52 2007 +0000 @@ -98,6 +98,27 @@ gaim_gtkthemes_smiley_themeize(imhtml); gtk_imhtml_set_funcs(GTK_IMHTML(imhtml), >kimhtml_cbs); + + /* Use the GNOME "document" font, if applicable */ + if (gaim_running_gnome()) { + char *path, *font; + PangoFontDescription *desc = NULL; + + if ((path = g_find_program_in_path("gconftool-2"))) { + g_free(path); + if (!g_spawn_command_line_sync( + "gconftool-2 -g /desktop/gnome/interface/document_font_name", + &font, NULL, NULL, NULL)) + return; + } + desc = pango_font_description_from_string(font); + g_free(font); + + if (desc) { + gtk_widget_modify_font(imhtml, desc); + pango_font_description_free(desc); + } + } } GtkWidget * @@ -441,7 +462,6 @@ GtkWidget *item; GtkWidget *image; GdkPixbuf *pixbuf; - GdkPixbuf *scale; GList *p; GtkSizeGroup *sg; char *filename; @@ -478,19 +498,15 @@ proto_name = prpl_info->list_icon(NULL, NULL); g_snprintf(buf, sizeof(buf), "%s.png", proto_name); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", - "default", buf, NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", + "16", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); - if (pixbuf != NULL) { - /* Scale and insert the image */ - scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, - GDK_INTERP_BILINEAR); - image = gtk_image_new_from_pixbuf(scale); + if (pixbuf) { + image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(G_OBJECT(pixbuf)); - g_object_unref(G_OBJECT(scale)); } else image = gtk_image_new(); @@ -568,7 +584,6 @@ GtkWidget *hbox; GtkWidget *label; GdkPixbuf *pixbuf; - GdkPixbuf *scale; GList *list; GList *p; GtkSizeGroup *sg; @@ -622,24 +637,19 @@ proto_name = prpl_info->list_icon(account, NULL); g_snprintf(buf, sizeof(buf), "%s.png", proto_name); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", - "default", buf, NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", + "16", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); if (pixbuf != NULL) { - /* Scale and insert the image */ - scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, - GDK_INTERP_BILINEAR); - if (gaim_account_is_disconnected(account) && show_all && gaim_connections_get_all()) - gdk_pixbuf_saturate_and_pixelate(scale, scale, 0.0, FALSE); - - image = gtk_image_new_from_pixbuf(scale); + gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); + + image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(G_OBJECT(pixbuf)); - g_object_unref(G_OBJECT(scale)); } else image = gtk_image_new(); @@ -1543,14 +1553,14 @@ } GdkPixbuf * -gaim_gtk_create_prpl_icon(GaimAccount *account, double scale_factor) +gaim_gtk_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size) { GaimPlugin *prpl; GaimPluginProtocolInfo *prpl_info; const char *protoname = NULL; char buf[256]; /* TODO: We should use a define for max file length */ char *filename = NULL; - GdkPixbuf *pixbuf, *scaled; + GdkPixbuf *pixbuf; g_return_val_if_fail(account != NULL, NULL); @@ -1572,16 +1582,14 @@ */ g_snprintf(buf, sizeof(buf), "%s.png", protoname); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", - "default", buf, NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", + size == PIDGIN_PRPL_ICON_SMALL ? "16" : + size == PIDGIN_PRPL_ICON_MEDIUM ? "22" : "48", + buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); - scaled = gdk_pixbuf_scale_simple(pixbuf, 32*scale_factor, - 32*scale_factor, GDK_INTERP_BILINEAR); - g_object_unref(pixbuf); - - return scaled; + return pixbuf; } static GdkPixbuf * @@ -2950,7 +2958,7 @@ va_list args; static gboolean first_call = TRUE; - img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_BUTTON); + img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); vbox = gtk_vbox_new(FALSE,0); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/gtkutils.h --- a/pidgin/gtkutils.h Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/gtkutils.h Wed Jan 31 04:53:52 2007 +0000 @@ -46,6 +46,13 @@ } GaimButtonStyle; +typedef enum +{ + PIDGIN_PRPL_ICON_SMALL, + PIDGIN_PRPL_ICON_MEDIUM, + PIDGIN_PRPL_ICON_LARGE +} PidginPrplIconSize; + #ifndef _WIN32 typedef enum { @@ -369,11 +376,7 @@ * the currently selected theme. * * @param account The account. - * @param scale_factor The amount to scale to the original image. - * The default size is 32x32 pixels. A scale - * factor of 1 means no scaling will be done. - * A scale factor of 0.5 means the length - * and width will be 16 pixels each. + * @param size The size of the icon to return. * * @return A newly-created pixbuf with a reference count of 1, * or NULL if any of several error conditions occurred: @@ -382,7 +385,7 @@ * to allocate the image buffer, or the image file * contained invalid data. */ -GdkPixbuf *gaim_gtk_create_prpl_icon(GaimAccount *account, double scale_factor); +GdkPixbuf *gaim_gtk_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size); /** * Create a protocol icon with the status emblem overlayed in diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/Makefile.am --- a/pidgin/pixmaps/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = buddy_icons emotes status +SUBDIRS = animations buddy_icons dialogs emblems emotes protocols status EXTRA_DIST = \ about_menu.png \ @@ -10,12 +10,6 @@ edit.png \ gaim.png \ gaim.svg \ - gaim_auth.png \ - gaim_cool.png \ - gaim_error.png \ - gaim_info.png \ - gaim_question.png \ - gaim_warning.png \ info.png \ insert-image.png \ insert-image-small.png \ @@ -53,11 +47,6 @@ typed.png \ typing.png \ Makefile.mingw \ - smileys/Makefile.mingw \ - smileys/default/Makefile.mingw \ - smileys/none/Makefile.mingw \ - status/default/Makefile.mingw \ - status/Makefile.mingw \ gaim-install.ico \ gaim.ico \ gaim_16.ico \ @@ -76,9 +65,6 @@ gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png -gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs -gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png gaim_cool.png gaim_auth.png - gaimiconpixdir = $(datadir)/pixmaps/gaim/icons gaimiconpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png stock_connect_16.png stock_disconnect_16.png diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/animations/16/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,11 @@ +EXTRA_DIST = connect0.png \ + connect1.png \ + connect2.png \ + connect3.png \ + typing0.png \ + typing1.png \ + typing2.png \ + typing3.png + +pidginanimpixdir = $(datadir)/pixmaps/pidgin/animations/16 +pidginanimpix_DATA = $(EXTRA_DIST) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/animations/16/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginanimpix_DATA)'; then \ + mkdir -p $(pidginanimpixdir); \ + cp $(pidginanimpix_DATA) $(pidginanimpixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/connect0.png Binary file pidgin/pixmaps/animations/16/connect0.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/connect1.png Binary file pidgin/pixmaps/animations/16/connect1.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/connect2.png Binary file pidgin/pixmaps/animations/16/connect2.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/connect3.png Binary file pidgin/pixmaps/animations/16/connect3.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/typing0.png Binary file pidgin/pixmaps/animations/16/typing0.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/typing1.png Binary file pidgin/pixmaps/animations/16/typing1.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/typing2.png Binary file pidgin/pixmaps/animations/16/typing2.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/16/typing3.png Binary file pidgin/pixmaps/animations/16/typing3.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/animations/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,5 @@ +SUBDIRS = 16 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/animations/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/animations/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/buddy_icons/Makefile.am --- a/pidgin/pixmaps/buddy_icons/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/buddy_icons/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,1 +1,5 @@ SUBDIRS = qq + +EXTRA_DIST = \ + Makefile.mingw \ + qq/Makefile.mingw diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,12 @@ +SIBDIRS = scalable + +EXTRA_DIST = auth.png \ + error.png \ + info.png \ + mail.png \ + question.png + +pidgindialogpixdir = $(datadir)/pixmaps/pidgin/dialogs/16 + +pidgindialogpix_DATA = $(EXTRA_DIST) + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidgindialogpix_DATA)'; then \ + mkdir -p $(pidgindialogpixdir); \ + cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/auth.png Binary file pidgin/pixmaps/dialogs/16/auth.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/error.png Binary file pidgin/pixmaps/dialogs/16/error.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/info.png Binary file pidgin/pixmaps/dialogs/16/info.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/mail.png Binary file pidgin/pixmaps/dialogs/16/mail.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/question.png Binary file pidgin/pixmaps/dialogs/16/question.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,3 @@ +EXTRA_DIST = error.svg \ + info.svg \ + mail.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/scalable/error.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/scalable/error.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/scalable/info.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/scalable/info.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/16/scalable/mail.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/scalable/mail.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,365 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,14 @@ +SUBDIRS = scalable + +EXTRA_DIST = auth.png \ + cool.png \ + dialog.png \ + error.png \ + info.png \ + mail.png \ + question.png \ + warning.png + +pidgindialogpixdir = $(datadir)/pixmaps/pidgin/dialogs/64 + +pidgindialogpix_DATA = $(EXTRA_DIST) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidgindialogpix_DATA)'; then \ + mkdir -p $(pidgindialogpixdir); \ + cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/auth.png Binary file pidgin/pixmaps/dialogs/64/auth.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/cool.png Binary file pidgin/pixmaps/dialogs/64/cool.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/dialog.png Binary file pidgin/pixmaps/dialogs/64/dialog.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/error.png Binary file pidgin/pixmaps/dialogs/64/error.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/info.png Binary file pidgin/pixmaps/dialogs/64/info.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/mail.png Binary file pidgin/pixmaps/dialogs/64/mail.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/question.png Binary file pidgin/pixmaps/dialogs/64/question.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,7 @@ +EXTRA_DIST = auth.svg \ + cool.svg \ + dialog.svg \ + error.svg \ + info.svg \ + question.svg \ + warning.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/auth.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/auth.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/cool.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/cool.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/dialog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/dialog.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/error.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/error.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/info.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/info.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,401 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/question.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/question.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + ? + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/scalable/warning.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/scalable/warning.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + ! + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/64/warning.png Binary file pidgin/pixmaps/dialogs/64/warning.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,6 @@ +SUBDIRS = 16 64 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw \ + 64/Makefile.mingw diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/dialogs/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,16 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +include ./Makefile.am + +.PHONY: install + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,21 @@ +SUBDIRS = scalable + +EXTRA_DIST = aol-client.png \ + blocked.png \ + bot.png \ + external.png \ + female.png \ + free-for-chat.png \ + game.png \ + male.png \ + message-pending.png \ + mobile.png \ + not-authorized.png \ + qq-member.png \ + secure.png \ + unavailable.png \ + video.png \ + voice.png + +pidginemblempixdir = $(datadir)/pixmaps/pidgin/emblems/16 +pidginemblempix_DATA = $(EXTRA_DIST) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginemblempix_DATA)'; then \ + mkdir -p $(pidginemblempixdir); \ + cp $(pidginemblempix_DATA) $(pidginemblempixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/aol-client.png Binary file pidgin/pixmaps/emblems/16/aol-client.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/blocked.png Binary file pidgin/pixmaps/emblems/16/blocked.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/bot.png Binary file pidgin/pixmaps/emblems/16/bot.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/external.png Binary file pidgin/pixmaps/emblems/16/external.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/female.png Binary file pidgin/pixmaps/emblems/16/female.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/free-for-chat.png Binary file pidgin/pixmaps/emblems/16/free-for-chat.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/game.png Binary file pidgin/pixmaps/emblems/16/game.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/male.png Binary file pidgin/pixmaps/emblems/16/male.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/message-pending.png Binary file pidgin/pixmaps/emblems/16/message-pending.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/mobile.png Binary file pidgin/pixmaps/emblems/16/mobile.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/not-authorized.png Binary file pidgin/pixmaps/emblems/16/not-authorized.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/qq-member.png Binary file pidgin/pixmaps/emblems/16/qq-member.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,16 @@ +EXTRA_DIST = aol-client.svg \ + blocked.svg \ + bot.svg \ + external.svg \ + female.svg \ + free-for-chat.svg \ + game.svg \ + male.svg \ + message-pending.svg \ + mobile.svg \ + not-authorized.svg \ + qq-member.svg \ + secure.svg \ + unavailable.svg \ + video.svg \ + voice.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/aol-client.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/aol-client.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,81 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/blocked.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/blocked.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/bot.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/bot.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/external.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/external.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/female.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/female.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/free-for-chat.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/free-for-chat.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/game.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/game.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/male.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/male.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/message-pending.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/message-pending.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,365 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/mobile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/mobile.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/not-authorized.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/not-authorized.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/qq-member.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/qq-member.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/secure.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/secure.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/unavailable.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/unavailable.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/video.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/video.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,198 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/scalable/voice.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/voice.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/secure.png Binary file pidgin/pixmaps/emblems/16/secure.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/unavailable.png Binary file pidgin/pixmaps/emblems/16/unavailable.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/video.png Binary file pidgin/pixmaps/emblems/16/video.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/16/voice.png Binary file pidgin/pixmaps/emblems/16/voice.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,5 @@ +SUBDIRS = 16 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emblems/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,16 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +include ./Makefile.am + +.PHONY: install + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,3 +1,5 @@ +SUBDIRS = scalable + SMILEYS = act-up.png \ airplane.png \ alien.png \ diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,156 @@ +EXTRA_DIST = act-up.svg \ + airplane.svg \ + alien.svg \ + angel.svg \ + angry.svg \ + arrogant.svg \ + bad.svg \ + bashful.svg \ + beat-up.svg \ + beauty.svg \ + beer.svg \ + blowkiss.svg \ + bomb.svg \ + bowl.svg \ + boy.svg \ + brb.svg \ + bye.svg \ + cake.svg \ + camera.svg \ + can.svg \ + car.svg \ + cat.svg \ + chicken.svg \ + clap.svg \ + clock.svg \ + cloudy.svg \ + clover.svg \ + clown.svg \ + coffee.svg \ + coins.svg \ + computer.svg \ + confused.svg \ + console.svg \ + cow.svg \ + crying.svg \ + curl-lip.svg \ + curse.svg \ + cute.svg \ + dance.svg \ + dazed.svg \ + desire.svg \ + devil.svg \ + disapointed.svg \ + disdain.svg \ + doctor.svg \ + dog.svg \ + doh.svg \ + dont-know.svg \ + drink.svg \ + drool.svg \ + eat.svg \ + embarrassed.svg \ + excruciating.svg \ + eyeroll.svg \ + film.svg \ + fingers-crossed.svg \ + flag.svg \ + foot-in-mouth.svg \ + freaked-out.svg \ + ghost.svg \ + girl.svg \ + glasses-cool.svg \ + glasses-nerdy.svg \ + go-away.svg \ + good.svg \ + hammer.svg \ + handcuffs.svg \ + handshake.svg \ + highfive.svg \ + hug-left.svg \ + hug-right.svg \ + hypnotized.svg \ + in-love.svg \ + island.svg \ + jump.svg \ + knife.svg \ + lamp.svg \ + lashes.svg \ + laugh.svg \ + liquor.svg \ + love-over.svg \ + love.svg \ + lying.svg \ + mail.svg \ + mean.svg \ + meeting.svg \ + mobile.svg \ + monkey.svg \ + moneymouth.svg \ + moon.svg \ + msn-away.svg \ + msn-busy.svg \ + msn_online.svg \ + msn.svg \ + musical-note.svg \ + neutral.svg \ + party.svg \ + peace.svg \ + phone.svg \ + pig.svg \ + pill.svg \ + pissed-off.svg \ + pizza.svg \ + plate.svg \ + poop.svg \ + pray.svg \ + present.svg \ + question.svg \ + quiet.svg \ + rainbow.svg \ + rain.svg \ + rose-dead.svg \ + rose.svg \ + sad.svg \ + sarcastic.svg \ + search.svg \ + secret.svg \ + shame.svg \ + sheep.svg \ + shock.svg \ + shut-mouth.svg \ + sick.svg \ + sigarette.svg \ + silly.svg \ + skeleton.svg \ + sleepy.svg \ + smile-big.svg \ + smile.svg \ + smirk.svg \ + snail.svg \ + snicker.svg \ + snowman.svg \ + soccerball.svg \ + soldier.svg \ + star.svg \ + starving.svg \ + struggle.svg \ + sun.svg \ + sweat.svg \ + teeth.svg \ + terror.svg \ + thinking.svg \ + thunder.svg \ + tongue.svg \ + tremble.svg \ + turtle.svg \ + tv.svg \ + umbrella.svg \ + vampire.svg \ + victory.svg \ + watermelon.svg \ + weep.svg \ + wilt.svg \ + wink.svg \ + yawn.svg \ + yin-yang.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/act-up.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/act-up.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/airplane.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/airplane.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/alien.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/alien.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/angel.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/angel.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/angry.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/angry.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/arrogant.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/arrogant.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/bad.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/bad.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/bashful.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/bashful.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/beat-up.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/beat-up.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/beauty.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/beauty.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/beer.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/beer.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/blowkiss.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/blowkiss.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/bomb.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/bomb.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/bowl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/bowl.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/boy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/boy.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/brb.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/brb.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/bye.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/bye.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/cake.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/cake.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,365 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/camera.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/camera.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/can.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/can.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/car.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/car.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/cat.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/cat.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/chicken.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/chicken.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/clap.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/clap.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/clock.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/clock.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/cloudy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/cloudy.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/clover.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/clover.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/clown.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/clown.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/coffee.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/coffee.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/coins.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/coins.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/computer.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/computer.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/confused.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/confused.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/console.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/console.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/cow.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/cow.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/crying.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/crying.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/curl-lip.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/curl-lip.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/curse.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/curse.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/cute.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/cute.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/dance.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/dance.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/dazed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/dazed.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/desire.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/desire.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/devil.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/devil.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/disapointed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/disapointed.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/disdain.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/disdain.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/doctor.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/doctor.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/dog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/dog.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/doh.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/doh.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/dont-know.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/dont-know.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/drink.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/drink.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/drool.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/drool.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/eat.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/eat.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/embarrassed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/embarrassed.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/excruciating.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/excruciating.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/eyeroll.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/eyeroll.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/film.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/film.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/fingers-crossed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/fingers-crossed.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/flag.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/flag.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/foot-in-mouth.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/foot-in-mouth.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/freaked-out.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/freaked-out.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/ghost.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/ghost.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/girl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/girl.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/glasses-cool.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/glasses-cool.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/glasses-nerdy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/glasses-nerdy.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/go-away.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/go-away.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/good.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/good.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/hammer.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/hammer.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/handcuffs.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/handcuffs.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/handshake.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/handshake.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/highfive.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/highfive.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/hug-left.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/hug-left.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/hug-right.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/hug-right.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/hypnotized.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/hypnotized.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/in-love.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/in-love.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/island.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/island.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/jump.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/jump.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/knife.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/knife.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/lamp.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/lamp.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/lashes.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/lashes.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/laugh.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/laugh.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/liquor.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/liquor.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/love-over.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/love-over.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/love.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/love.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/lying.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/lying.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/mail.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/mail.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/mean.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/mean.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/meeting.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/meeting.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/mobile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/mobile.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/moneymouth.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/moneymouth.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/monkey.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/monkey.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/moon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/moon.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/msn-away.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/msn-away.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/msn-busy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/msn-busy.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/msn.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/msn.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/msn_online.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/msn_online.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/musical-note.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/musical-note.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/neutral.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/neutral.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/party.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/party.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/peace.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/peace.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/phone.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/phone.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/pig.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/pig.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/pill.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/pill.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/pissed-off.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/pissed-off.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/pizza.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/pizza.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/plate.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/plate.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/poop.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/poop.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/pray.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/pray.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/present.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/present.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/question.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/question.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/quiet.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/quiet.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/rain.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/rain.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/rainbow.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/rainbow.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/rose-dead.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/rose-dead.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/rose.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/rose.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sad.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sad.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sarcastic.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sarcastic.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/search.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/search.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/secret.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/secret.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/shame.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/shame.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sheep.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sheep.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/shock.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/shock.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/shut-mouth.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/shut-mouth.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sick.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sick.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sigarette.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sigarette.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/silly.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/silly.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/skeleton.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/skeleton.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sleepy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sleepy.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/smile-big.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/smile-big.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/smile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/smile.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/smirk.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/smirk.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/snail.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/snail.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/snicker.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/snicker.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/snowman.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/snowman.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/soccerball.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/soccerball.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/soldier.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/soldier.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/star.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/star.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/starving.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/starving.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/struggle.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/struggle.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sun.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sun.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/sweat.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/sweat.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/teeth.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/teeth.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/terror.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/terror.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/thinking.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/thinking.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/thunder.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/thunder.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/tongue.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/tongue.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/tremble.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/tremble.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/turtle.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/turtle.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/tv.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/tv.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/umbrella.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/umbrella.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/vampire.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/vampire.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/victory.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/victory.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/watermelon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/watermelon.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/weep.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/weep.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/wilt.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/wilt.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/wink.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/wink.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/yawn.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/yawn.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/22/scalable/yin-yang.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/yin-yang.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/Makefile.am --- a/pidgin/pixmaps/emotes/default/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,5 +1,5 @@ -SUBDIRS=22 scalable +SUBDIRS=22 EXTRA_DIST= \ - 22/Makefile.mingw \ - scalable/Makefile.mingw + Makefile.mingw \ + 22/Makefile.mingw diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/Makefile.am --- a/pidgin/pixmaps/emotes/default/scalable/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,156 +0,0 @@ -EXTRA_DIST = act-up.svg \ - airplane.svg \ - alien.svg \ - angel.svg \ - angry.svg \ - arrogant.svg \ - bad.svg \ - bashful.svg \ - beat-up.svg \ - beauty.svg \ - beer.svg \ - blowkiss.svg \ - bomb.svg \ - bowl.svg \ - boy.svg \ - brb.svg \ - bye.svg \ - cake.svg \ - camera.svg \ - can.svg \ - car.svg \ - cat.svg \ - chicken.svg \ - clap.svg \ - clock.svg \ - cloudy.svg \ - clover.svg \ - clown.svg \ - coffee.svg \ - coins.svg \ - computer.svg \ - confused.svg \ - console.svg \ - cow.svg \ - crying.svg \ - curl-lip.svg \ - curse.svg \ - cute.svg \ - dance.svg \ - dazed.svg \ - desire.svg \ - devil.svg \ - disapointed.svg \ - disdain.svg \ - doctor.svg \ - dog.svg \ - doh.svg \ - dont-know.svg \ - drink.svg \ - drool.svg \ - eat.svg \ - embarrassed.svg \ - excruciating.svg \ - eyeroll.svg \ - film.svg \ - fingers-crossed.svg \ - flag.svg \ - foot-in-mouth.svg \ - freaked-out.svg \ - ghost.svg \ - girl.svg \ - glasses-cool.svg \ - glasses-nerdy.svg \ - go-away.svg \ - good.svg \ - hammer.svg \ - handcuffs.svg \ - handshake.svg \ - highfive.svg \ - hug-left.svg \ - hug-right.svg \ - hypnotized.svg \ - in-love.svg \ - island.svg \ - jump.svg \ - knife.svg \ - lamp.svg \ - lashes.svg \ - laugh.svg \ - liquor.svg \ - love-over.svg \ - love.svg \ - lying.svg \ - mail.svg \ - mean.svg \ - meeting.svg \ - mobile.svg \ - monkey.svg \ - moneymouth.png - moon.svg \ - msn-away.svg \ - msn-busy.svg \ - msn_online.svg \ - msn.svg \ - musical-note.svg \ - neutral.svg \ - party.svg \ - peace.svg \ - phone.svg \ - pig.svg \ - pill.svg \ - pissed-off.svg \ - pizza.svg \ - plate.svg \ - poop.svg \ - pray.svg \ - present.svg \ - question.svg \ - quiet.svg \ - rainbow.svg \ - rain.svg \ - rose-dead.svg \ - rose.svg \ - sad.svg \ - sarcastic.svg \ - search.svg \ - secret.svg \ - shame.svg \ - sheep.svg \ - shock.svg \ - shut-mouth.svg \ - sick.svg \ - sigarette.svg \ - silly.svg \ - skeleton.svg \ - sleepy.svg \ - smile-big.svg \ - smile.svg \ - smirk.svg \ - snail.svg \ - snicker.svg \ - snowman.svg \ - soccerball.svg \ - soldier.svg \ - star.svg \ - starving.svg \ - struggle.svg \ - sun.svg \ - sweat.svg \ - teeth.svg \ - terror.svg \ - thinking.svg \ - thunder.svg \ - tongue.svg \ - tremble.svg \ - turtle.svg \ - tv.svg \ - umbrella.svg \ - vampire.svg \ - victory.svg \ - watermelon.svg \ - weep.svg \ - wilt.svg \ - wink.svg \ - yawn.svg \ - yin-yang.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/Makefile.mingw --- a/pidgin/pixmaps/emotes/default/scalable/Makefile.mingw Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# -# Makefile.mingw -# -# Description: Makefile for win32 (mingw) version of Pidgin pixmaps -# - -.PHONY: install - -install: - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/act-up.svg --- a/pidgin/pixmaps/emotes/default/scalable/act-up.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/airplane.svg --- a/pidgin/pixmaps/emotes/default/scalable/airplane.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/alien.svg --- a/pidgin/pixmaps/emotes/default/scalable/alien.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/angel.svg --- a/pidgin/pixmaps/emotes/default/scalable/angel.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/angry.svg --- a/pidgin/pixmaps/emotes/default/scalable/angry.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/arrogant.svg --- a/pidgin/pixmaps/emotes/default/scalable/arrogant.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/bad.svg --- a/pidgin/pixmaps/emotes/default/scalable/bad.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/bashful.svg --- a/pidgin/pixmaps/emotes/default/scalable/bashful.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/beat-up.svg --- a/pidgin/pixmaps/emotes/default/scalable/beat-up.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/beauty.svg --- a/pidgin/pixmaps/emotes/default/scalable/beauty.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/beer.svg --- a/pidgin/pixmaps/emotes/default/scalable/beer.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/blowkiss.svg --- a/pidgin/pixmaps/emotes/default/scalable/blowkiss.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/bomb.svg --- a/pidgin/pixmaps/emotes/default/scalable/bomb.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/bowl.svg --- a/pidgin/pixmaps/emotes/default/scalable/bowl.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/boy.svg --- a/pidgin/pixmaps/emotes/default/scalable/boy.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/brb.svg --- a/pidgin/pixmaps/emotes/default/scalable/brb.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/bye.svg --- a/pidgin/pixmaps/emotes/default/scalable/bye.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/cake.svg --- a/pidgin/pixmaps/emotes/default/scalable/cake.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,365 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/camera.svg --- a/pidgin/pixmaps/emotes/default/scalable/camera.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/can.svg --- a/pidgin/pixmaps/emotes/default/scalable/can.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/car.svg --- a/pidgin/pixmaps/emotes/default/scalable/car.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/cat.svg --- a/pidgin/pixmaps/emotes/default/scalable/cat.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,289 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/chicken.svg --- a/pidgin/pixmaps/emotes/default/scalable/chicken.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/clap.svg --- a/pidgin/pixmaps/emotes/default/scalable/clap.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/clock.svg --- a/pidgin/pixmaps/emotes/default/scalable/clock.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/cloudy.svg --- a/pidgin/pixmaps/emotes/default/scalable/cloudy.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/clover.svg --- a/pidgin/pixmaps/emotes/default/scalable/clover.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/clown.svg --- a/pidgin/pixmaps/emotes/default/scalable/clown.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/coffee.svg --- a/pidgin/pixmaps/emotes/default/scalable/coffee.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/coins.svg --- a/pidgin/pixmaps/emotes/default/scalable/coins.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/computer.svg --- a/pidgin/pixmaps/emotes/default/scalable/computer.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/confused.svg --- a/pidgin/pixmaps/emotes/default/scalable/confused.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/console.svg --- a/pidgin/pixmaps/emotes/default/scalable/console.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,466 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/cow.svg --- a/pidgin/pixmaps/emotes/default/scalable/cow.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/crying.svg --- a/pidgin/pixmaps/emotes/default/scalable/crying.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/curl-lip.svg --- a/pidgin/pixmaps/emotes/default/scalable/curl-lip.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/curse.svg --- a/pidgin/pixmaps/emotes/default/scalable/curse.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/cute.svg --- a/pidgin/pixmaps/emotes/default/scalable/cute.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/dance.svg --- a/pidgin/pixmaps/emotes/default/scalable/dance.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/dazed.svg --- a/pidgin/pixmaps/emotes/default/scalable/dazed.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/desire.svg --- a/pidgin/pixmaps/emotes/default/scalable/desire.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/devil.svg --- a/pidgin/pixmaps/emotes/default/scalable/devil.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/disapointed.svg --- a/pidgin/pixmaps/emotes/default/scalable/disapointed.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/disdain.svg --- a/pidgin/pixmaps/emotes/default/scalable/disdain.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/doctor.svg --- a/pidgin/pixmaps/emotes/default/scalable/doctor.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/dog.svg --- a/pidgin/pixmaps/emotes/default/scalable/dog.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/doh.svg --- a/pidgin/pixmaps/emotes/default/scalable/doh.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/dont-know.svg --- a/pidgin/pixmaps/emotes/default/scalable/dont-know.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/drink.svg --- a/pidgin/pixmaps/emotes/default/scalable/drink.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/drool.svg --- a/pidgin/pixmaps/emotes/default/scalable/drool.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/eat.svg --- a/pidgin/pixmaps/emotes/default/scalable/eat.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,277 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/embarrassed.svg --- a/pidgin/pixmaps/emotes/default/scalable/embarrassed.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/excruciating.svg --- a/pidgin/pixmaps/emotes/default/scalable/excruciating.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/eyeroll.svg --- a/pidgin/pixmaps/emotes/default/scalable/eyeroll.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/film.svg --- a/pidgin/pixmaps/emotes/default/scalable/film.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/fingers-crossed.svg --- a/pidgin/pixmaps/emotes/default/scalable/fingers-crossed.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/flag.svg --- a/pidgin/pixmaps/emotes/default/scalable/flag.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/foot-in-mouth.svg --- a/pidgin/pixmaps/emotes/default/scalable/foot-in-mouth.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/freaked-out.svg --- a/pidgin/pixmaps/emotes/default/scalable/freaked-out.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/ghost.svg --- a/pidgin/pixmaps/emotes/default/scalable/ghost.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/girl.svg --- a/pidgin/pixmaps/emotes/default/scalable/girl.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/glasses-cool.svg --- a/pidgin/pixmaps/emotes/default/scalable/glasses-cool.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/glasses-nerdy.svg --- a/pidgin/pixmaps/emotes/default/scalable/glasses-nerdy.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/go-away.svg --- a/pidgin/pixmaps/emotes/default/scalable/go-away.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/good.svg --- a/pidgin/pixmaps/emotes/default/scalable/good.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/hammer.svg --- a/pidgin/pixmaps/emotes/default/scalable/hammer.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/handcuffs.svg --- a/pidgin/pixmaps/emotes/default/scalable/handcuffs.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/handshake.svg --- a/pidgin/pixmaps/emotes/default/scalable/handshake.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/highfive.svg --- a/pidgin/pixmaps/emotes/default/scalable/highfive.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,320 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/hug-left.svg --- a/pidgin/pixmaps/emotes/default/scalable/hug-left.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/hug-right.svg --- a/pidgin/pixmaps/emotes/default/scalable/hug-right.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/hypnotized.svg --- a/pidgin/pixmaps/emotes/default/scalable/hypnotized.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/in-love.svg --- a/pidgin/pixmaps/emotes/default/scalable/in-love.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/island.svg --- a/pidgin/pixmaps/emotes/default/scalable/island.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/jump.svg --- a/pidgin/pixmaps/emotes/default/scalable/jump.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,289 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/knife.svg --- a/pidgin/pixmaps/emotes/default/scalable/knife.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/lamp.svg --- a/pidgin/pixmaps/emotes/default/scalable/lamp.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/lashes.svg --- a/pidgin/pixmaps/emotes/default/scalable/lashes.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/laugh.svg --- a/pidgin/pixmaps/emotes/default/scalable/laugh.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/liquor.svg --- a/pidgin/pixmaps/emotes/default/scalable/liquor.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/love-over.svg --- a/pidgin/pixmaps/emotes/default/scalable/love-over.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/love.svg --- a/pidgin/pixmaps/emotes/default/scalable/love.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/lying.svg --- a/pidgin/pixmaps/emotes/default/scalable/lying.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/mail.svg --- a/pidgin/pixmaps/emotes/default/scalable/mail.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/mean.svg --- a/pidgin/pixmaps/emotes/default/scalable/mean.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/meeting.svg --- a/pidgin/pixmaps/emotes/default/scalable/meeting.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/mobile.svg --- a/pidgin/pixmaps/emotes/default/scalable/mobile.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/moneymouth.svg --- a/pidgin/pixmaps/emotes/default/scalable/moneymouth.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/monkey.svg --- a/pidgin/pixmaps/emotes/default/scalable/monkey.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/moon.svg --- a/pidgin/pixmaps/emotes/default/scalable/moon.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/msn-away.svg --- a/pidgin/pixmaps/emotes/default/scalable/msn-away.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,332 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/msn-busy.svg --- a/pidgin/pixmaps/emotes/default/scalable/msn-busy.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,339 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/msn.svg --- a/pidgin/pixmaps/emotes/default/scalable/msn.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/msn_online.svg --- a/pidgin/pixmaps/emotes/default/scalable/msn_online.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,371 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/musical-note.svg --- a/pidgin/pixmaps/emotes/default/scalable/musical-note.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/neutral.svg --- a/pidgin/pixmaps/emotes/default/scalable/neutral.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/party.svg --- a/pidgin/pixmaps/emotes/default/scalable/party.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/peace.svg --- a/pidgin/pixmaps/emotes/default/scalable/peace.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/phone.svg --- a/pidgin/pixmaps/emotes/default/scalable/phone.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/pig.svg --- a/pidgin/pixmaps/emotes/default/scalable/pig.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/pill.svg --- a/pidgin/pixmaps/emotes/default/scalable/pill.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/pissed-off.svg --- a/pidgin/pixmaps/emotes/default/scalable/pissed-off.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/pizza.svg --- a/pidgin/pixmaps/emotes/default/scalable/pizza.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/plate.svg --- a/pidgin/pixmaps/emotes/default/scalable/plate.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/poop.svg --- a/pidgin/pixmaps/emotes/default/scalable/poop.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,222 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/pray.svg --- a/pidgin/pixmaps/emotes/default/scalable/pray.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/present.svg --- a/pidgin/pixmaps/emotes/default/scalable/present.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,428 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/question.svg --- a/pidgin/pixmaps/emotes/default/scalable/question.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/quiet.svg --- a/pidgin/pixmaps/emotes/default/scalable/quiet.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/rain.svg --- a/pidgin/pixmaps/emotes/default/scalable/rain.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/rainbow.svg --- a/pidgin/pixmaps/emotes/default/scalable/rainbow.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/rose-dead.svg --- a/pidgin/pixmaps/emotes/default/scalable/rose-dead.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/rose.svg --- a/pidgin/pixmaps/emotes/default/scalable/rose.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sad.svg --- a/pidgin/pixmaps/emotes/default/scalable/sad.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sarcastic.svg --- a/pidgin/pixmaps/emotes/default/scalable/sarcastic.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/search.svg --- a/pidgin/pixmaps/emotes/default/scalable/search.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/secret.svg --- a/pidgin/pixmaps/emotes/default/scalable/secret.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/shame.svg --- a/pidgin/pixmaps/emotes/default/scalable/shame.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sheep.svg --- a/pidgin/pixmaps/emotes/default/scalable/sheep.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/shock.svg --- a/pidgin/pixmaps/emotes/default/scalable/shock.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/shut-mouth.svg --- a/pidgin/pixmaps/emotes/default/scalable/shut-mouth.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sick.svg --- a/pidgin/pixmaps/emotes/default/scalable/sick.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sigarette.svg --- a/pidgin/pixmaps/emotes/default/scalable/sigarette.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/silly.svg --- a/pidgin/pixmaps/emotes/default/scalable/silly.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/skeleton.svg --- a/pidgin/pixmaps/emotes/default/scalable/skeleton.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sleepy.svg --- a/pidgin/pixmaps/emotes/default/scalable/sleepy.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/smile-big.svg --- a/pidgin/pixmaps/emotes/default/scalable/smile-big.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/smile.svg --- a/pidgin/pixmaps/emotes/default/scalable/smile.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/smirk.svg --- a/pidgin/pixmaps/emotes/default/scalable/smirk.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/snail.svg --- a/pidgin/pixmaps/emotes/default/scalable/snail.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/snicker.svg --- a/pidgin/pixmaps/emotes/default/scalable/snicker.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/snowman.svg --- a/pidgin/pixmaps/emotes/default/scalable/snowman.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/soccerball.svg --- a/pidgin/pixmaps/emotes/default/scalable/soccerball.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/soldier.svg --- a/pidgin/pixmaps/emotes/default/scalable/soldier.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/star.svg --- a/pidgin/pixmaps/emotes/default/scalable/star.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/starving.svg --- a/pidgin/pixmaps/emotes/default/scalable/starving.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/struggle.svg --- a/pidgin/pixmaps/emotes/default/scalable/struggle.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sun.svg --- a/pidgin/pixmaps/emotes/default/scalable/sun.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/sweat.svg --- a/pidgin/pixmaps/emotes/default/scalable/sweat.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/teeth.svg --- a/pidgin/pixmaps/emotes/default/scalable/teeth.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/terror.svg --- a/pidgin/pixmaps/emotes/default/scalable/terror.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/thinking.svg --- a/pidgin/pixmaps/emotes/default/scalable/thinking.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/thunder.svg --- a/pidgin/pixmaps/emotes/default/scalable/thunder.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/tongue.svg --- a/pidgin/pixmaps/emotes/default/scalable/tongue.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/tremble.svg --- a/pidgin/pixmaps/emotes/default/scalable/tremble.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/turtle.svg --- a/pidgin/pixmaps/emotes/default/scalable/turtle.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/tv.svg --- a/pidgin/pixmaps/emotes/default/scalable/tv.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,319 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/umbrella.svg --- a/pidgin/pixmaps/emotes/default/scalable/umbrella.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/vampire.svg --- a/pidgin/pixmaps/emotes/default/scalable/vampire.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/victory.svg --- a/pidgin/pixmaps/emotes/default/scalable/victory.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,222 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/watermelon.svg --- a/pidgin/pixmaps/emotes/default/scalable/watermelon.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/weep.svg --- a/pidgin/pixmaps/emotes/default/scalable/weep.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/wilt.svg --- a/pidgin/pixmaps/emotes/default/scalable/wilt.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/wink.svg --- a/pidgin/pixmaps/emotes/default/scalable/wink.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/yawn.svg --- a/pidgin/pixmaps/emotes/default/scalable/yawn.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/emotes/default/scalable/yin-yang.svg --- a/pidgin/pixmaps/emotes/default/scalable/yin-yang.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/gaim_auth.png Binary file pidgin/pixmaps/gaim_auth.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/gaim_cool.png Binary file pidgin/pixmaps/gaim_cool.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/gaim_error.png Binary file pidgin/pixmaps/gaim_error.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/gaim_info.png Binary file pidgin/pixmaps/gaim_info.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/gaim_question.png Binary file pidgin/pixmaps/gaim_question.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/gaim_warning.png Binary file pidgin/pixmaps/gaim_warning.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,19 @@ +SUBDIRS = scalable + +EXTRA_DIST = aim.png \ + bonjour.png \ + gadu-gadu.png \ + novell.png \ + icq.png \ + irc.png \ + jabber.png \ + meanwhile.png \ + msn.png \ + qq.png \ + silc.png \ + simple.png \ + yahoo.png \ + zephyr.png + +pidginprotocolpixdir = $(datadir)/pixmaps/pidgin/protocols/16 +pidginprotocolpix_DATA = $(EXTRA_DIST) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginprotocolpix_DATA)'; then \ + mkdir -p $(pidginprotocolpixdir); \ + cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/aim.png Binary file pidgin/pixmaps/protocols/16/aim.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/bonjour.png Binary file pidgin/pixmaps/protocols/16/bonjour.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/gadu-gadu.png Binary file pidgin/pixmaps/protocols/16/gadu-gadu.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/icq.png Binary file pidgin/pixmaps/protocols/16/icq.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/irc.png Binary file pidgin/pixmaps/protocols/16/irc.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/jabber.png Binary file pidgin/pixmaps/protocols/16/jabber.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/meanwhile.png Binary file pidgin/pixmaps/protocols/16/meanwhile.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/msn.png Binary file pidgin/pixmaps/protocols/16/msn.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/novell.png Binary file pidgin/pixmaps/protocols/16/novell.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/qq.png Binary file pidgin/pixmaps/protocols/16/qq.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,14 @@ +EXTRA_DIST = aim.svg \ + bonjour.svg \ + gadu-gadu.svg \ + novell.svg \ + icq.svg \ + irc.svg \ + jabber.svg \ + meanwhile.svg \ + msn.svg \ + qq.svg \ + silc.svg \ + simple.svg \ + yahoo.svg \ + zephyr.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/aim.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/aim.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,365 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/bonjour.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/bonjour.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/gadu-gadu.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/gadu-gadu.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/icq.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/icq.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/irc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/irc.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/jabber.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/jabber.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/meanwhile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/meanwhile.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/msn.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/msn.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/novell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/novell.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/qq.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/qq.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/silc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/silc.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/simple.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/simple.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/yahoo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/yahoo.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/scalable/zephyr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/zephyr.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/silc.png Binary file pidgin/pixmaps/protocols/16/silc.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/simple.png Binary file pidgin/pixmaps/protocols/16/simple.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/yahoo.png Binary file pidgin/pixmaps/protocols/16/yahoo.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/16/zephyr.png Binary file pidgin/pixmaps/protocols/16/zephyr.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +SUBDIRS = scalable + +EXTRA_DIST = aim.png \ + bonjour.png \ + gadu-gadu.png \ + novell.png \ + icq.png \ + irc.png \ + jabber.png \ + meanwhile.png \ + msn.png \ + qq.png \ + silc.png \ + simple.png \ + yahoo.png \ + zephyr.png + +pidginprotocolpixdir = $(datadir)/pixmaps/pidgin/protocols/22 + +pidginprotocolpix_DATA = $(EXTRA_DIST) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginprotocolpix_DATA)'; then \ + mkdir -p $(pidginprotocolpixdir); \ + cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/aim.png Binary file pidgin/pixmaps/protocols/22/aim.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/bonjour.png Binary file pidgin/pixmaps/protocols/22/bonjour.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/gadu-gadu.png Binary file pidgin/pixmaps/protocols/22/gadu-gadu.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/icq.png Binary file pidgin/pixmaps/protocols/22/icq.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/irc.png Binary file pidgin/pixmaps/protocols/22/irc.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/jabber.png Binary file pidgin/pixmaps/protocols/22/jabber.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/meanwhile.png Binary file pidgin/pixmaps/protocols/22/meanwhile.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/msn.png Binary file pidgin/pixmaps/protocols/22/msn.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/novell.png Binary file pidgin/pixmaps/protocols/22/novell.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/qq.png Binary file pidgin/pixmaps/protocols/22/qq.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,14 @@ +EXTRA_DIST = aim.svg \ + bonjour.svg \ + gadu-gadu.svg \ + novell.svg \ + icq.svg \ + irc.svg \ + jabber.svg \ + meanwhile.svg \ + msn.svg \ + qq.svg \ + silc.svg \ + simple.svg \ + yahoo.svg \ + zephyr.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/aim.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/aim.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/bonjour.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/bonjour.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/gadu-gadu.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/gadu-gadu.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/icq.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/icq.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/irc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/irc.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/jabber.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/jabber.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/meanwhile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/meanwhile.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/msn.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/msn.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/novell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/novell.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/qq.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/qq.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/silc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/silc.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/simple.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/simple.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/yahoo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/yahoo.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/scalable/zephyr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/zephyr.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/silc.png Binary file pidgin/pixmaps/protocols/22/silc.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/simple.png Binary file pidgin/pixmaps/protocols/22/simple.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/yahoo.png Binary file pidgin/pixmaps/protocols/22/yahoo.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/22/zephyr.png Binary file pidgin/pixmaps/protocols/22/zephyr.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +SUBDIRS = scalable + +EXTRA_DIST = aim.png \ + bonjour.png \ + gadu-gadu.png \ + novell.png \ + icq.png \ + irc.png \ + jabber.png \ + meanwhile.png \ + msn.png \ + qq.png \ + silc.png \ + simple.png \ + yahoo.png \ + zephyr.png + +pidginprotocolpixdir = $(datadir)/pixmaps/pidgin/protocols/48 + +pidginprotocolpix_DATA = $(EXTRA_DIST) diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginprotocolpix_DATA)'; then \ + mkdir -p $(pidginprotocolpixdir); \ + cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \ + fi; + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/aim.png Binary file pidgin/pixmaps/protocols/48/aim.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/bonjour.png Binary file pidgin/pixmaps/protocols/48/bonjour.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/gadu-gadu.png Binary file pidgin/pixmaps/protocols/48/gadu-gadu.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/icq.png Binary file pidgin/pixmaps/protocols/48/icq.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/irc.png Binary file pidgin/pixmaps/protocols/48/irc.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/jabber.png Binary file pidgin/pixmaps/protocols/48/jabber.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/meanwhile.png Binary file pidgin/pixmaps/protocols/48/meanwhile.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/msn.png Binary file pidgin/pixmaps/protocols/48/msn.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/novell.png Binary file pidgin/pixmaps/protocols/48/novell.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/qq.png Binary file pidgin/pixmaps/protocols/48/qq.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,14 @@ +EXTRA_DIST = aim.svg \ + bonjour.svg \ + gadu-gadu.svg \ + novell.svg \ + icq.svg \ + irc.svg \ + jabber.svg \ + meanwhile.svg \ + msn.svg \ + qq.svg \ + silc.svg \ + simple.svg \ + yahoo.svg \ + zephyr.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/aim.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/aim.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/bonjour.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/bonjour.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/gadu-gadu.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/gadu-gadu.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/icq.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/icq.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/irc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/irc.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,436 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/jabber.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/jabber.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/meanwhile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/meanwhile.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/msn.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/msn.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/novell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/novell.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/qq.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/qq.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/silc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/silc.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/simple.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/simple.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/yahoo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/yahoo.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/scalable/zephyr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/zephyr.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/silc.png Binary file pidgin/pixmaps/protocols/48/silc.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/simple.png Binary file pidgin/pixmaps/protocols/48/simple.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/yahoo.png Binary file pidgin/pixmaps/protocols/48/yahoo.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/48/zephyr.png Binary file pidgin/pixmaps/protocols/48/zephyr.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,8 @@ +SUBDIRS = 16 22 48 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw \ + 22/Makefile.mingw \ + 48/Makefile.mingw + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/protocols/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,16 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +include ./Makefile.am + +.PHONY: install + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/16/Makefile.am --- a/pidgin/pixmaps/status/16/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/status/16/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -6,6 +6,7 @@ chat.png \ extended-away.png \ half-operator.png \ + invisible.png \ log-in.png \ log-out.png \ offline.png \ diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/16/invisible.png Binary file pidgin/pixmaps/status/16/invisible.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/16/scalable/Makefile.am --- a/pidgin/pixmaps/status/16/scalable/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/status/16/scalable/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -3,9 +3,10 @@ busy.svg \ chat.svg \ extended-away.svg \ - half-operator.svg \ log-in.svg \ log-out.svg \ offline.svg \ - operator.svg \ person.svg + +# half-operator.svg +# operator.svg diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/22/Makefile.am --- a/pidgin/pixmaps/status/22/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/status/22/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -5,6 +5,7 @@ busy.png \ chat.png \ extended-away.png \ + invisible.png \ log-in.png \ log-out.png \ offline.png \ diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/22/invisible.png Binary file pidgin/pixmaps/status/22/invisible.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/22/scalable/busy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/scalable/busy.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/22/scalable/busy22.svg --- a/pidgin/pixmaps/status/22/scalable/busy22.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/22/scalable/offline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/scalable/offline.svg Wed Jan 31 04:53:52 2007 +0000 @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/22/scalable/offline22.svg --- a/pidgin/pixmaps/status/22/scalable/offline22.svg Wed Jan 31 01:48:35 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/32/Makefile.am --- a/pidgin/pixmaps/status/32/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/status/32/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -5,6 +5,7 @@ busy.png \ chat.png \ extended-away.png \ + invisible.png \ log-in.png \ log-out.png \ offline.png \ diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/32/invisible.png Binary file pidgin/pixmaps/status/32/invisible.png has changed diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/pixmaps/status/Makefile.am --- a/pidgin/pixmaps/status/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/pixmaps/status/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,6 +1,7 @@ SUBDIRS = 16 22 32 EXTRA_DIST = \ + Makefile.mingw \ 16/Makefile.mingw \ 22/Makefile.mingw \ 32/Makefile.mingw diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/Makefile.am --- a/pidgin/plugins/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -24,7 +24,7 @@ $(PERL_DIR) \ ticker -plugindir = $(libdir)/gaim +plugindir = $(libdir)/pidgin convcolors_la_LDFLAGS = -module -avoid-version extplacement_la_LDFLAGS = -module -avoid-version diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/cap/Makefile.am --- a/pidgin/plugins/cap/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/cap/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,10 +1,10 @@ -capdir = $(libdir)/gaim +capdir = $(libdir)/pidgin cap_la_LDFLAGS = -module -avoid-version if PLUGINS -cappixdir = $(datadir)/pixmaps/gaim/buttons +cappixdir = $(datadir)/pixmaps/pidgin/buttons cap_LTLIBRARIES = cap.la diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/gestures/Makefile.am --- a/pidgin/plugins/gestures/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/gestures/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gaim +plugindir = $(libdir)/pidgin gestures_la_LDFLAGS = -module -avoid-version diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/notify.c --- a/pidgin/plugins/notify.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/notify.c Wed Jan 31 04:53:52 2007 +0000 @@ -105,8 +105,10 @@ #define NOTIFY_PLUGIN_ID "gtk-x11-notify" static GaimPlugin *my_plugin = NULL; +#ifndef _WIN32 static GdkAtom _Cardinal = GDK_NONE; static GdkAtom _GaimUnseenCount = GDK_NONE; +#endif /* notification set/unset */ static int notify(GaimConversation *conv, gboolean increment); diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/perl/common/Makefile.mingw --- a/pidgin/plugins/perl/common/Makefile.mingw Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/perl/common/Makefile.mingw Wed Jan 31 04:53:52 2007 +0000 @@ -8,7 +8,7 @@ include $(GAIM_TOP)/libpurple/win32/global.mak TARGET = GtkUI -EXTUTILS := C:/perl/lib/ExtUtils +EXTUTILS ?= C:/perl/lib/ExtUtils CFLAGS += -Wno-comment diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/relnot.c --- a/pidgin/plugins/relnot.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/relnot.c Wed Jan 31 04:53:52 2007 +0000 @@ -80,8 +80,8 @@ } g_string_append_printf(message, _("You can get version %s from:
" - "" - "http://gaim.sourceforge.net."), cur_ver); + "" + "http://pidgin.im."), cur_ver); gaim_notify_formatted(NULL, _("New Version Available"), _("New Version Available"), NULL, message->str, diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/ticker/Makefile.am --- a/pidgin/plugins/ticker/Makefile.am Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/ticker/Makefile.am Wed Jan 31 04:53:52 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -plugindir = $(libdir)/gaim +plugindir = $(libdir)/pidgin ticker_la_LDFLAGS = -module -avoid-version diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/plugins/win32/winprefs/winprefs.c --- a/pidgin/plugins/win32/winprefs/winprefs.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Wed Jan 31 04:53:52 2007 +0000 @@ -312,7 +312,7 @@ /* Autostart */ vbox = gaim_gtk_make_frame(ret, _("Startup")); - button = gtk_check_button_new_with_mnemonic(_("_Start Gaim on Windows startup")); + button = gtk_check_button_new_with_mnemonic(_("_Start " PIDGIN_NAME " on Windows startup")); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); if ((run_key_val = wgaim_read_reg_string(HKEY_CURRENT_USER, RUNKEY, "Gaim")) @@ -363,10 +363,10 @@ NULL, GAIM_PRIORITY_DEFAULT, WINPREFS_PLUGIN_ID, - N_("WinGaim Options"), + N_("Pidgwin Options"), VERSION, - N_("Options specific to Windows Gaim."), - N_("Provides options specific to Windows Gaim, such as buddy list docking."), + N_("Options specific to Windows " PIDGIN_NAME "."), + N_("Provides options specific to Windows " PIDGIN_NAME ", such as buddy list docking."), "Herman Bloggs ", GAIM_WEBSITE, plugin_load, diff -r ce0cd7474b64 -r 4222b5790e0b pidgin/win32/gtkdocklet-win32.c --- a/pidgin/win32/gtkdocklet-win32.c Wed Jan 31 01:48:35 2007 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Wed Jan 31 04:53:52 2007 +0000 @@ -134,7 +134,7 @@ wgaim_nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; wgaim_nid.uCallbackMessage = WM_TRAYMESSAGE; wgaim_nid.hIcon = icon; - lstrcpy(wgaim_nid.szTip, "Gaim"); + lstrcpy(wgaim_nid.szTip, PIDGIN_NAME); Shell_NotifyIcon(NIM_ADD, &wgaim_nid); gaim_gtk_docklet_embedded(); } @@ -181,7 +181,7 @@ lstrcpyn(wgaim_nid.szTip, locenc, sizeof(wgaim_nid.szTip) / sizeof(TCHAR)); g_free(locenc); } else { - lstrcpy(wgaim_nid.szTip, "Gaim"); + lstrcpy(wgaim_nid.szTip, PIDGIN_NAME); } Shell_NotifyIcon(NIM_MODIFY, &wgaim_nid); }