/soc/2013/ankitkv/gobjectification: 2c92a18cc79d: Merged default...
Ankit Vani
a at nevitus.org
Mon Feb 3 16:21:10 EST 2014
Changeset: 2c92a18cc79d704957ff8beac8fa8ff4cd7ace81
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-04 02:43 +0530
Branch: gtkdoc-conversion
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/2c92a18cc79d
Description:
Merged default branch
diffstat:
libpurple/protocols/gg/account.c | 8 +-
libpurple/protocols/gg/avatar.c | 15 +-
libpurple/protocols/gg/blist.c | 2 +-
libpurple/protocols/gg/chat.c | 32 +++-
libpurple/protocols/gg/chat.h | 27 ++
libpurple/protocols/gg/deprecated.c | 8 +-
libpurple/protocols/gg/edisc.c | 27 ++
libpurple/protocols/gg/edisc.h | 27 ++
libpurple/protocols/gg/gg.c | 56 ++--
libpurple/protocols/gg/html.c | 27 ++
libpurple/protocols/gg/html.h | 27 ++
libpurple/protocols/gg/image.c | 54 ++--
libpurple/protocols/gg/keymapper.c | 27 ++
libpurple/protocols/gg/keymapper.h | 27 ++
libpurple/protocols/gg/libgadu-events.c | 12 +-
libpurple/protocols/gg/libgaduw.c | 22 +-
libpurple/protocols/gg/libgaduw.h | 2 +-
libpurple/protocols/gg/message-prpl.c | 55 ++++-
libpurple/protocols/gg/message-prpl.h | 27 ++
libpurple/protocols/gg/multilogon.c | 1 -
libpurple/protocols/gg/pubdir-prpl.c | 145 +++++++-------
libpurple/protocols/gg/purplew.c | 25 +-
libpurple/protocols/gg/purplew.h | 4 +-
libpurple/protocols/gg/resolver-purple.c | 40 ++--
libpurple/protocols/gg/roster.c | 303 +++++++++++++++---------------
libpurple/protocols/gg/roster.h | 12 +-
libpurple/protocols/gg/servconn.c | 8 +-
libpurple/protocols/gg/status.c | 56 ++--
libpurple/protocols/gg/status.h | 4 +-
libpurple/protocols/gg/tcpsocket.c | 27 ++
libpurple/protocols/gg/tcpsocket.h | 27 ++
libpurple/protocols/gg/utils.c | 32 +-
libpurple/protocols/gg/validator.c | 24 +-
libpurple/protocols/gg/xml.c | 34 +-
34 files changed, 778 insertions(+), 446 deletions(-)
diffs (truncated from 3351 to 300 lines):
diff --git a/libpurple/protocols/gg/account.c b/libpurple/protocols/gg/account.c
--- a/libpurple/protocols/gg/account.c
+++ b/libpurple/protocols/gg/account.c
@@ -308,7 +308,7 @@ static void ggp_account_register_dialog_
}
#if 0
-// libgadu 1.12.x: use it for invalid token
+/* libgadu 1.12.x: use it for invalid token */
static void ggp_account_register_dialog_invalid(
ggp_account_register_data *register_data, const gchar *message)
{
@@ -342,7 +342,7 @@ static void ggp_account_register_respons
}
if (!success || !register_result->success)
{
- //TODO (libgadu 1.12.x): check register_result->error
+ /* TODO (libgadu 1.12.x): check register_result->error */
purple_debug_error("gg", "ggp_account_register_response: "
"error\n");
purple_notify_error(NULL,
@@ -627,7 +627,7 @@ static void ggp_account_chpass_response(
}
if (!success || !chpass_result->success)
{
- //TODO (libgadu 1.12.x): check chpass_result->error
+ /* TODO (libgadu 1.12.x): check chpass_result->error */
purple_debug_error("gg", "ggp_account_chpass_response: "
"error\n");
purple_notify_error(NULL,
@@ -651,6 +651,6 @@ static void ggp_account_chpass_response(
ggp_account_chpass_data_free(chpass_data);
- //TODO: reconnect / check how it is done in original client
+ /* TODO: reconnect / check how it is done in original client */
purple_account_disconnect(account);
}
diff --git a/libpurple/protocols/gg/avatar.c b/libpurple/protocols/gg/avatar.c
--- a/libpurple/protocols/gg/avatar.c
+++ b/libpurple/protocols/gg/avatar.c
@@ -37,7 +37,7 @@
#include "utils.h"
#include "oauth/oauth-purple.h"
-// Common
+/* Common */
static inline ggp_avatar_session_data *
ggp_avatar_get_avdata(PurpleConnection *gc);
@@ -47,7 +47,7 @@ static gboolean ggp_avatar_timer_cb(gpoi
#define GGP_AVATAR_USERAGENT "GG Client build 11.0.0.7562"
#define GGP_AVATAR_SIZE_MAX 1048576
-// Buddy avatars updating
+/* Buddy avatars updating */
typedef struct
{
@@ -64,7 +64,7 @@ static void ggp_avatar_buddy_update_rece
#define GGP_AVATAR_BUDDY_URL "http://avatars.gg.pl/%u/s,big"
-// Own avatar setting
+/* Own avatar setting */
typedef struct
{
@@ -132,9 +132,10 @@ static gboolean ggp_avatar_timer_cb(gpoi
avdata = ggp_avatar_get_avdata(gc);
if (avdata->current_update != NULL)
{
- //TODO: verbose mode
- //purple_debug_misc("gg", "ggp_avatar_timer_cb(%p): there is "
- // "already an update running\n", gc);
+ if (purple_debug_is_verbose()) {
+ purple_debug_misc("gg", "ggp_avatar_timer_cb(%p): "
+ "there is already an update running\n", gc);
+ }
return TRUE;
}
@@ -151,7 +152,7 @@ void ggp_avatar_buddy_update(PurpleConne
{
ggp_avatar_session_data *avdata = ggp_avatar_get_avdata(gc);
ggp_avatar_buddy_update_req *pending_update =
- g_new(ggp_avatar_buddy_update_req, 1); //TODO: leak?
+ g_new(ggp_avatar_buddy_update_req, 1); /* TODO: leak? */
if (purple_debug_is_verbose()) {
purple_debug_misc("gg", "ggp_avatar_buddy_update(%p, %u, %lu)\n", gc,
diff --git a/libpurple/protocols/gg/blist.c b/libpurple/protocols/gg/blist.c
--- a/libpurple/protocols/gg/blist.c
+++ b/libpurple/protocols/gg/blist.c
@@ -37,7 +37,7 @@
#define F_UIN 6
/* void ggp_buddylist_send(PurpleConnection *gc) {{{ */
-// this is for for notify purposes, not synchronizing buddy list
+/* this is for for notify purposes, not synchronizing buddy list */
void ggp_buddylist_send(PurpleConnection *gc)
{
GGPInfo *info = purple_connection_get_protocol_data(gc);
diff --git a/libpurple/protocols/gg/chat.c b/libpurple/protocols/gg/chat.c
--- a/libpurple/protocols/gg/chat.c
+++ b/libpurple/protocols/gg/chat.c
@@ -1,3 +1,30 @@
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * Component written by Tomek Wasilczyk (http://www.wasilczyk.pl).
+ *
+ * This file is dual-licensed under the GPL2+ and the X11 (MIT) licences.
+ * As a recipient of this file you may choose, which license to receive the
+ * code under. As a contributor, you have to ensure the new code is
+ * compatible with both.
+ *
+ * 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 "chat.h"
#include <debug.h>
@@ -601,8 +628,9 @@ PurpleRoomlist * ggp_chat_roomlist_get_l
purple_roomlist_room_add(roomlist, room);
}
- //TODO
- //purple_roomlist_set_in_progress(roomlist, FALSE);
+ /* TODO
+ * purple_roomlist_set_in_progress(roomlist, FALSE);
+ */
g_object_ref(roomlist);
purple_timeout_add(1, ggp_chat_roomlist_get_list_finish, roomlist);
return roomlist;
diff --git a/libpurple/protocols/gg/chat.h b/libpurple/protocols/gg/chat.h
--- a/libpurple/protocols/gg/chat.h
+++ b/libpurple/protocols/gg/chat.h
@@ -1,3 +1,30 @@
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * Component written by Tomek Wasilczyk (http://www.wasilczyk.pl).
+ *
+ * This file is dual-licensed under the GPL2+ and the X11 (MIT) licences.
+ * As a recipient of this file you may choose, which license to receive the
+ * code under. As a contributor, you have to ensure the new code is
+ * compatible with both.
+ *
+ * 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
+ */
#ifndef _GGP_CHAT_H
#define _GGP_CHAT_H
diff --git a/libpurple/protocols/gg/deprecated.c b/libpurple/protocols/gg/deprecated.c
--- a/libpurple/protocols/gg/deprecated.c
+++ b/libpurple/protocols/gg/deprecated.c
@@ -34,7 +34,7 @@
gboolean ggp_deprecated_setup_proxy(PurpleConnection *gc)
{
PurpleProxyInfo *gpi = purple_proxy_get_setup(purple_connection_get_account(gc));
-
+
if ((purple_proxy_info_get_type(gpi) != PURPLE_PROXY_NONE) &&
(purple_proxy_info_get_host(gpi) == NULL ||
purple_proxy_info_get_port(gpi) <= 0))
@@ -46,7 +46,7 @@ gboolean ggp_deprecated_setup_proxy(Purp
purple_request_cpar_from_connection(gc));
return FALSE;
}
-
+
if (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_NONE)
{
gg_proxy_enabled = 0;
@@ -54,11 +54,11 @@ gboolean ggp_deprecated_setup_proxy(Purp
}
gg_proxy_enabled = 1;
- //TODO: memleak
+ /* TODO: memleak */
gg_proxy_host = g_strdup(purple_proxy_info_get_host(gpi));
gg_proxy_port = purple_proxy_info_get_port(gpi);
gg_proxy_username = g_strdup(purple_proxy_info_get_username(gpi));
gg_proxy_password = g_strdup(purple_proxy_info_get_password(gpi));
-
+
return TRUE;
}
diff --git a/libpurple/protocols/gg/edisc.c b/libpurple/protocols/gg/edisc.c
--- a/libpurple/protocols/gg/edisc.c
+++ b/libpurple/protocols/gg/edisc.c
@@ -1,3 +1,30 @@
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * Component written by Tomek Wasilczyk (http://www.wasilczyk.pl).
+ *
+ * This file is dual-licensed under the GPL2+ and the X11 (MIT) licences.
+ * As a recipient of this file you may choose, which license to receive the
+ * code under. As a contributor, you have to ensure the new code is
+ * compatible with both.
+ *
+ * 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 "edisc.h"
#include <debug.h>
diff --git a/libpurple/protocols/gg/edisc.h b/libpurple/protocols/gg/edisc.h
--- a/libpurple/protocols/gg/edisc.h
+++ b/libpurple/protocols/gg/edisc.h
@@ -1,3 +1,30 @@
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * Component written by Tomek Wasilczyk (http://www.wasilczyk.pl).
+ *
+ * This file is dual-licensed under the GPL2+ and the X11 (MIT) licences.
+ * As a recipient of this file you may choose, which license to receive the
+ * code under. As a contributor, you have to ensure the new code is
+ * compatible with both.
+ *
+ * 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
+ */
#ifndef _GGP_EDISC_H
#define _GGP_EDISC_H
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -63,8 +63,8 @@ ggp_buddy_data * ggp_buddy_get_data(Purp
ggp_buddy_data *buddy_data = purple_buddy_get_protocol_data(buddy);
if (buddy_data)
return buddy_data;
-
- buddy_data = g_new0(ggp_buddy_data, 1); //TODO: leak
+
+ buddy_data = g_new0(ggp_buddy_data, 1); /* TODO: leak */
purple_buddy_set_protocol_data(buddy, buddy_data);
return buddy_data;
}
More information about the Commits
mailing list