Thu, 06 Feb 2014 21:03:55 +0530
Merge gtkdoc-conversion
--- a/doc/reference/finch/Makefile.am Thu Feb 06 20:12:46 2014 +0530 +++ b/doc/reference/finch/Makefile.am Thu Feb 06 21:03:55 2014 +0530 @@ -66,7 +66,8 @@ wms \ getopt.h \ gntinternal.h \ - gntmarshal.h + gntmarshal.h \ + gnt-skel.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
--- a/doc/reference/finch/finch-docs.xml Thu Feb 06 20:12:46 2014 +0530 +++ b/doc/reference/finch/finch-docs.xml Thu Feb 06 21:03:55 2014 +0530 @@ -66,7 +66,6 @@ <xi:include href="xml/gntmenu.xml" /> <xi:include href="xml/gntmenuitem.xml" /> <xi:include href="xml/gntprogressbar.xml" /> - <xi:include href="xml/gnt-skel.xml" /> <xi:include href="xml/gntslider.xml" /> <xi:include href="xml/gntstyle.xml" /> <xi:include href="xml/gnttextview.xml" />
--- a/finch/libgnt/gntbox.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntbox.h Thu Feb 06 21:03:55 2014 +0530 @@ -92,7 +92,7 @@ G_BEGIN_DECLS /** - * gnt_box_get_gtype: + * gnt_box_get_type: * * The GType for GntBox. *
--- a/finch/libgnt/gntbutton.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntbutton.h Thu Feb 06 21:03:55 2014 +0530 @@ -77,7 +77,7 @@ G_BEGIN_DECLS /** - * gnt_button_get_gtype: + * gnt_button_get_type: * * Returns: GType for Gntbutton */
--- a/finch/libgnt/gntcheckbox.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntcheckbox.h Thu Feb 06 21:03:55 2014 +0530 @@ -71,7 +71,7 @@ G_BEGIN_DECLS /** - * gnt_check_box_get_gtype: + * gnt_check_box_get_type: * * Returns: GType for GntCheckBox */
--- a/finch/libgnt/gntclipboard.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntclipboard.h Thu Feb 06 21:03:55 2014 +0530 @@ -63,7 +63,7 @@ G_BEGIN_DECLS /** - * gnt_clipboard_get_gtype: + * gnt_clipboard_get_type: * * Returns: GType for GntClipboard. */
--- a/finch/libgnt/gntcombobox.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntcombobox.h Thu Feb 06 21:03:55 2014 +0530 @@ -72,7 +72,7 @@ G_BEGIN_DECLS /** - * gnt_combo_box_get_gtype: + * gnt_combo_box_get_type: * * Returns: Get the GType for GntComboBox */
--- a/finch/libgnt/gntentry.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntentry.h Thu Feb 06 21:03:55 2014 +0530 @@ -108,7 +108,7 @@ G_BEGIN_DECLS /** - * gnt_entry_get_gtype: + * gnt_entry_get_type: * * Returns: GType for GntEntry. */
--- a/finch/libgnt/gntfilesel.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntfilesel.h Thu Feb 06 21:03:55 2014 +0530 @@ -102,7 +102,7 @@ G_BEGIN_DECLS /** - * gnt_file_sel_get_gtype: + * gnt_file_sel_get_type: * * Returns: GType for GntFileSel. */
--- a/finch/libgnt/gntlabel.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntlabel.h Thu Feb 06 21:03:55 2014 +0530 @@ -71,7 +71,7 @@ G_BEGIN_DECLS /** - * gnt_label_get_gtype: + * gnt_label_get_type: * * Returns: GType for GntLabel. */
--- a/finch/libgnt/gntline.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntline.h Thu Feb 06 21:03:55 2014 +0530 @@ -70,7 +70,7 @@ G_BEGIN_DECLS /** - * gnt_line_get_gtype: + * gnt_line_get_type: * * Returns: GType for GntLine. */
--- a/finch/libgnt/gntmenu.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntmenu.h Thu Feb 06 21:03:55 2014 +0530 @@ -93,7 +93,7 @@ G_BEGIN_DECLS /** - * gnt_menu_get_gtype: + * gnt_menu_get_type: * * Returns: The GType for GntMenu. */
--- a/finch/libgnt/gntmenuitem.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntmenuitem.h Thu Feb 06 21:03:55 2014 +0530 @@ -90,7 +90,7 @@ G_BEGIN_DECLS /** - * gnt_menuitem_get_gtype: + * gnt_menuitem_get_type: * * Returns: GType for GntMenuItem. */
--- a/finch/libgnt/gntmenuitemcheck.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntmenuitemcheck.h Thu Feb 06 21:03:55 2014 +0530 @@ -69,7 +69,7 @@ G_BEGIN_DECLS /** - * gnt_menuitem_check_get_gtype: + * gnt_menuitem_check_get_type: * * Returns: GType for GntMenuItemCheck. */
--- a/finch/libgnt/gntprogressbar.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntprogressbar.h Thu Feb 06 21:03:55 2014 +0530 @@ -63,9 +63,10 @@ G_BEGIN_DECLS /** - * gnt_progress_bar_get_gtype: + * gnt_progress_bar_get_type: * - * Get the GType for GntProgressBar + * Get the #GType for GntProgressBar + * * Returns: The GType for GntProrgressBar */ GType
--- a/finch/libgnt/gntslider.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntslider.h Thu Feb 06 21:03:55 2014 +0530 @@ -78,7 +78,7 @@ G_BEGIN_DECLS /** - * gnt_slider_get_gtype: + * gnt_slider_get_type: * * Returns: The GType for GntSlider *
--- a/finch/libgnt/gnttextview.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gnttextview.h Thu Feb 06 21:03:55 2014 +0530 @@ -91,7 +91,7 @@ G_BEGIN_DECLS /** - * gnt_text_view_get_gtype: + * gnt_text_view_get_type: * * Returns: GType for GntTextView. */
--- a/finch/libgnt/gnttree.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gnttree.h Thu Feb 06 21:03:55 2014 +0530 @@ -105,7 +105,7 @@ G_BEGIN_DECLS /** - * gnt_tree_get_gtype: + * gnt_tree_get_type: * * Returns: The GType for GntTree */ @@ -116,9 +116,9 @@ * * Create a tree with one column. * - * Returns: The newly created tree + * See gnt_tree_new_with_columns(). * - * See gnt_tree_new_with_columns(). + * Returns: The newly created tree */ GntWidget * gnt_tree_new(void);
--- a/finch/libgnt/gntwidget.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntwidget.h Thu Feb 06 21:03:55 2014 +0530 @@ -144,7 +144,7 @@ G_BEGIN_DECLS /** - * gnt_widget_get_gtype: + * gnt_widget_get_type: * * Returns: GType for GntWidget. */
--- a/finch/libgnt/gntwindow.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntwindow.h Thu Feb 06 21:03:55 2014 +0530 @@ -77,7 +77,7 @@ G_BEGIN_DECLS /** - * gnt_window_get_gtype: + * gnt_window_get_type: * * Returns: GType for GntWindow. */
--- a/finch/libgnt/gntwm.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntwm.h Thu Feb 06 21:03:55 2014 +0530 @@ -193,7 +193,7 @@ G_BEGIN_DECLS /** - * gnt_wm_get_gtype: + * gnt_wm_get_type: * * Returns: GType for GntWM. */
--- a/finch/libgnt/gntws.h Thu Feb 06 20:12:46 2014 +0530 +++ b/finch/libgnt/gntws.h Thu Feb 06 21:03:55 2014 +0530 @@ -72,7 +72,7 @@ G_BEGIN_DECLS /** - * gnt_ws_get_gtype: + * gnt_ws_get_type: * * Returns: The GType for GntWS. *
--- a/libpurple/accountopt.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/accountopt.h Thu Feb 06 21:03:55 2014 +0530 @@ -227,7 +227,7 @@ const char *key, const char *value); /** - * purple_account_option_get_type: + * purple_account_option_get_pref_type: * @option: The account option. * * Returns the specified account option's type.
--- a/libpurple/buddylist.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/buddylist.h Thu Feb 06 21:03:55 2014 +0530 @@ -193,10 +193,10 @@ * discouraged if you do not actually need every buddy in the list. Use * purple_blist_find_buddies instead. * + * See purple_blist_find_buddies(). + * * Returns: A list of every buddy in the list. Caller is responsible for - * freeing the list. - * - * See purple_blist_find_buddies(). + * freeing the list. */ GSList *purple_blist_get_buddies(void);
--- a/libpurple/conversation.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/conversation.h Thu Feb 06 21:03:55 2014 +0530 @@ -719,7 +719,7 @@ * * Gets the maximum message size in bytes for the conversation. * - * See #PurplePluginProtocolInfo.get_max_message_size + * See #PurplePluginProtocolInfo's #get_max_message_size * * Returns: Maximum message size, 0 if unspecified, -1 for infinite. */
--- a/libpurple/dnssrv.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/dnssrv.h Thu Feb 06 21:03:55 2014 +0530 @@ -193,7 +193,7 @@ char *purple_srv_txt_query_get_query(PurpleSrvTxtQueryData *query_data); /** - * purple_srv_txt_query_get_type: + * purple_srv_txt_query_get_query_type: * @query_data: The query * * Get the type from a PurpleSrvTxtQueryData (TXT or SRV)
--- a/libpurple/notify.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/notify.h Thu Feb 06 21:03:55 2014 +0530 @@ -715,7 +715,7 @@ /** - * purple_notify_user_info_entry_get_type: + * purple_notify_user_info_entry_get_entry_type: * @user_info_entry: The PurpleNotifyUserInfoEntry * * Get the type of a PurpleNotifyUserInfoEntry @@ -726,7 +726,7 @@ PurpleNotifyUserInfoEntry *user_info_entry); /** - * purple_notify_user_info_entry_set_type: + * purple_notify_user_info_entry_set_entry_type: * @user_info_entry: The PurpleNotifyUserInfoEntry * @type: The PurpleNotifyUserInfoEntryType *
--- a/libpurple/pluginpref.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/pluginpref.h Thu Feb 06 21:03:55 2014 +0530 @@ -212,7 +212,7 @@ void purple_plugin_pref_get_bounds(PurplePluginPref *pref, int *min, int *max); /** - * purple_plugin_pref_set_type: + * purple_plugin_pref_set_pref_type: * @pref: The plugin pref * @type: The type * @@ -221,7 +221,7 @@ void purple_plugin_pref_set_pref_type(PurplePluginPref *pref, PurplePluginPrefType type); /** - * purple_plugin_pref_get_type: + * purple_plugin_pref_get_pref_type: * @pref: The plugin pref * * Get the type of a plugin pref
--- a/libpurple/prefs.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/prefs.h Thu Feb 06 21:03:55 2014 +0530 @@ -276,7 +276,7 @@ gboolean purple_prefs_exists(const char *name); /** - * purple_prefs_get_type: + * purple_prefs_get_pref_type: * @name: The name of the pref * * Get pref type
--- a/libpurple/proxy.h Thu Feb 06 20:12:46 2014 +0530 +++ b/libpurple/proxy.h Thu Feb 06 21:03:55 2014 +0530 @@ -94,7 +94,7 @@ void purple_proxy_info_destroy(PurpleProxyInfo *info); /** - * purple_proxy_info_set_type: + * purple_proxy_info_set_proxy_type: * @info: The proxy information. * @type: The proxy type. * @@ -139,7 +139,7 @@ void purple_proxy_info_set_password(PurpleProxyInfo *info, const char *password); /** - * purple_proxy_info_get_type: + * purple_proxy_info_get_proxy_type: * @info: The proxy information. * * Returns the proxy's type.