/soc/2013/ankitkv/gobjectification: e8959e0f6a37: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Sun Feb 2 07:06:04 EST 2014
Changeset: e8959e0f6a379aaaecc298dc312e64ff55e43504
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-02 17:35 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/e8959e0f6a37
Description:
Merge gtkdoc-conversion
diffstat:
.tx/config | 2 +-
finch/libgnt/gntbox.h | 1 +
libpurple/core.h | 10 +-
libpurple/http.c | 3 +-
pidgin/Makefile.am | 4 -
pidgin/Makefile.mingw | 2 -
pidgin/gtkaccount.h | 17 +-
pidgin/gtkblist-theme-loader.h | 14 +-
pidgin/gtkblist-theme.h | 213 +-
pidgin/gtkblist.h | 216 +-
pidgin/gtkcertmgr.h | 6 +
pidgin/gtkconn.h | 8 +
pidgin/gtkconv-theme-loader.h | 14 +-
pidgin/gtkconv-theme.h | 78 +-
pidgin/gtkconv.c | 2 +-
pidgin/gtkconv.h | 101 +-
pidgin/gtkconvwin.h | 14 +-
pidgin/gtkdebug.h | 12 +
pidgin/gtkdnd-hints.h | 48 +-
pidgin/gtkdocklet.h | 2 +
pidgin/gtkeventloop.h | 2 +
pidgin/gtkicon-theme-loader.h | 15 +-
pidgin/gtkicon-theme.h | 29 +-
pidgin/gtkidle.h | 2 +
pidgin/gtkimhtml.c | 6092 ----------------------------------------
pidgin/gtkimhtml.h | 831 -----
pidgin/gtkimhtmltoolbar.c | 1606 ----------
pidgin/gtkimhtmltoolbar.h | 97 -
pidgin/gtklog.h | 37 +-
pidgin/gtkmenutray.h | 38 +-
pidgin/gtknotify.h | 19 +-
pidgin/gtkpluginpref.h | 4 +-
pidgin/gtkpounce.h | 13 +-
pidgin/gtkprefs.h | 39 +-
pidgin/gtkprivacy.h | 24 +-
pidgin/gtkrequest.h | 13 +-
pidgin/gtkroomlist.h | 11 +-
pidgin/gtksavedstatuses.h | 43 +-
pidgin/gtksession.h | 9 +-
pidgin/gtksmiley.c | 62 +-
pidgin/gtksmiley.h | 51 +-
pidgin/gtksound.h | 14 +-
pidgin/gtkstatus-icon-theme.h | 21 +-
pidgin/gtkstatusbox.h | 23 +-
pidgin/gtkwebview.c | 4 +-
pidgin/gtkwebview.h | 323 +-
pidgin/gtkwebviewtoolbar.h | 24 +-
pidgin/gtkxfer.h | 52 +-
pidgin/minidialog.h | 172 +-
pidgin/pidginstock.h | 28 +-
pidgin/pidgintooltip.h | 20 +-
pidgin/smileyparser.c | 4 +-
po/ChangeLog | 3 +-
po/POTFILES.in | 18 +-
54 files changed, 1226 insertions(+), 9284 deletions(-)
diffs (truncated from 13337 to 300 lines):
diff --git a/.tx/config b/.tx/config
--- a/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
-[pidgin.pidgin]
+[pidgin.pidgin_pot-for-development-branch]
file_filter = po/<lang>.po
source_file = po/pidgin.pot
source_lang = en
diff --git a/finch/libgnt/gntbox.h b/finch/libgnt/gntbox.h
--- a/finch/libgnt/gntbox.h
+++ b/finch/libgnt/gntbox.h
@@ -91,6 +91,7 @@ G_BEGIN_DECLS
* gnt_box_get_gtype:
*
* The GType for GntBox.
+ *
* Returns: The GType.
*/
GType gnt_box_get_gtype(void);
diff --git a/libpurple/core.h b/libpurple/core.h
--- a/libpurple/core.h
+++ b/libpurple/core.h
@@ -195,24 +195,24 @@ gboolean purple_core_ensure_single_insta
* <informaltable frame='none'>
* <tgroup cols='2'><tbody>
* <row>
- * <entry><tt>name</tt></entry>
+ * <entry><literal>name</literal></entry>
* <entry>the user-readable name for the UI.</entry>
* </row>
* <row>
- * <entry><tt>version</tt></entry>
+ * <entry><literal>version</literal></entry>
* <entry>a user-readable description of the current version of the UI.</entry>
* </row>
* <row>
- * <entry><tt>website</tt></entry>
+ * <entry><literal>website</literal></entry>
* <entry>the UI's website, such as https://pidgin.im.</entry>
* </row>
* <row>
- * <entry><tt>dev_website</tt></entry>
+ * <entry><literal>dev_website</literal></entry>
* <entry>the UI's development/support website, such as
* https://developer.pidgin.im.</entry>
* </row>
* <row>
- * <entry><tt>client_type</tt></entry>
+ * <entry><literal>client_type</literal></entry>
* <entry>the type of UI. Possible values include 'pc', 'console', 'phone',
* 'handheld', 'web', and 'bot'. These values are compared
* programmatically and should not be localized.</entry>
diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -305,13 +305,14 @@ static time_t purple_http_rfc1123_to_tim
g_match_info_free(match_info);
return 0;
}
- g_match_info_free(match_info);
d_date = g_match_info_fetch(match_info, 1);
d_month = g_match_info_fetch(match_info, 2);
d_year = g_match_info_fetch(match_info, 3);
d_time = g_match_info_fetch(match_info, 4);
+ g_match_info_free(match_info);
+
month = 0;
while (months[month] != NULL)
{
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -61,8 +61,6 @@ libpidgin_la_SOURCES = \
gtkicon-theme.c \
gtkicon-theme-loader.c \
gtkidle.c \
- gtkimhtml.c \
- gtkimhtmltoolbar.c \
gtklog.c \
gtkmedia.c \
gtkmenutray.c \
@@ -115,8 +113,6 @@ libpidgin_la_headers = \
gtkicon-theme.h \
gtkicon-theme-loader.h \
gtkidle.h \
- gtkimhtml.h \
- gtkimhtmltoolbar.h \
gtklog.h \
gtkmedia.h \
gtkmenutray.h \
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -76,8 +76,6 @@ PIDGIN_C_SRC = \
gtkicon-theme-loader.c \
gtkicon-theme.c \
gtkidle.c \
- gtkimhtml.c \
- gtkimhtmltoolbar.c \
gtklog.c \
gtkpidgin.c \
gtkmedia.c \
diff --git a/pidgin/gtkaccount.h b/pidgin/gtkaccount.h
--- a/pidgin/gtkaccount.h
+++ b/pidgin/gtkaccount.h
@@ -40,25 +40,32 @@ typedef enum
G_BEGIN_DECLS
/**
+ * pidgin_accounts_window_show:
+ *
* Shows the accounts window.
*/
void pidgin_accounts_window_show(void);
/**
+ * pidgin_accounts_window_hide:
+ *
* Hides the accounts window.
*/
void pidgin_accounts_window_hide(void);
/**
- * Shows an add/modify account dialog.
- *
+ * pidgin_account_dialog_show:
* @type: The type of dialog.
* @account: The associated account, or %NULL for an Add dialog.
+ *
+ * Shows an add/modify account dialog.
*/
void pidgin_account_dialog_show(PidginAccountDialogType type,
PurpleAccount *account);
/**
+ * pidgin_accounts_get_ui_ops:
+ *
* Returns the GTK+ account UI ops
*
* Returns: The UI operations structure.
@@ -66,6 +73,8 @@ void pidgin_account_dialog_show(PidginAc
PurpleAccountUiOps *pidgin_accounts_get_ui_ops(void);
/**
+ * pidgin_accounts_get_handle:
+ *
* Returns the gtkaccounts handle
*
* Returns: The handle to the GTK+ account system
@@ -73,11 +82,15 @@ PurpleAccountUiOps *pidgin_accounts_get_
void *pidgin_accounts_get_handle(void);
/**
+ * pidgin_accounts_init:
+ *
* Initializes the GTK+ account system
*/
void pidgin_accounts_init(void);
/**
+ * pidgin_accounts_uninit:
+ *
* Uninitializes the GTK+ account system
*/
void pidgin_accounts_uninit(void);
diff --git a/pidgin/gtkblist-theme-loader.h b/pidgin/gtkblist-theme-loader.h
--- a/pidgin/gtkblist-theme-loader.h
+++ b/pidgin/gtkblist-theme-loader.h
@@ -30,12 +30,6 @@
#include <glib-object.h>
#include "theme-loader.h"
-/**
- * A pidgin buddy list theme loader. extends PurpleThemeLoader (theme-loader.h)
- * This is a class designed to build sound themes
- *
- * PidginBlistThemeLoader is a GObject.
- */
typedef struct _PidginBlistThemeLoader PidginBlistThemeLoader;
typedef struct _PidginBlistThemeLoaderClass PidginBlistThemeLoaderClass;
@@ -46,6 +40,12 @@ typedef struct _PidginBlistThemeLoaderCl
#define PIDGIN_IS_BLIST_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER))
#define PIDGIN_BLIST_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass))
+/**
+ * PidginBlistThemeLoader:
+ *
+ * A pidgin buddy list theme loader. extends PurpleThemeLoader (theme-loader.h)
+ * This is a class designed to build sound themes
+ */
struct _PidginBlistThemeLoader
{
PurpleThemeLoader parent;
@@ -62,6 +62,8 @@ struct _PidginBlistThemeLoaderClass
G_BEGIN_DECLS
/**
+ * pidgin_blist_theme_loader_get_type:
+ *
* GObject foo.
* @internal.
*/
diff --git a/pidgin/gtkblist-theme.h b/pidgin/gtkblist-theme.h
--- a/pidgin/gtkblist-theme.h
+++ b/pidgin/gtkblist-theme.h
@@ -32,12 +32,6 @@
#include "theme.h"
-/**
- * A pidgin buddy list theme.
- * This is an object for Purple to represent a buddy list theme.
- *
- * PidginBlistTheme is a PurpleTheme Object.
- */
typedef struct _PidginBlistTheme PidginBlistTheme;
typedef struct _PidginBlistThemeClass PidginBlistThemeClass;
@@ -48,6 +42,14 @@ typedef struct _PidginBlistThemeClass
#define PIDGIN_IS_BLIST_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME))
#define PIDGIN_BLIST_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass))
+/**
+ * PidginBlistTheme:
+ *
+ * A pidgin buddy list theme.
+ * This is an object for Purple to represent a buddy list theme.
+ *
+ * PidginBlistTheme is a PurpleTheme Object.
+ */
struct _PidginBlistTheme
{
PurpleTheme parent;
@@ -86,61 +88,68 @@ G_BEGIN_DECLS
/**************************************************************************/
/**
- * Create a new PidginThemeFont.
- *
+ * pidgin_theme_font_new:
* @face: The font face
* @color: The color of the font
*
+ * Create a new PidginThemeFont.
+ *
* Returns: A newly created PidginThemeFont
*/
PidginThemeFont * pidgin_theme_font_new(const gchar *face, GdkColor *color);
/**
+ * pidgin_theme_font_free:
+ * @font: The theme font
+ *
* Frees a font and color pair
- *
- * @font: The theme font
*/
void pidgin_theme_font_free(PidginThemeFont *font);
/**
- * Set the font-face of a PidginThemeFont.
- *
+ * pidgin_theme_font_set_font_face:
* @font: The PidginThemeFont
* @face: The font-face
+ *
+ * Set the font-face of a PidginThemeFont.
*/
void pidgin_theme_font_set_font_face(PidginThemeFont *font, const gchar *face);
/**
- * Set the color of a PidginThemeFont.
- *
+ * pidgin_theme_font_set_color:
* @font: The PidginThemeFont
* @color: The color
+ *
+ * Set the color of a PidginThemeFont.
*/
void pidgin_theme_font_set_color(PidginThemeFont *font, const GdkColor *color);
/**
+ * pidgin_theme_font_get_font_face:
+ * @font: The PidginThemeFont
+ *
* Get the font-face of a PidginThemeFont.
*
- * @font: The PidginThemeFont
- *
* Returns: The font-face, or NULL if none is set.
*/
const gchar * pidgin_theme_font_get_font_face(PidginThemeFont *font);
More information about the Commits
mailing list