Automatic import for version 2.9.0

This commit is contained in:
Rosa 2012-02-01 14:36:24 +04:00
commit 1f2ad7a2bb
9 changed files with 1699 additions and 0 deletions

2
.abf.yml Normal file
View file

@ -0,0 +1,2 @@
sources:
"pidgin-2.9.0.tar.bz2": 632c681030304443a911c9eeca6d582df0a24fbb

151
one_time_password.c Normal file
View file

@ -0,0 +1,151 @@
/*
* One Time Password support plugin for libpurple
*
* Copyright (C) 2009, Daniel Atallah <datallah@pidgin.im>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02111-1301, USA.
*/
#include "internal.h"
#include "debug.h"
#include "plugin.h"
#include "version.h"
#include "account.h"
#include "accountopt.h"
#define PLUGIN_ID "core-one_time_password"
#define PREF_NAME PLUGIN_ID "_enabled"
static void
signed_on_cb(PurpleConnection *conn, void *data)
{
PurpleAccount *account = purple_connection_get_account(conn);
if (purple_account_get_bool(account, PREF_NAME, FALSE)) {
if(purple_account_get_remember_password(account))
purple_debug_error("One Time Password",
"Unable to enforce one time password for account %s (%s).\n"
"Account is set to remember the password.\n",
purple_account_get_username(account),
purple_account_get_protocol_name(account));
else {
purple_debug_info("One Time Password", "Clearing password for account %s (%s).\n",
purple_account_get_username(account),
purple_account_get_protocol_name(account));
purple_account_set_password(account, NULL);
/* TODO: Do we need to somehow clear conn->password ? */
}
}
}
static gboolean
plugin_load(PurplePlugin *plugin)
{
PurplePlugin *prpl;
PurplePluginProtocolInfo *prpl_info;
PurpleAccountOption *option;
GList *l;
/* Register protocol preference. */
for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
prpl = (PurplePlugin *)l->data;
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) {
option = purple_account_option_bool_new(_("One Time Password"),
PREF_NAME, FALSE);
prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
}
}
/* Register callback. */
purple_signal_connect(purple_connections_get_handle(), "signed-on",
plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
return TRUE;
}
static gboolean
plugin_unload(PurplePlugin *plugin)
{
PurplePlugin *prpl;
PurplePluginProtocolInfo *prpl_info;
PurpleAccountOption *option;
GList *l, *options;
/* Remove protocol preference. */
for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
prpl = (PurplePlugin *)l->data;
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) {
options = prpl_info->protocol_options;
while (options != NULL) {
option = (PurpleAccountOption *) options->data;
if (strcmp(PREF_NAME, purple_account_option_get_setting(option)) == 0) {
prpl_info->protocol_options = g_list_delete_link(prpl_info->protocol_options, options);
purple_account_option_destroy(option);
break;
}
options = options->next;
}
}
}
/* Callback will be automagically unregistered */
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 */
PLUGIN_ID, /**< id */
N_("One Time Password Support"), /**< name */
DISPLAY_VERSION, /**< version */
/** summary */
N_("Enforce that passwords are used only once."),
/** description */
N_("Allows you to enforce on a per-account basis that passwords not "
"being saved are only used in a single successful connection.\n"
"Note: The account password must not be saved for this to work."),
"Daniel Atallah <datallah@pidgin.im>", /**< author */
PURPLE_WEBSITE, /**< homepage */
plugin_load, /**< load */
plugin_unload, /**< unload */
NULL, /**< destroy */
NULL, /**< ui_info */
NULL, /**< extra_info */
NULL, /**< prefs_info */
NULL, /**< actions */
NULL, /**< reserved 1 */
NULL, /**< reserved 2 */
NULL, /**< reserved 3 */
NULL /**< reserved 4 */
};
static void
init_plugin(PurplePlugin *plugin)
{
}
PURPLE_INIT_PLUGIN(one_time_password, init_plugin, info)

View file

@ -0,0 +1,25 @@
diff -Naur pidgin-2.3.1/libpurple/protocols/gg/gg.c pidgin-2.3.1.tpg/libpurple/protocols/gg/gg.c
--- pidgin-2.3.1/libpurple/protocols/gg/gg.c 2007-12-07 14:37:05.000000000 +0000
+++ pidgin-2.3.1.tpg/libpurple/protocols/gg/gg.c 2008-01-15 15:10:45.000000000 +0000
@@ -580,6 +580,9 @@
form->nickname = charset_convert(
purple_request_fields_get_string(fields, "nickname"),
"UTF-8", "CP1250");
+ form->uin = charset_convert(
+ purple_request_fields_get_string(fields, "uin"),
+ "UTF-8", "CP1250");
form->city = charset_convert(
purple_request_fields_get_string(fields, "city"),
"UTF-8", "CP1250");
@@ -639,6 +642,11 @@
purple_request_field_string_set_masked(field, FALSE);
purple_request_field_group_add_field(group, field);
+ field = purple_request_field_string_new("uin",
+ _("UIN"), NULL, FALSE);
+ purple_request_field_string_set_masked(field, FALSE);
+ purple_request_field_group_add_field(group, field);
+
field = purple_request_field_string_new("city",
_("City"), NULL, FALSE);
purple_request_field_string_set_masked(field, FALSE);

