/soc/2013/ankitkv/gobjectification: 3546d731987e: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Tue Feb 4 04:00:29 EST 2014
Changeset: 3546d731987e3d194d121dbd6857b3bb1719dea9
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-04 14:30 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3546d731987e
Description:
Merge gtkdoc-conversion
diffstat:
doc/reference/pidgin/Makefile.am | 3 +-
doc/reference/pidgin/pidgin-docs.xml | 45 ++++----
doc/reference/pidgin/signals_gtkaccount.xml | 2 +-
finch/finch.h | 2 +-
libpurple/example/defines.h | 23 ++++
libpurple/example/nullclient.c | 11 +-
libpurple/http.c | 57 +++++++----
libpurple/keyring.c | 30 +++--
libpurple/plugins/keyrings/gnomekeyring.c | 21 ++-
libpurple/plugins/keyrings/internalkeyring.c | 6 +-
libpurple/plugins/keyrings/kwallet.cpp | 6 +-
libpurple/plugins/keyrings/secretservice.c | 83 ++++++++--------
libpurple/plugins/keyrings/wincred.c | 3 +-
libpurple/protocols/gg/account.c | 31 ++----
libpurple/protocols/gg/avatar.c | 34 ++----
libpurple/protocols/gg/blist.c | 9 +-
libpurple/protocols/gg/chat.c | 103 +++++++-------------
libpurple/protocols/gg/deprecated.c | 3 +-
libpurple/protocols/gg/edisc.c | 6 +-
libpurple/protocols/gg/gg.c | 32 ++---
libpurple/protocols/gg/html.c | 12 +-
libpurple/protocols/gg/image.c | 46 +++-----
libpurple/protocols/gg/libgadu-events.c | 12 +-
libpurple/protocols/gg/libgaduw.c | 18 +--
libpurple/protocols/gg/message-prpl.c | 135 ++++++++------------------
libpurple/protocols/gg/oauth/oauth-purple.c | 31 ++----
libpurple/protocols/gg/pubdir-prpl.c | 87 +++++++----------
libpurple/protocols/gg/purplew.c | 17 +-
libpurple/protocols/gg/resolver-purple.c | 26 +---
libpurple/protocols/gg/roster.c | 108 +++++++--------------
libpurple/protocols/gg/servconn.c | 3 +-
libpurple/protocols/gg/status.c | 45 +++-----
libpurple/protocols/gg/utils.c | 21 +--
libpurple/protocols/gg/xml.c | 22 +---
pidgin/gtk3compat.h | 14 ++-
pidgin/gtkaccount.h | 14 +-
pidgin/gtkblist-theme-loader.h | 10 +-
pidgin/gtkblist-theme.h | 10 +-
pidgin/gtkblist.h | 14 +-
pidgin/gtkcellrendererexpander.h | 9 +-
pidgin/gtkcertmgr.h | 10 +-
pidgin/gtkconn.h | 11 +-
pidgin/gtkconv-theme-loader.h | 10 +-
pidgin/gtkconv-theme.h | 10 +-
pidgin/gtkconv.h | 14 +-
pidgin/gtkconvwin.h | 12 +-
pidgin/gtkdebug.h | 12 +-
pidgin/gtkdialogs.h | 11 +-
pidgin/gtkdnd-hints.h | 12 +-
pidgin/gtkdocklet.h | 8 +
pidgin/gtkeventloop.h | 12 +-
pidgin/gtkicon-theme-loader.h | 10 +-
pidgin/gtkicon-theme.h | 10 +-
pidgin/gtkidle.h | 12 +-
pidgin/gtkinternal.h | 12 +-
pidgin/gtklog.h | 14 +-
pidgin/gtkmedia.h | 11 +-
pidgin/gtkmenutray.h | 12 +-
pidgin/gtknickcolors.h | 12 +-
pidgin/gtknotify.h | 12 +-
pidgin/gtkplugin.h | 12 +-
pidgin/gtkpluginpref.h | 12 +-
pidgin/gtkpounce.h | 12 +-
pidgin/gtkprefs.h | 12 +-
pidgin/gtkprivacy.h | 12 +-
pidgin/gtkrequest.h | 12 +-
pidgin/gtkroomlist.h | 12 +-
pidgin/gtksavedstatuses.h | 12 +-
pidgin/gtkscrollbook.h | 11 +-
pidgin/gtksession.h | 12 +-
pidgin/gtksmiley.h | 11 +-
pidgin/gtksound.h | 12 +-
pidgin/gtksourceiter.h | 6 +
pidgin/gtksourceundomanager.h | 6 +
pidgin/gtkstatus-icon-theme.h | 10 +-
pidgin/gtkstatusbox.h | 12 +-
pidgin/gtkthemes.h | 12 +-
pidgin/gtkutils.h | 12 +-
pidgin/gtkwebview.h | 13 +-
pidgin/gtkwebviewtoolbar.h | 7 +
pidgin/gtkwhiteboard.h | 10 +-
pidgin/gtkxfer.h | 12 +-
pidgin/minidialog.h | 11 +-
pidgin/pidgin.h | 12 +-
pidgin/pidginstock.h | 12 +-
pidgin/pidgintooltip.h | 12 +-
pidgin/smileyparser.h | 6 +
87 files changed, 819 insertions(+), 867 deletions(-)
diffs (truncated from 4419 to 300 lines):
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -67,7 +67,8 @@ IGNORE_HFILES=\
win32 \
getopt.h \
gtk3compat.h \
- gtkinternal.h
+ gtkinternal.h \
+ gtksourceview-marshal.h
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
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
@@ -20,57 +20,56 @@
<title>API Reference</title>
<xi:include href="xml/gtkaccount.xml" />
+ <xi:include href="xml/gtkblist.xml" />
+ <xi:include href="xml/gtkblist-theme.xml" />
<xi:include href="xml/gtkblist-theme-loader.xml" />
- <xi:include href="xml/gtkblist-theme.xml" />
- <xi:include href="xml/gtkblist.xml" />
+ <xi:include href="xml/gtkpounce.xml" />
<xi:include href="xml/gtkcellrendererexpander.xml" />
<xi:include href="xml/gtkcertmgr.xml" />
<xi:include href="xml/gtkconn.xml" />
+ <xi:include href="xml/gtkconv.xml" />
+ <xi:include href="xml/gtkconvwin.xml" />
+ <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/gtkconv-theme.xml" />
- <xi:include href="xml/gtkconvwin.xml" />
- <xi:include href="xml/gtkconv.xml" />
+ <xi:include href="xml/gtksmiley.xml" />
<xi:include href="xml/gtkdebug.xml" />
- <xi:include href="xml/gtkdialogs.xml" />
+ <xi:include href="xml/gtkdocklet.xml" />
<xi:include href="xml/gtkdnd-hints.xml" />
- <xi:include href="xml/gtkdocklet.xml" />
<xi:include href="xml/gtkeventloop.xml" />
- <xi:include href="xml/gtkicon-theme-loader.xml" />
+ <xi:include href="xml/gtkxfer.xml" />
<xi:include href="xml/gtkicon-theme.xml" />
<xi:include href="xml/gtkidle.xml" />
<xi:include href="xml/gtklog.xml" />
<xi:include href="xml/gtkmedia.xml" />
- <xi:include href="xml/gtkmenutray.xml" />
- <xi:include href="xml/gtknickcolors.xml" />
+ <xi:include href="xml/minidialog.xml" />
<xi:include href="xml/gtknotify.xml" />
+ <xi:include href="xml/gtkdialogs.xml" />
+ <xi:include href="xml/gtkstatus-icon-theme.xml" />
+ <xi:include href="xml/gtkicon-theme-loader.xml" />
+ <xi:include href="xml/pidgintooltip.xml" />
+ <xi:include href="xml/gtkplugin.xml" />
<xi:include href="xml/gtkpluginpref.xml" />
- <xi:include href="xml/gtkplugin.xml" />
- <xi:include href="xml/gtkpounce.xml" />
<xi:include href="xml/gtkprefs.xml" />
<xi:include href="xml/gtkprivacy.xml" />
<xi:include href="xml/gtkrequest.xml" />
<xi:include href="xml/gtkroomlist.xml" />
<xi:include href="xml/gtksavedstatuses.xml" />
<xi:include href="xml/gtkscrollbook.xml" />
- <xi:include href="xml/gtksession.xml" />
- <xi:include href="xml/gtksmiley.xml" />
+ <xi:include href="xml/smileyparser.xml" />
+ <xi:include href="xml/gtkthemes.xml" />
<xi:include href="xml/gtksound.xml" />
<xi:include href="xml/gtksourceiter.xml" />
<xi:include href="xml/gtksourceundomanager.xml" />
- <xi:include href="xml/gtksourceview-marshal.xml" />
<xi:include href="xml/gtkstatusbox.xml" />
- <xi:include href="xml/gtkstatus-icon-theme.xml" />
- <xi:include href="xml/gtkthemes.xml" />
+ <xi:include href="xml/pidginstock.xml" />
+ <xi:include href="xml/gtkmenutray.xml" />
<xi:include href="xml/gtkutils.xml" />
+ <xi:include href="xml/gtkwebview.xml" />
<xi:include href="xml/gtkwebviewtoolbar.xml" />
- <xi:include href="xml/gtkwebview.xml" />
<xi:include href="xml/gtkwhiteboard.xml" />
- <xi:include href="xml/gtkxfer.xml" />
- <xi:include href="xml/minidialog.xml" />
- <xi:include href="xml/pidginstock.xml" />
- <xi:include href="xml/pidgintooltip.xml" />
+ <xi:include href="xml/gtksession.xml" />
<xi:include href="xml/pidgin.xml" />
- <xi:include href="xml/smileyparser.xml" />
</reference>
<reference label="II">
diff --git a/doc/reference/pidgin/signals_gtkaccount.xml b/doc/reference/pidgin/signals_gtkaccount.xml
--- a/doc/reference/pidgin/signals_gtkaccount.xml
+++ b/doc/reference/pidgin/signals_gtkaccount.xml
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
]>
-<chapter id="chapter-signals-account">
+<chapter id="chapter-signals-gtkaccount">
<title>Account signals</title>
<refsect1 id="gtkaccounts.signals" role="signal_proto">
diff --git a/finch/finch.h b/finch/finch.h
--- a/finch/finch.h
+++ b/finch/finch.h
@@ -22,7 +22,7 @@
* SECTION:finch
* @section_id: finch-finch
* @short_description: <filename>finch.h</filename>
- * @title: Finch Application
+ * @title: UI Definitions and Includes
*/
#ifndef _FINCH_H_
diff --git a/libpurple/example/defines.h b/libpurple/example/defines.h
--- a/libpurple/example/defines.h
+++ b/libpurple/example/defines.h
@@ -1,3 +1,26 @@
+/*
+ * pidgin
+ *
+ * Pidgin 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.
+ *
+ * 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
+ *
+ */
+
#define CUSTOM_USER_DIRECTORY "/dev/null"
#define CUSTOM_PLUGIN_PATH ""
#define PLUGIN_SAVE_PREF "/purple/nullclient/plugins/saved"
diff --git a/libpurple/example/nullclient.c b/libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c
+++ b/libpurple/example/nullclient.c
@@ -64,13 +64,13 @@ static gboolean purple_glib_io_invoke(GI
purple_cond |= PURPLE_INPUT_WRITE;
closure->function(closure->data, g_io_channel_unix_get_fd(source),
- purple_cond);
+ purple_cond);
return TRUE;
}
-static guint glib_input_add(gint fd, PurpleInputCondition condition, PurpleInputFunction function,
- gpointer data)
+static guint glib_input_add(gint fd, PurpleInputCondition condition,
+ PurpleInputFunction function, gpointer data)
{
PurpleGLibIOClosure *closure = g_new0(PurpleGLibIOClosure, 1);
GIOChannel *channel;
@@ -89,8 +89,8 @@ static guint glib_input_add(gint fd, Pur
#else
channel = g_io_channel_unix_new(fd);
#endif
- closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
- purple_glib_io_invoke, closure, purple_glib_io_destroy);
+ closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT,
+ cond, purple_glib_io_invoke, closure, purple_glib_io_destroy);
g_io_channel_unref(channel);
return closure->result;
@@ -317,4 +317,3 @@ int main(int argc, char *argv[])
return 0;
}
-
diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -290,8 +290,10 @@ static GHashTable *purple_http_hc_by_ptr
static time_t purple_http_rfc1123_to_time(const gchar *str)
{
- static const gchar *months[13] = {"jan", "feb", "mar", "apr", "may", "jun",
- "jul", "aug", "sep", "oct", "nov", "dec", NULL};
+ static const gchar *months[13] = {
+ "jan", "feb", "mar", "apr", "may", "jun",
+ "jul", "aug", "sep", "oct", "nov", "dec", NULL
+ };
GMatchInfo *match_info;
gchar *d_date, *d_month, *d_year, *d_time;
int month;
@@ -314,8 +316,7 @@ static time_t purple_http_rfc1123_to_tim
g_match_info_free(match_info);
month = 0;
- while (months[month] != NULL)
- {
+ while (months[month] != NULL) {
if (0 == g_ascii_strcasecmp(d_month, months[month]))
break;
month++;
@@ -584,8 +585,7 @@ static void purple_http_headers_remove(P
/* Could be optimized to O(1). */
it = g_list_first(hdrs->list);
- while (it)
- {
+ while (it) {
PurpleKeyValuePair *kvp = it->data;
curr = it;
it = g_list_next(it);
@@ -853,7 +853,8 @@ static gboolean _purple_http_recv_header
}
while ((eol = strstr(hc->response_buffer->str, "\r\n"))
- != NULL) {
+ != NULL)
+ {
gchar *hdrline = hc->response_buffer->str;
int hdrline_len = eol - hdrline;
@@ -883,7 +884,8 @@ static gboolean _purple_http_recv_header
hc->main_header_got = TRUE;
delim = strchr(hdrline, ' ');
if (delim == NULL || 1 != sscanf(delim + 1, "%d",
- &hc->response->code)) {
+ &hc->response->code))
+ {
purple_debug_warning("http",
"Invalid response code\n");
_purple_http_error(hc, _("Error parsing HTTP"));
@@ -1106,7 +1108,8 @@ static gboolean _purple_http_recv_loopbo
hc->length_expected = hc->length_got;
}
if (hc->length_expected >= 0 &&
- hc->length_got < (guint)hc->length_expected) {
+ hc->length_got < (guint)hc->length_expected)
+ {
purple_debug_warning("http", "No more data while reading"
" contents\n");
_purple_http_error(hc, _("Error parsing HTTP"));
@@ -1158,15 +1161,15 @@ static gboolean _purple_http_recv_loopbo
is_deflate = purple_http_headers_match(
hc->response->headers, "Content-Encoding",
"deflate");
- if (is_gzip || is_deflate)
- {
+ if (is_gzip || is_deflate) {
hc->gz_stream = purple_http_gz_new(
hc->request->max_length + 1,
is_deflate);
}
}
if (hc->headers_got && hc->response_buffer &&
- hc->response_buffer->len > 0) {
+ hc->response_buffer->len > 0)
+ {
int buffer_len = hc->response_buffer->len;
gchar *buffer = g_string_free(hc->response_buffer, FALSE);
hc->response_buffer = NULL;
@@ -1218,7 +1221,8 @@ static gboolean _purple_http_recv_loopbo
if (purple_debug_is_unsafe() && purple_debug_is_verbose() &&
!purple_http_cookie_jar_is_empty(
- hc->request->cookie_jar)) {
+ hc->request->cookie_jar))
+ {
gchar *cookies = purple_http_cookie_jar_dump(
hc->request->cookie_jar);
purple_debug_misc("http", "Cookies: %s\n", cookies);
@@ -1233,7 +1237,8 @@ static gboolean _purple_http_recv_loopbo
redirect = purple_http_headers_get(hc->response->headers,
"location");
if (redirect && (hc->request->max_redirects == -1 ||
- hc->request->max_redirects > hc->redirects_count)) {
+ hc->request->max_redirects > hc->redirects_count))
+ {
PurpleHttpURL *url = purple_http_url_parse(redirect);
hc->redirects_count++;
@@ -1291,7 +1296,8 @@ static void _purple_http_send_got_data(P
estimated_length = hc->request_contents_written + stored;
if (hc->request->contents_length != -1 &&
- hc->request->contents_length != estimated_length) {
+ hc->request->contents_length != estimated_length)
+ {
purple_debug_warning("http",
"Invalid amount of data has been written\n");
More information about the Commits
mailing list