Sun, 15 Apr 2007 18:06:49 +0000
merge of 'ca4861bb467f01cc5d461aaca220906ee269fb94'
and 'd4ca3e719c9808c1eece98ba4da353911a7e1f10'
| pidgin/plugins/gaiminc.c | file | annotate | diff | comparison | revisions | |
| pidgin/plugins/pidgininc.c | file | annotate | diff | comparison | revisions |
--- a/.mtn-ignore Sun Apr 15 17:47:45 2007 +0000 +++ b/.mtn-ignore Sun Apr 15 18:06:49 2007 +0000 @@ -8,53 +8,58 @@ .*\.dll$ .*\.exe$ intltool-.* -Doxyfile +Doxyfile$ aclocal.m4 compile config.guess -config.h +config.h$ config.h.in config.log config.status config.sub -configure +configure$ finch/finch finch/libgnt/gntmarshal.c finch/libgnt/gntmarshal.h depcomp -doc/finch.1 -doc/pidgin.1 +doc/finch.1$ +doc/pidgin.1$ doc/html -pidgin.apspec -pidgin.desktop -pidgin.spec +pidgin.apspec$ +pidgin.desktop$ +pidgin.spec$ pidgin-.*.tar.gz pidgin-.*.tar.bz2 pidgin/pidgin pidgin/plugins/musicmessaging/music-messaging-bindings.c -pidgin/plugins/perl/common/Makefile.PL -pidgin/win32/pidgin_dll_rc.rc -pidgin/win32/pidgin_exe_rc.rc +pidgin/plugins/perl/common/Makefile.PL$ +pidgin/win32/pidgin_dll_rc.rc$ +pidgin/win32/pidgin_exe_rc.rc$ install-sh libpurple/dbus-bindings.c libpurple/dbus-types.c libpurple/dbus-types.h libpurple/example/nullclient -libpurple/gconf/purple.schemas +libpurple/gconf/purple.schemas$ libpurple/plugins/dbus-example-bindings.c -libpurple/plugins/perl/common/Makefile.PL +libpurple/plugins/perl/common/Makefile.PL$ libpurple/plugins/perl/common/const-c.inc libpurple/plugins/perl/common/const-xs.inc libpurple/plugins/perl/common/lib -libpurple/win32/libpurplerc.rc +libpurple/purple-client-bindings.c +libpurple/purple-client-bindings.h +libpurple/purple-client-example +libpurple/win32/libpurplerc.rc$ libtool local.mak ltmain.sh missing mkinstalldirs po/Makefile.in.in -po/POTFILES +po/POTFILES$ +po/missing +po/notexist po/stamp-it stamp-h1 win32-install-dir(\.release)? -VERSION +VERSION$
--- a/libpurple/gconf/Makefile.am Sun Apr 15 17:47:45 2007 +0000 +++ b/libpurple/gconf/Makefile.am Sun Apr 15 18:06:49 2007 +0000 @@ -8,7 +8,8 @@ if GCONF_SCHEMAS_INSTALL install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ + grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 else install-data-local: endif
--- a/libpurple/protocols/oscar/oscar.c Sun Apr 15 17:47:45 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Apr 15 18:06:49 2007 +0000 @@ -4477,9 +4477,9 @@ { gchar *errstr; errstr = g_strdup_printf(dngettext(PACKAGE, "The maximum profile length of %d byte " - "has been exceeded. It has been truncated it for you.", + "has been exceeded. It has been truncated for you.", "The maximum profile length of %d bytes " - "has been exceeded. It has been truncated it for you.", + "has been exceeded. It has been truncated for you.", od->rights.maxsiglen), od->rights.maxsiglen); purple_notify_warning(gc, NULL, _("Profile too long."), errstr); g_free(errstr);
--- a/libpurple/protocols/qq/buddy_info.c Sun Apr 15 17:47:45 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Sun Apr 15 18:06:49 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(_("Setting custom faces is not currently supported. Please choose an image from "), buddy_icon_dir, ".", NULL); + gchar *errmsg = g_strdup_printf(_("Setting custom faces is not currently supported. Please choose an image from %s."), buddy_icon_dir); gboolean icon_global = purple_account_get_bool(gc->account, "use-global-buddyicon", TRUE); if (!icon_path)
--- a/pidgin/plugins/Makefile.am Sun Apr 15 17:47:45 2007 +0000 +++ b/pidgin/plugins/Makefile.am Sun Apr 15 18:06:49 2007 +0000 @@ -32,12 +32,12 @@ iconaway_la_LDFLAGS = -module -avoid-version markerline_la_LDFLAGS = -module -avoid-version notify_la_LDFLAGS = -module -avoid-version -pidginrc_la_LDFLAGS = -module -avoid-version +pidginrc_la_LDFLAGS = -module -avoid-version relnot_la_LDFLAGS = -module -avoid-version spellchk_la_LDFLAGS = -module -avoid-version timestamp_la_LDFLAGS = -module -avoid-version timestamp_format_la_LDFLAGS = -module -avoid-version -xmppconsole_la_LDFLAGS = -module -avoid-version +xmppconsole_la_LDFLAGS = -module -avoid-version if PLUGINS @@ -48,7 +48,7 @@ iconaway.la \ markerline.la \ notify.la \ - pidginrc.la \ + pidginrc.la \ relnot.la \ spellchk.la \ timestamp.la \
--- a/pidgin/plugins/gaiminc.c Sun Apr 15 17:47:45 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -#include "internal.h" -#include "plugin.h" - -#include "account.h" -#include "connection.h" -#include "conversation.h" -#include "version.h" - -/* include UI for pidgindialogs_about() */ -#include "gtkplugin.h" -#include "gtkdialogs.h" - -#define PURPLEINC_PLUGIN_ID "core-purpleinc" - -static void -echo_hi(PurpleConnection *gc) -{ - /* this doesn't do much, just lets you know who we are :) */ - pidgindialogs_about(); -} - -static gboolean -reverse(PurpleAccount *account, char **who, char **message, - PurpleConversation *conv, int *flags) -{ - /* this will drive you insane. whenever you receive a message, - * the text of the message (HTML and all) will be reversed. */ - int i, l; - char tmp; - - /* this check is necessary in case bad plugins do bad things */ - if (message == NULL || *message == NULL) - return FALSE; - - l = strlen(*message); - - if (!strcmp(*who, purple_account_get_username(account))) - return FALSE; - - for (i = 0; i < l/2; i++) { - tmp = (*message)[i]; - (*message)[i] = (*message)[l - i - 1]; - (*message)[l - i - 1] = tmp; - } - return FALSE; -} - -static void -bud(PurpleBuddy *who) -{ - PurpleAccount *acct = who->account; - PurpleConversation *conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, who->name); - - purple_conv_im_send(PURPLE_CONV_IM(conv), "Hello!"); -} - -/* - * EXPORTED FUNCTIONS - */ - -static gboolean -plugin_load(PurplePlugin *plugin) -{ - /* this is for doing something fun when we sign on */ - purple_signal_connect(purple_connections_get_handle(), "signed-on", - plugin, PURPLE_CALLBACK(echo_hi), NULL); - - /* this is for doing something fun when we get a message */ - purple_signal_connect(purple_conversations_get_handle(), "receiving-im-msg", - plugin, PURPLE_CALLBACK(reverse), NULL); - - /* this is for doing something fun when a buddy comes online */ - purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", - plugin, PURPLE_CALLBACK(bud), NULL); - - return TRUE; -} - -static PurplePluginInfo info = -{ - PURPLE_PLUGIN_MAGIC, - PURPLE_MAJOR_VERSION, - PURPLE_MINOR_VERSION, - PURPLE_PLUGIN_STANDARD, /**< type */ - NULL, /**< ui_requirement */ - 0, /**< flags */ - NULL, /**< dependencies */ - PURPLE_PRIORITY_DEFAULT, /**< priority */ - - PURPLEINC_PLUGIN_ID, /**< id */ - N_("Pidgin Demonstration Plugin"), /**< name */ - VERSION, /**< version */ - /** summary */ - N_("An example plugin that does stuff - see the description."), - /** description */ - N_("This is a really cool plugin that does a lot of stuff:\n" - "- It tells you who wrote the program when you log in\n" - "- It reverses all incoming text\n" - "- It sends a message to people on your list immediately" - " when they sign on"), - "Eric Warmenhoven <eric@warmenhoven.org>", /**< author */ - PURPLE_WEBSITE, /**< homepage */ - - plugin_load, /**< load */ - NULL, /**< unload */ - NULL, /**< destroy */ - - NULL, /**< ui_info */ - NULL, /**< extra_info */ - NULL, /**< prefs_info */ - NULL /**< actions */ -}; - -static void -init_plugin(PurplePlugin *plugin) -{ -} - -PURPLE_INIT_PLUGIN(purpleinc, init_plugin, info)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/plugins/pidgininc.c Sun Apr 15 18:06:49 2007 +0000 @@ -0,0 +1,119 @@ +#include "internal.h" +#include "plugin.h" + +#include "account.h" +#include "connection.h" +#include "conversation.h" +#include "version.h" + +/* include UI for pidgindialogs_about() */ +#include "gtkplugin.h" +#include "gtkdialogs.h" + +#define PURPLEINC_PLUGIN_ID "core-purpleinc" + +static void +echo_hi(PurpleConnection *gc) +{ + /* this doesn't do much, just lets you know who we are :) */ + pidgindialogs_about(); +} + +static gboolean