View file

@ -0,0 +1,20 @@
--- libpurple/protocols/jabber/Makefile.am.orig 2010-02-16 10:34:06.000000000 +0100
+++ libpurple/protocols/jabber/Makefile.am 2010-02-18 10:31:46.828001077 +0100
@@ -80,6 +80,7 @@
AM_CFLAGS = $(st)
+libjabber_la_LDFLAGS = -module -avoid-version
libxmpp_la_LDFLAGS = -module -avoid-version
if USE_CYRUS_SASL
--- libpurple/protocols/oscar/Makefile.am.orig 2010-02-16 10:34:06.000000000 +0100
+++ libpurple/protocols/oscar/Makefile.am 2010-02-18 10:31:46.828001077 +0100
@@ -50,6 +50,7 @@
libaim_la_LDFLAGS = -module -avoid-version
libicq_la_LDFLAGS = -module -avoid-version
+liboscar_la_LDFLAGS = -module -avoid-version
if STATIC_OSCAR
st = -DPURPLE_STATIC_PRPL

View file

@ -0,0 +1,20 @@
diff -p -up pidgin-2.7.0/configure.ac~ pidgin-2.7.0/configure.ac
--- pidgin-2.7.0/configure.ac~ 2010-05-13 22:24:35.000000000 +0200
+++ pidgin-2.7.0/configure.ac 2010-05-13 22:28:11.000000000 +0200
@@ -1522,7 +1522,7 @@ dnl # Check for Mono support
dnl #######################################################################
AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no)
if test x"$enable_mono" = x"yes" ; then
- PKG_CHECK_MODULES(MONO, mono, [
+ PKG_CHECK_MODULES(MONO, mono glib-2.0 gthread-2.0, [
AC_SUBST(MONO_CFLAGS)
AC_SUBST(MONO_LIBS)
enable_mono=yes
diff -p -up pidgin-2.7.0/libpurple/plugins/mono/loader/status-glue.c~ pidgin-2.7.0/libpurple/plugins/mono/loader/status-glue.c
--- pidgin-2.7.0/libpurple/plugins/mono/loader/status-glue.c~ 2010-05-12 06:36:11.000000000 +0200
+++ pidgin-2.7.0/libpurple/plugins/mono/loader/status-glue.c 2010-05-13 22:33:45.000000000 +0200
@@ -1,3 +1,4 @@
+#include <glib.h>
#include "status.h"
#include "mono-helper.h"
#include "mono-glue.h"

24
pidgin-2.7.0-smiley.patch Normal file
View file

@ -0,0 +1,24 @@
diff -p -up pidgin-2.7.0/pidgin/pixmaps/emotes/default/24/theme.smiley pidgin-2.7.0/pidgin/pixmaps/emotes/default/24/theme
--- pidgin-2.7.0/pidgin/pixmaps/emotes/default/24/theme.smiley 2010-05-12 06:37:31.000000000 +0200
+++ pidgin-2.7.0/pidgin/pixmaps/emotes/default/24/theme 2010-05-13 21:15:22.000000000 +0200
@@ -6,9 +6,9 @@ Author=Hylke Bons
# Default smileys
[default]
-happy.png :) :-)
+happy.png :) :-) =)
excited.png :-D :-d :D :d
-sad.png :-( :(
+sad.png :-( :( =(
wink.png ;-) ;)
tongue.png :P :p :-P :-p
shocked.png =-O =-o
@@ -16,7 +16,7 @@ kiss.png :-*
glasses-cool.png 8-)
embarrassed.png :-[
crying.png :'( :'-(
-thinking.png :-/ :-\\
+thinking.png :-/ :-\ :\
angel.png O:-) o:-)
shut-mouth.png :-X
moneymouth.png :-$

View file

@ -0,0 +1,14 @@
--- pidgin-2.8.0/libpurple/protocols/gg/gg.c.orig 2011-06-08 03:10:11.000000000 +0200
+++ pidgin-2.8.0/libpurple/protocols/gg/gg.c 2011-06-08 03:13:44.000000000 +0200
@@ -1816,6 +1816,11 @@
case GG_EVENT_PUBDIR50_SEARCH_REPLY:
ggp_pubdir_reply_handler(gc, ev->event.pubdir50);
break;
+ case GG_EVENT_DISCONNECT:
+ purple_connection_error_reason (gc,
+ PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+ _("Server Disconnect."));
+ break;
case GG_EVENT_TYPING_NOTIFICATION:
ggp_typing_notification_handler(gc, ev->event.typing_notification.uin,
ev->event.typing_notification.length);

View file

@ -0,0 +1,11 @@
--- pidgin-2.8.0/libpurple/network.c.reread-resolvconf 2011-06-07 10:44:40.000000000 +0200
+++ pidgin-2.8.0/libpurple/network.c 2011-06-08 03:09:18.000000000 +0200
@@ -874,8 +874,6 @@
#else
case NM_STATE_CONNECTED:
#endif
- /* Call res_init in case DNS servers have changed */
- res_init();
/* update STUN IP in case we it changed (theoretically we could
have gone from IPv4 to IPv6, f.ex. or we were previously
offline */

1432
pidgin.spec Normal file

File diff suppressed because it is too large Load diff