/soc/2013/ankitkv/gobjectification: 832cd077145e: Merged default...
Ankit Vani
a at nevitus.org
Mon Apr 7 10:33:09 EDT 2014
Changeset: 832cd077145e5b0607dc517b2e6724f51f41c512
Author: Ankit Vani <a at nevitus.org>
Date: 2014-04-07 20:02 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/832cd077145e
Description:
Merged default branch
diffstat:
COPYRIGHT | 3 +
ChangeLog | 4 +
configure.ac | 3 +-
doc/reference/libpurple/libpurple-docs.xml | 16 +-
doc/reference/pidgin/pidgin-docs.xml | 5 +-
finch/gntconv.c | 3 -
finch/libgnt/gntbox.c | 11 +
finch/libgnt/gntmain.c | 1 +
finch/libgnt/gntmenu.c | 2 +
finch/libgnt/gnttextview.c | 16 +
finch/libgnt/gnttree.c | 3 +-
finch/libgnt/gntwm.c | 6 +
finch/libgnt/wms/irssi.c | 3 +
finch/libgnt/wms/s.c | 3 +
libpurple/Makefile.am | 14 +-
libpurple/Makefile.mingw | 7 +
libpurple/cipher.c | 254 +-
libpurple/ciphers/aescipher.c | 5 +-
libpurple/conversation.c | 144 +-
libpurple/conversation.h | 106 +-
libpurple/core.c | 12 +-
libpurple/dbus-server.c | 1 +
libpurple/example/nullclient.c | 3 -
libpurple/glibcompat.h | 30 +
libpurple/imgstore.c | 30 +-
libpurple/imgstore.h | 22 +-
libpurple/internal.h | 3 +
libpurple/memorypool.c | 23 +-
libpurple/memorypool.h | 83 +-
libpurple/network.c | 59 +-
libpurple/ntlm.c | 17 +-
libpurple/plugins/perl/Makefile.am | 1 -
libpurple/plugins/perl/common/Conversation.xs | 5 -
libpurple/plugins/perl/common/MANIFEST | 1 -
libpurple/plugins/perl/common/Makefile.mingw | 1 -
libpurple/plugins/perl/common/Purple.xs | 2 -
libpurple/plugins/perl/common/Smiley.xs | 80 -
libpurple/plugins/perl/common/typemap | 1 -
libpurple/protocols/bonjour/mdns_avahi.c | 2 +-
libpurple/protocols/gg/gg.c | 2 +-
libpurple/protocols/gg/lib/common.c | 32 +-
libpurple/protocols/gg/lib/config.h | 2 +-
libpurple/protocols/gg/lib/dcc7.c | 5 +-
libpurple/protocols/gg/lib/events.c | 15 +-
libpurple/protocols/gg/lib/handlers.c | 6 +-
libpurple/protocols/gg/lib/internal.h | 17 +-
libpurple/protocols/gg/lib/libgadu.h | 2 +-
libpurple/protocols/gg/lib/network.h | 2 +
libpurple/protocols/gg/lib/protobuf-c.c | 12 +-
libpurple/protocols/gg/lib/resolver.c | 15 +-
libpurple/protocols/gg/lib/sha1.c | 16 +-
libpurple/protocols/gg/roster.c | 2 +-
libpurple/protocols/irc/irc.c | 2 +-
libpurple/protocols/irc/msgs.c | 4 +-
libpurple/protocols/jabber/caps.c | 7 +
libpurple/protocols/jabber/message.c | 326 +-
libpurple/protocols/msn/contact.c | 1 -
libpurple/protocols/msn/msg.c | 51 +-
libpurple/protocols/msn/msn.c | 78 +-
libpurple/protocols/msn/p2p.c | 4 +
libpurple/protocols/msn/slpcall.c | 27 +-
libpurple/protocols/mxit/Makefile.mingw | 3 +-
libpurple/protocols/mxit/chunk.c | 6 +
libpurple/protocols/oscar/family_feedbag.c | 6 +
libpurple/protocols/silc/buddy.c | 2 +
libpurple/protocols/yahoo/yahoo_profile.c | 6 +-
libpurple/protocols/yahoo/ymsg.h | 2 +-
libpurple/protocols/zephyr/Zinternal.c | 20 +-
libpurple/protocols/zephyr/zephyr.c | 1 -
libpurple/proxy.c | 47 +-
libpurple/smiley-custom.c | 317 +
libpurple/smiley-custom.h | 91 +
libpurple/smiley-list.c | 386 +
libpurple/smiley-list.h | 193 +
libpurple/smiley-parser.c | 248 +
libpurple/smiley-parser.h | 127 +
libpurple/smiley-remote.c | 243 +
libpurple/smiley-remote.h | 132 +
libpurple/smiley-theme.c | 97 +
libpurple/smiley-theme.h | 144 +
libpurple/smiley.c | 977 +-
libpurple/smiley.h | 277 +-
libpurple/stun.c | 63 +-
libpurple/tests/test_trie.c | 147 +-
libpurple/trie.c | 134 +-
libpurple/trie.h | 180 +-
libpurple/util.c | 75 +
libpurple/util.h | 13 +
libpurple/win32/wpurpleerror.h | 2 +
pidgin/Makefile.am | 14 +-
pidgin/Makefile.mingw | 5 +-
pidgin/gtkaccount.c | 6 +-
pidgin/gtkblist.c | 2 +-
pidgin/gtkconv.c | 296 +-
pidgin/gtkdialogs.c | 8 +-
pidgin/gtklog.c | 8 +-
pidgin/gtklog.h | 2 +-
pidgin/gtknotify.c | 2 +
pidgin/gtkpounce.c | 4 +-
pidgin/gtkprefs.c | 163 +-
pidgin/gtkrequest.c | 14 +-
pidgin/gtksmiley-manager.c | 833 +
pidgin/gtksmiley-manager.h | 60 +
pidgin/gtksmiley-theme.c | 615 +
pidgin/gtksmiley-theme.h | 174 +
pidgin/gtksmiley.c | 968 -
pidgin/gtksmiley.h | 139 -
pidgin/gtkstatusbox.c | 6 +-
pidgin/gtkthemes.c | 458 -
pidgin/gtkthemes.h | 71 -
pidgin/gtkutils.c | 99 +-
pidgin/gtkutils.h | 27 +-
pidgin/gtkwebview.c | 838 +-
pidgin/gtkwebview.h | 149 +-
pidgin/gtkwebviewtoolbar.c | 452 +-
pidgin/gtkwebviewtoolbar.h | 11 -
pidgin/libpidgin.c | 9 +-
pidgin/pixmaps/Makefile.am | 3 +-
pidgin/pixmaps/emotes/none/Makefile.am | 17 -
pidgin/pixmaps/emotes/none/Makefile.mingw | 27 -
pidgin/pixmaps/emotes/none/none.theme.in | 3 -
pidgin/plugins/extplacement.c | 7 +
pidgin/plugins/perl/Makefile.am | 1 -
pidgin/plugins/perl/common/GtkThemes.xs | 30 -
pidgin/plugins/perl/common/MANIFEST | 1 -
pidgin/plugins/perl/common/Makefile.mingw | 1 -
pidgin/plugins/perl/common/Pidgin.xs | 2 -
pidgin/plugins/perl/common/gtkmodule.h | 1 -
pidgin/smileyparser.c | 171 -
pidgin/smileyparser.h | 39 -
pidgin/themes/Contents/Resources/main.css | 11 +
pidgin/themes/Template.html | 72 +-
po/POTFILES.in | 3 +-
po/de.po | 312 +-
po/lv.po | 19813 ++++++++++++++++++++++++
po/tt.po | 19755 +++++++++++++++++++++++
136 files changed, 45997 insertions(+), 5257 deletions(-)
diffs (truncated from 54913 to 300 lines):
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -340,6 +340,7 @@ John Matthews
Simo Mattila
Robert Matusewicz
Michal Matyska
+Rudolfs Mazurs
Ryan McCabe
Peter McCurdy
Kurt McKee
@@ -568,6 +569,8 @@ Max Ulidtko
Dmitry Utkin
Igor Vlasenko
István Váradi
+ILDAR Valeev
+Cédric Valmary
Martijn van Beers
Gideon van Melle
Arjan van de Ven
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,10 @@ version 2.10.10 (?/?/?):
Gadu-Gadu:
* Updated internal libgadu to version 1.12.0-rc2.
+ Windows-Specific Changes:
+ * Updates to dependencies:
+ * NSS 3.16 and NSPR 4.10.4
+
version 2.10.9 (2/2/2014):
XMPP:
* Fix problems logging into some servers including jabber.org and
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,7 @@ if test x$enable_i18n = xyes; then
GETTEXT_PACKAGE=pidgin
AC_SUBST(GETTEXT_PACKAGE)
- ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku lt mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku lt lv mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr tt uk ur vi xh zh_CN zh_HK zh_TW"
AM_GLIB_GNU_GETTEXT
dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -2604,7 +2604,6 @@ AC_CONFIG_FILES([Makefile
pidgin/pidgin-3-uninstalled.pc
pidgin/pixmaps/Makefile
pidgin/pixmaps/emotes/default/24/Makefile
- pidgin/pixmaps/emotes/none/Makefile
pidgin/pixmaps/emotes/small/16/Makefile
pidgin/plugins/Makefile
pidgin/plugins/cap/Makefile
diff --git a/doc/reference/libpurple/libpurple-docs.xml b/doc/reference/libpurple/libpurple-docs.xml
--- a/doc/reference/libpurple/libpurple-docs.xml
+++ b/doc/reference/libpurple/libpurple-docs.xml
@@ -56,6 +56,7 @@
<xi:include href="xml/imgstore.xml" />
<xi:include href="xml/keyring.xml" />
<xi:include href="xml/log.xml" />
+ <xi:include href="xml/memorypool.xml" />
<xi:include href="xml/desktopitem.xml" />
<xi:include href="xml/mime.xml" />
<xi:include href="xml/nat-pmp.xml" />
@@ -77,7 +78,6 @@
<xi:include href="xml/roomlist.xml" />
<xi:include href="xml/savedstatuses.xml" />
<xi:include href="xml/server.xml" />
- <xi:include href="xml/smiley.xml" />
<xi:include href="xml/sound.xml" />
<xi:include href="xml/sslconn.xml" />
<xi:include href="xml/core.xml" />
@@ -86,6 +86,7 @@
<xi:include href="xml/theme.xml" />
<xi:include href="xml/theme-loader.xml" />
<xi:include href="xml/theme-manager.xml" />
+ <xi:include href="xml/trie.xml" />
<xi:include href="xml/sound-theme.xml" />
<xi:include href="xml/sound-theme-loader.xml" />
<xi:include href="xml/upnp.xml" />
@@ -114,6 +115,17 @@
</reference>
<reference label="b">
+ <title>Smiley APIs</title>
+
+ <xi:include href="xml/smiley.xml" />
+ <xi:include href="xml/smiley-remote.xml" />
+ <xi:include href="xml/smiley-custom.xml" />
+ <xi:include href="xml/smiley-list.xml" />
+ <xi:include href="xml/smiley-theme.xml" />
+ <xi:include href="xml/smiley-parser.xml" />
+ </reference>
+
+ <reference label="c">
<title>Media APIs</title>
<xi:include href="xml/media.xml" />
@@ -125,7 +137,7 @@
<xi:include href="xml/enum-types.xml" />
</reference>
- <reference label="c">
+ <reference label="d">
<title>D-Bus Server APIs</title>
<xi:include href="xml/dbus-bindings.xml" />
diff --git a/doc/reference/pidgin/pidgin-docs.xml b/doc/reference/pidgin/pidgin-docs.xml
--- a/doc/reference/pidgin/pidgin-docs.xml
+++ b/doc/reference/pidgin/pidgin-docs.xml
@@ -32,7 +32,6 @@
<xi:include href="xml/gtknickcolors.xml" />
<xi:include href="xml/gtkconv-theme.xml" />
<xi:include href="xml/gtkconv-theme-loader.xml" />
- <xi:include href="xml/gtksmiley.xml" />
<xi:include href="xml/gtkdebug.xml" />
<xi:include href="xml/gtkdocklet.xml" />
<xi:include href="xml/gtkdnd-hints.xml" />
@@ -56,8 +55,8 @@
<xi:include href="xml/gtkroomlist.xml" />
<xi:include href="xml/gtksavedstatuses.xml" />
<xi:include href="xml/gtkscrollbook.xml" />
- <xi:include href="xml/smileyparser.xml" />
- <xi:include href="xml/gtkthemes.xml" />
+ <xi:include href="xml/gtksmiley-manager.xml" />
+ <xi:include href="xml/gtksmiley-theme.xml" />
<xi:include href="xml/gtksound.xml" />
<xi:include href="xml/gtkstatusbox.xml" />
<xi:include href="xml/pidginstock.xml" />
diff --git a/finch/gntconv.c b/finch/gntconv.c
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -1200,9 +1200,6 @@ static PurpleConversationUiOps conv_ui_o
finch_chat_update_user,
finch_conv_present, /* present */
finch_conv_has_focus, /* has_focus */
- NULL, /* custom_smiley_add */
- NULL, /* custom_smiley_write */
- NULL, /* custom_smiley_close */
NULL, /* send_confirm */
NULL,
NULL,
diff --git a/finch/libgnt/gntbox.c b/finch/libgnt/gntbox.c
--- a/finch/libgnt/gntbox.c
+++ b/finch/libgnt/gntbox.c
@@ -731,6 +731,11 @@ void gnt_box_sync_children(GntBox *box)
int height, width;
int x, y;
+ if (G_UNLIKELY(w == NULL)) {
+ g_warn_if_reached();
+ continue;
+ }
+
if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_INVISIBLE))
continue;
@@ -819,6 +824,12 @@ void gnt_box_readjust(GntBox *box)
for (iter = box->list; iter; iter = iter->next)
{
GntWidget *w = iter->data;
+
+ if (G_UNLIKELY(w == NULL)) {
+ g_warn_if_reached();
+ continue;
+ }
+
if (GNT_IS_BOX(w))
gnt_box_readjust(GNT_BOX(w));
else
diff --git a/finch/libgnt/gntmain.c b/finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c
+++ b/finch/libgnt/gntmain.c
@@ -469,6 +469,7 @@ void gnt_init()
#ifdef NO_WIDECHAR
ascii_only = TRUE;
+ (void)locale;
#else
if (locale && (strstr(locale, "UTF") || strstr(locale, "utf"))) {
ascii_only = FALSE;
diff --git a/finch/libgnt/gntmenu.c b/finch/libgnt/gntmenu.c
--- a/finch/libgnt/gntmenu.c
+++ b/finch/libgnt/gntmenu.c
@@ -121,6 +121,8 @@ menu_tree_add(GntMenu *menu, GntMenuItem
{
char trigger[4] = "\0 )\0";
+ g_return_if_fail(item != NULL);
+
if ((trigger[1] = gnt_menuitem_get_trigger(item)) && trigger[1] != ' ')
trigger[0] = '(';
diff --git a/finch/libgnt/gnttextview.c b/finch/libgnt/gnttextview.c
--- a/finch/libgnt/gnttextview.c
+++ b/finch/libgnt/gnttextview.c
@@ -335,7 +335,13 @@ gnt_text_view_clicked(GntWidget *widget,
GntTextView *view = GNT_TEXT_VIEW(widget);
if (text_view_contains(view, select_start)) {
GString *clip;
+
+ g_return_val_if_fail(select_start != NULL, TRUE);
+
select_end = gnt_text_view_get_p(view, x - widget->priv.x, y - widget->priv.y);
+
+ g_return_val_if_fail(select_end != NULL, TRUE);
+
if (select_end < select_start) {
gchar *t = select_start;
select_start = select_end;
@@ -758,6 +764,12 @@ int gnt_text_view_tag_change(GntTextView
GList *segs, *snext;
GntTextLine *line = iter->data;
inext = iter->next;
+
+ if (G_UNLIKELY(line == NULL)) {
+ g_warn_if_reached();
+ continue;
+ }
+
for (segs = line->segments; segs; segs = snext) {
GntTextSegment *seg = segs->data;
snext = segs->next;
@@ -771,6 +783,10 @@ int gnt_text_view_tag_change(GntTextView
/* This segment starts in the middle of the tag */
if (text == NULL) {
free_text_segment(seg, NULL);
+ if (G_UNLIKELY(line == NULL)) {
+ g_warn_if_reached();
+ break;
+ }
line->segments = g_list_delete_link(line->segments, segs);
if (line->segments == NULL) {
free_text_line(line, NULL);
diff --git a/finch/libgnt/gnttree.c b/finch/libgnt/gnttree.c
--- a/finch/libgnt/gnttree.c
+++ b/finch/libgnt/gnttree.c
@@ -1314,7 +1314,8 @@ void gnt_tree_sort_row(GntTree *tree, gp
else
tree->root = row;
row->next = s;
- s->prev = row; /* s cannot be NULL */
+ g_return_if_fail(s != NULL); /* s cannot be NULL */
+ s->prev = row;
row->prev = NULL;
newp = g_list_index(tree->list, s) - 1;
} else {
diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -2251,8 +2251,14 @@ gboolean gnt_wm_process_click(GntWM *wm,
void gnt_wm_raise_window(GntWM *wm, GntWidget *widget)
{
GntWS *ws = gnt_wm_widget_find_workspace(wm, widget);
+
+ g_return_if_fail(wm != NULL);
+
if (wm->cws != ws)
gnt_wm_switch_workspace(wm, g_list_index(wm->workspaces, ws));
+
+ g_return_if_fail(wm->cws != NULL);
+
if (widget != wm->cws->ordered->data) {
GntWidget *wid = wm->cws->ordered->data;
wm->cws->ordered = g_list_bring_to_front(wm->cws->ordered, widget);
diff --git a/finch/libgnt/wms/irssi.c b/finch/libgnt/wms/irssi.c
--- a/finch/libgnt/wms/irssi.c
+++ b/finch/libgnt/wms/irssi.c
@@ -155,6 +155,9 @@ irssi_new_window(GntWM *wm, GntWidget *w
const char *name;
int x, y, w, h;
+ g_return_if_fail(win != NULL);
+ g_return_if_fail(wm != NULL);
+
name = gnt_widget_get_name(win);
if (!name || !strstr(name, "conversation-window")) {
if (!GNT_IS_MENU(win) && !GNT_WIDGET_IS_FLAG_SET(win, GNT_WIDGET_TRANSIENT)) {
diff --git a/finch/libgnt/wms/s.c b/finch/libgnt/wms/s.c
--- a/finch/libgnt/wms/s.c
+++ b/finch/libgnt/wms/s.c
@@ -84,6 +84,9 @@ s_new_window(GntWM *wm, GntWidget *win)
const char *name;
gboolean blist = FALSE;
+ g_return_if_fail(win != NULL);
+ g_return_if_fail(wm != NULL);
+
if (!GNT_IS_MENU(win)) {
getmaxyx(stdscr, maxy, maxx);
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -102,6 +102,11 @@ purple_coresources = \
savedstatuses.c \
server.c \
signals.c \
+ smiley-custom.c \
More information about the Commits
mailing list