/soc/2013/ankitkv/gobjectification: 926403b8d4ed: Merged default...
Ankit Vani
a at nevitus.org
Mon Feb 3 15:15:41 EST 2014
Changeset: 926403b8d4edf5f23e47a16639d697d562514448
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-04 01:35 +0530
Branch: gtkdoc-conversion
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/926403b8d4ed
Description:
Merged default branch
diffstat:
.hgignore | 2 +-
.hgtags | 1 +
ChangeLog | 2 +-
Makefile.am | 5 +-
configure.ac | 1 -
libpurple/http.c | 14 +-
libpurple/keyring.c | 30 +-
libpurple/plugins/Makefile.am | 4 -
libpurple/plugins/Makefile.mingw | 1 -
libpurple/plugins/keyrings/secretservice.c | 1 -
libpurple/plugins/newline.c | 136 -
libpurple/plugins/perl/common/Makefile.PL.in | 4 +-
libpurple/plugins/perl/common/Purple.pm | 2 -
libpurple/protocols/gg/account.c | 104 +-
libpurple/protocols/gg/avatar.c | 32 +-
libpurple/protocols/gg/avatar.h | 2 +-
libpurple/protocols/gg/blist.c | 2 +-
libpurple/protocols/gg/chat.c | 34 +-
libpurple/protocols/jabber/auth_cyrus.c | 2 +-
pidgin.spec.in | 671 ----
pidgin/plugins/Makefile.am | 4 -
pidgin/plugins/Makefile.mingw | 1 -
pidgin/plugins/gevolution/assoc-buddy.c | 4 -
pidgin/plugins/perl/common/Makefile.PL.in | 4 +-
pidgin/plugins/perl/common/Pidgin.pm | 2 -
pidgin/plugins/pidginrc.c | 699 ----
po/ChangeLog | 6 +-
po/POTFILES.in | 3 -
po/af.po | 907 +++--
po/am.po | 723 ++-
po/ar.po | 897 +++--
po/as.po | 1063 ++++--
po/ast.po | 104 +-
po/az.po | 717 ++-
po/be at latin.po | 905 +++--
po/bg.po | 839 +++--
po/bn.po | 914 +++--
po/bn_IN.po | 891 +++--
po/bs.po | 863 +++--
po/ca.po | 897 +++--
po/ca at valencia.po | 873 +++--
po/cs.po | 895 +++--
po/da.po | 119 +-
po/dz.po | 918 +++--
po/el.po | 126 +-
po/en_AU.po | 864 +++--
po/en_CA.po | 674 ++-
po/en_GB.po | 2079 +++---------
po/eo.po | 831 +++--
po/es.po | 4099 +++++++++++++------------
po/et.po | 104 +-
po/eu.po | 901 +++--
po/fa.po | 104 +-
po/fi.po | 894 +++--
po/fr.po | 907 +++--
po/ga.po | 104 +-
po/gl.po | 886 +++--
po/gu.po | 862 +++--
po/he.po | 104 +-
po/hi.po | 887 +++--
po/hr.po | 685 ++-
po/hu.po | 885 +++--
po/hy.po | 654 ++-
po/id.po | 905 +++--
po/it.po | 909 +++--
po/ja.po | 883 +++--
po/ka.po | 755 ++--
po/km.po | 2433 ++++-----------
po/kn.po | 873 +++--
po/ko.po | 891 +++--
po/ku.po | 821 +++--
po/lo.po | 628 ++-
po/lt.po | 104 +-
po/mai.po | 843 +++--
po/mhr.po | 843 +++--
po/mk.po | 918 +++--
po/ml.po | 893 +++--
po/mn.po | 839 +++--
po/mr.po | 865 +++--
po/ms_MY.po | 674 ++-
po/my_MM.po | 104 +-
po/nb.po | 863 +++--
po/ne.po | 862 +++--
po/nl.po | 116 +-
po/nn.po | 104 +-
po/oc.po | 702 ++--
po/or.po | 832 +++--
po/pa.po | 104 +-
po/pl.po | 123 +-
po/ps.po | 751 ++--
po/pt.po | 113 +-
po/pt_BR.po | 964 +++--
po/ro.po | 912 +++--
po/ru.po | 119 +-
po/si.po | 721 ++--
po/sk.po | 885 +++--
po/sl.po | 104 +-
po/sq.po | 104 +-
po/sr.po | 847 +++--
po/sr at latin.po | 871 +++--
po/sv.po | 821 +++--
po/sw.po | 751 ++--
po/ta.po | 892 +++--
po/te.po | 824 +++--
po/th.po | 731 ++--
po/tr.po | 894 +++--
po/uk.po | 905 +++--
po/ur.po | 905 +++--
po/vi.po | 900 +++--
po/xh.po | 864 +++--
po/zh_CN.po | 859 +++--
po/zh_HK.po | 815 +++-
po/zh_TW.po | 815 +++-
113 files changed, 36850 insertions(+), 30352 deletions(-)
diffs (truncated from 95417 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
syntax: glob
.*.swp
clang_output_*
+pidgin-*
syntax: regexp
(.*/)?TAGS$
@@ -109,7 +110,6 @@ pidgin-.*.tar.gz
pidgin.apspec$
pidgin.desktop$
pidgin.desktop.in$
-pidgin.spec$
pidgin/.*\.html\.h$
pidgin/pidgin$
pidgin/pixmaps/emotes/default/24/theme
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -88,3 +88,4 @@ a3d157700972b48cf0a23b300261a5ab0c6e165b
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
+9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,7 +62,7 @@ version 3.0.0 (??/??/????):
* Ciphers are now built from the libpurple directory.
* Doxygen has been replaced by gtk-doc for generating documentation.
-version 2.10.9:
+version 2.10.9 (2/2/2014):
XMPP:
* Fix problems logging into some servers including jabber.org and
chat.facebook.com. (#15879)
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,15 +14,13 @@ EXTRA_DIST = \
intltool-update.in \
package_revision.h \
pidgin.apspec.in \
- pidgin.spec.in \
pidgin.desktop.in \
po/Makefile.mingw \
valgrind-suppressions
noinst_HEADERS = config.h package_revision.h
-dist-hook: pidgin.spec
- cp pidgin.spec $(distdir)
+dist-hook:
rm $(distdir)/config.h
distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm
@@ -45,7 +43,6 @@ version-check:
# Ensure ChangeLogs have the correct version
head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
- head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2949,7 +2949,6 @@ AC_CONFIG_FILES([Makefile
finch/plugins/Makefile
po/Makefile.in
pidgin.desktop.in
- pidgin.spec
])
AC_OUTPUT
diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -322,7 +322,7 @@ static time_t purple_http_rfc1123_to_tim
}
month++;
- iso_date = g_strdup_printf("%s-%02d-%sT%s+00:00",
+ iso_date = g_strdup_printf("%s-%02d-%sT%s+00:00",
d_year, month, d_date, d_time);
g_free(d_date);
@@ -666,7 +666,7 @@ static gchar * purple_http_headers_dump(
const GList *hdr;
GString *s = g_string_new("");
-
+
hdr = purple_http_headers_get_all(hdrs);
while (hdr) {
PurpleKeyValuePair *kvp = hdr->data;
@@ -675,7 +675,7 @@ static gchar * purple_http_headers_dump(
g_string_append_printf(s, "%s: %s%s", kvp->key,
(gchar*)kvp->value, hdr ? "\n" : "");
}
-
+
return g_string_free(s, FALSE);
}
@@ -908,7 +908,7 @@ static gboolean _purple_http_recv_header
*delim++ = '\0';
while (*delim == ' ')
delim++;
-
+
purple_http_headers_add(hc->response->headers, hdrline, delim);
}
@@ -1011,7 +1011,7 @@ static gboolean _purple_http_recv_body_c
if (hc->chunk_got + got_now > hc->chunk_length)
got_now = hc->chunk_length - hc->chunk_got;
hc->chunk_got += got_now;
-
+
if (!_purple_http_recv_body_data(hc,
hc->response_buffer->str, got_now))
return FALSE;
@@ -2815,10 +2815,10 @@ const gchar * purple_http_response_get_d
if (response->contents != NULL) {
ret = response->contents->str;
- if(len)
+ if (len)
*len = response->contents->len;
} else {
- if(len)
+ if (len)
*len = 0;
}
diff --git a/libpurple/keyring.c b/libpurple/keyring.c
--- a/libpurple/keyring.c
+++ b/libpurple/keyring.c
@@ -57,8 +57,8 @@ typedef struct
GError *error;
PurpleKeyringSetInUseCallback cb;
gpointer cb_data;
- PurpleKeyring *new;
- PurpleKeyring *old;
+ PurpleKeyring *new_kr;
+ PurpleKeyring *old_kr;
/**
* We are done when finished is positive and read_outstanding is zero.
@@ -220,11 +220,11 @@ purple_keyring_set_inuse_drop_cb(gpointe
g_return_if_fail(tracker != NULL);
if (tracker->succeeded) {
- purple_keyring_close(tracker->old);
+ purple_keyring_close(tracker->old_kr);
purple_debug_info("keyring", "Successfully changed keyring.\n");
- purple_keyring_inuse = tracker->new;
+ purple_keyring_inuse = tracker->new_kr;
current_change_tracker = NULL;
if (tracker->cb != NULL)
@@ -235,11 +235,11 @@ purple_keyring_set_inuse_drop_cb(gpointe
purple_debug_error("keyring", "Failed to change keyring, aborting.\n");
- purple_keyring_close(tracker->new);
+ purple_keyring_close(tracker->new_kr);
purple_keyring_pref_disconnect();
purple_prefs_set_string("/purple/keyring/active",
- purple_keyring_get_id(tracker->old));
+ purple_keyring_get_id(tracker->old_kr));
purple_keyring_pref_connect();
current_change_tracker = NULL;
@@ -322,11 +322,11 @@ purple_keyring_set_inuse_save_cb(PurpleA
/* This was the last one. */
if (tracker->abort && !tracker->force) {
tracker->succeeded = FALSE;
- purple_keyring_drop_passwords(tracker->new,
+ purple_keyring_drop_passwords(tracker->new_kr,
purple_keyring_set_inuse_drop_cb, tracker);
} else {
tracker->succeeded = TRUE;
- purple_keyring_drop_passwords(tracker->old,
+ purple_keyring_drop_passwords(tracker->old_kr,
purple_keyring_set_inuse_drop_cb, tracker);
}
}
@@ -358,7 +358,7 @@ purple_keyring_set_inuse_read_cb(PurpleA
return;
}
- save_cb = purple_keyring_get_save_password(tracker->new);
+ save_cb = purple_keyring_get_save_password(tracker->new_kr);
g_assert(save_cb != NULL);
save_cb(account, password, purple_keyring_set_inuse_save_cb, tracker);
@@ -431,8 +431,8 @@ purple_keyring_set_inuse(PurpleKeyring *
tracker->cb = cb;
tracker->cb_data = data;
- tracker->new = newkeyring;
- tracker->old = oldkeyring;
+ tracker->new_kr = newkeyring;
+ tracker->old_kr = oldkeyring;
tracker->force = force;
for (it = purple_accounts_get_all(); it != NULL; it = it->next) {
@@ -1215,10 +1215,10 @@ static void purple_keyring_core_quitting
if (current_change_tracker != NULL) {
PurpleKeyringChangeTracker *tracker = current_change_tracker;
tracker->abort = TRUE;
- if (tracker->old)
- purple_keyring_cancel_requests(tracker->old);
- if (current_change_tracker == tracker && tracker->new)
- purple_keyring_cancel_requests(tracker->new);
+ if (tracker->old_kr)
+ purple_keyring_cancel_requests(tracker->old_kr);
+ if (current_change_tracker == tracker && tracker->new_kr)
+ purple_keyring_cancel_requests(tracker->new_kr);
}
purple_keyring_is_quitting = TRUE;
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -34,7 +34,6 @@ helloworld_la_LDFLAGS = -module -a
idle_la_LDFLAGS = -module -avoid-version
joinpart_la_LDFLAGS = -module -avoid-version
log_reader_la_LDFLAGS = -module -avoid-version
-newline_la_LDFLAGS = -module -avoid-version
notify_example_la_LDFLAGS = -module -avoid-version
offlinemsg_la_LDFLAGS = -module -avoid-version
one_time_password_la_LDFLAGS = -module -avoid-version
@@ -55,7 +54,6 @@ plugin_LTLIBRARIES = \
idle.la \
joinpart.la \
log_reader.la \
- newline.la \
offlinemsg.la \
psychic.la \
statenotify.la \
@@ -81,7 +79,6 @@ helloworld_la_SOURCES = helloworld
idle_la_SOURCES = idle.c
joinpart_la_SOURCES = joinpart.c
log_reader_la_SOURCES = log_reader.c
-newline_la_SOURCES = newline.c
notify_example_la_SOURCES = notify_example.c
offlinemsg_la_SOURCES = offlinemsg.c
one_time_password_la_SOURCES = one_time_password.c
@@ -98,7 +95,6 @@ codeinline_la_LIBADD = $(GLIB_LIBS)
idle_la_LIBADD = $(GLIB_LIBS)
joinpart_la_LIBADD = $(GLIB_LIBS)
log_reader_la_LIBADD = $(GLIB_LIBS)
-newline_la_LIBADD = $(GLIB_LIBS)
notify_example_la_LIBADD = $(GLIB_LIBS)
offlinemsg_la_LIBADD = $(GLIB_LIBS)
one_time_password_la_LIBADD = $(GLIB_LIBS)
diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw
--- a/libpurple/plugins/Makefile.mingw
+++ b/libpurple/plugins/Makefile.mingw
@@ -68,7 +68,6 @@ plugins: \
idle.dll \
joinpart.dll \
log_reader.dll \
- newline.dll \
offlinemsg.dll \
psychic.dll \
statenotify.dll
diff --git a/libpurple/plugins/keyrings/secretservice.c b/libpurple/plugins/keyrings/secretservice.c
--- a/libpurple/plugins/keyrings/secretservice.c
+++ b/libpurple/plugins/keyrings/secretservice.c
@@ -334,4 +334,3 @@ init_plugin(PurplePlugin *plugin)
}
PURPLE_INIT_PLUGIN(secret_service, init_plugin, plugininfo)
-
diff --git a/libpurple/plugins/newline.c b/libpurple/plugins/newline.c
deleted file mode 100644
--- a/libpurple/plugins/newline.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Displays messages on a new line, below the nick
- * Copyright (C) 2004 Stu Tomlinson <stu at nosnilmot.com>
- *
- * 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
More information about the Commits
mailing list