/soc/2013/ankitkv/gobjectification: d6404f69bf6c: Merge gtkdoc-c...

Ankit Vani a at nevitus.org
Thu Feb 6 12:36:01 EST 2014 

Changeset: d6404f69bf6c6925d2cd8e5e7253dddc6414fc3e
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-06 21:03 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/d6404f69bf6c

Description:

Merge gtkdoc-conversion

diffstat:

 doc/reference/finch/Makefile.am    |  3 ++-
 doc/reference/finch/finch-docs.xml |  1 -
 finch/libgnt/gntbox.h              |  2 +-
 finch/libgnt/gntbutton.h           |  2 +-
 finch/libgnt/gntcheckbox.h         |  2 +-
 finch/libgnt/gntclipboard.h        |  2 +-
 finch/libgnt/gntcombobox.h         |  2 +-
 finch/libgnt/gntentry.h            |  2 +-
 finch/libgnt/gntfilesel.h          |  2 +-
 finch/libgnt/gntlabel.h            |  2 +-
 finch/libgnt/gntline.h             |  2 +-
 finch/libgnt/gntmenu.h             |  2 +-
 finch/libgnt/gntmenuitem.h         |  2 +-
 finch/libgnt/gntmenuitemcheck.h    |  2 +-
 finch/libgnt/gntprogressbar.h      |  5 +++--
 finch/libgnt/gntslider.h           |  2 +-
 finch/libgnt/gnttextview.h         |  2 +-
 finch/libgnt/gnttree.h             |  6 +++---
 finch/libgnt/gntwidget.h           |  2 +-
 finch/libgnt/gntwindow.h           |  2 +-
 finch/libgnt/gntwm.h               |  2 +-
 finch/libgnt/gntws.h               |  2 +-
 libpurple/accountopt.h             |  2 +-
 libpurple/buddylist.h              |  6 +++---
 libpurple/conversation.h           |  2 +-
 libpurple/dnssrv.h                 |  2 +-
 libpurple/notify.h                 |  4 ++--
 libpurple/pluginpref.h             |  4 ++--
 libpurple/prefs.h                  |  2 +-
 libpurple/proxy.h                  |  4 ++--
 libpurple/request.h                |  2 +-
 31 files changed, 40 insertions(+), 39 deletions(-)

diffs (truncated from 420 to 300 lines):

diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -66,7 +66,8 @@ IGNORE_HFILES=\
 	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
diff --git a/doc/reference/finch/finch-docs.xml b/doc/reference/finch/finch-docs.xml
--- a/doc/reference/finch/finch-docs.xml
+++ b/doc/reference/finch/finch-docs.xml
@@ -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" />
diff --git a/finch/libgnt/gntbox.h b/finch/libgnt/gntbox.h
--- a/finch/libgnt/gntbox.h
+++ b/finch/libgnt/gntbox.h
@@ -92,7 +92,7 @@ struct _GntBoxClass
 G_BEGIN_DECLS
 
 /**
- * gnt_box_get_gtype:
+ * gnt_box_get_type:
  *
  * The GType for GntBox.
  *
diff --git a/finch/libgnt/gntbutton.h b/finch/libgnt/gntbutton.h
--- a/finch/libgnt/gntbutton.h
+++ b/finch/libgnt/gntbutton.h
@@ -77,7 +77,7 @@ struct _GntButtonClass
 G_BEGIN_DECLS
 
 /**
- * gnt_button_get_gtype:
+ * gnt_button_get_type:
  *
  * Returns:  GType for Gntbutton
  */
diff --git a/finch/libgnt/gntcheckbox.h b/finch/libgnt/gntcheckbox.h
--- a/finch/libgnt/gntcheckbox.h
+++ b/finch/libgnt/gntcheckbox.h
@@ -71,7 +71,7 @@ struct _GntCheckBoxClass
 G_BEGIN_DECLS
 
 /**
- * gnt_check_box_get_gtype:
+ * gnt_check_box_get_type:
  *
  * Returns: GType for GntCheckBox
  */
diff --git a/finch/libgnt/gntclipboard.h b/finch/libgnt/gntclipboard.h
--- a/finch/libgnt/gntclipboard.h
+++ b/finch/libgnt/gntclipboard.h
@@ -63,7 +63,7 @@ struct _GntClipboardClass
 G_BEGIN_DECLS
 
 /**
- * gnt_clipboard_get_gtype:
+ * gnt_clipboard_get_type:
  *
  * Returns: GType for GntClipboard.
  */
diff --git a/finch/libgnt/gntcombobox.h b/finch/libgnt/gntcombobox.h
--- a/finch/libgnt/gntcombobox.h
+++ b/finch/libgnt/gntcombobox.h
@@ -72,7 +72,7 @@ struct _GntComboBoxClass
 G_BEGIN_DECLS
 
 /**
- * gnt_combo_box_get_gtype:
+ * gnt_combo_box_get_type:
  *
  * Returns:  Get the GType for GntComboBox
  */
diff --git a/finch/libgnt/gntentry.h b/finch/libgnt/gntentry.h
--- a/finch/libgnt/gntentry.h
+++ b/finch/libgnt/gntentry.h
@@ -108,7 +108,7 @@ struct _GntEntryClass
 G_BEGIN_DECLS
 
 /**
- * gnt_entry_get_gtype:
+ * gnt_entry_get_type:
  *
  * Returns: GType for GntEntry.
  */
diff --git a/finch/libgnt/gntfilesel.h b/finch/libgnt/gntfilesel.h
--- a/finch/libgnt/gntfilesel.h
+++ b/finch/libgnt/gntfilesel.h
@@ -102,7 +102,7 @@ struct _GntFile
 G_BEGIN_DECLS
 
 /**
- * gnt_file_sel_get_gtype:
+ * gnt_file_sel_get_type:
  *
  * Returns: GType for GntFileSel.
  */
diff --git a/finch/libgnt/gntlabel.h b/finch/libgnt/gntlabel.h
--- a/finch/libgnt/gntlabel.h
+++ b/finch/libgnt/gntlabel.h
@@ -71,7 +71,7 @@ struct _GntLabelClass
 G_BEGIN_DECLS
 
 /**
- * gnt_label_get_gtype:
+ * gnt_label_get_type:
  *
  * Returns: GType for GntLabel.
  */
diff --git a/finch/libgnt/gntline.h b/finch/libgnt/gntline.h
--- a/finch/libgnt/gntline.h
+++ b/finch/libgnt/gntline.h
@@ -70,7 +70,7 @@ struct _GntLineClass
 G_BEGIN_DECLS
 
 /**
- * gnt_line_get_gtype:
+ * gnt_line_get_type:
  *
  * Returns: GType for GntLine.
  */
diff --git a/finch/libgnt/gntmenu.h b/finch/libgnt/gntmenu.h
--- a/finch/libgnt/gntmenu.h
+++ b/finch/libgnt/gntmenu.h
@@ -93,7 +93,7 @@ struct _GntMenuClass
 G_BEGIN_DECLS
 
 /**
- * gnt_menu_get_gtype:
+ * gnt_menu_get_type:
  *
  * Returns:  The GType for GntMenu.
  */
diff --git a/finch/libgnt/gntmenuitem.h b/finch/libgnt/gntmenuitem.h
--- a/finch/libgnt/gntmenuitem.h
+++ b/finch/libgnt/gntmenuitem.h
@@ -90,7 +90,7 @@ struct _GntMenuItemClass
 G_BEGIN_DECLS
 
 /**
- * gnt_menuitem_get_gtype:
+ * gnt_menuitem_get_type:
  *
  * Returns: GType for GntMenuItem.
  */
diff --git a/finch/libgnt/gntmenuitemcheck.h b/finch/libgnt/gntmenuitemcheck.h
--- a/finch/libgnt/gntmenuitemcheck.h
+++ b/finch/libgnt/gntmenuitemcheck.h
@@ -69,7 +69,7 @@ struct _GntMenuItemCheckClass
 G_BEGIN_DECLS
 
 /**
- * gnt_menuitem_check_get_gtype:
+ * gnt_menuitem_check_get_type:
  *
  * Returns: GType for GntMenuItemCheck.
  */
diff --git a/finch/libgnt/gntprogressbar.h b/finch/libgnt/gntprogressbar.h
--- a/finch/libgnt/gntprogressbar.h
+++ b/finch/libgnt/gntprogressbar.h
@@ -63,9 +63,10 @@ typedef struct _GntProgressBarClass
 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
diff --git a/finch/libgnt/gntslider.h b/finch/libgnt/gntslider.h
--- a/finch/libgnt/gntslider.h
+++ b/finch/libgnt/gntslider.h
@@ -78,7 +78,7 @@ struct _GntSliderClass
 G_BEGIN_DECLS
 
 /**
- * gnt_slider_get_gtype:
+ * gnt_slider_get_type:
  *
  * Returns: The GType for GntSlider
  *
diff --git a/finch/libgnt/gnttextview.h b/finch/libgnt/gnttextview.h
--- a/finch/libgnt/gnttextview.h
+++ b/finch/libgnt/gnttextview.h
@@ -91,7 +91,7 @@ struct _GntTextViewClass
 G_BEGIN_DECLS
 
 /**
- * gnt_text_view_get_gtype:
+ * gnt_text_view_get_type:
  *
  * Returns:  GType for GntTextView.
  */
diff --git a/finch/libgnt/gnttree.h b/finch/libgnt/gnttree.h
--- a/finch/libgnt/gnttree.h
+++ b/finch/libgnt/gnttree.h
@@ -105,7 +105,7 @@ struct _GntTreeClass
 G_BEGIN_DECLS
 
 /**
- * gnt_tree_get_gtype:
+ * gnt_tree_get_type:
  *
  * Returns: The GType for GntTree
  */
@@ -116,9 +116,9 @@ GType gnt_tree_get_type(void);
  *
  * Create a tree with one column.
  *
+ * See gnt_tree_new_with_columns().
+ *
  * Returns: The newly created tree
- *
- * See gnt_tree_new_with_columns().
  */
 GntWidget * gnt_tree_new(void);
 
diff --git a/finch/libgnt/gntwidget.h b/finch/libgnt/gntwidget.h
--- a/finch/libgnt/gntwidget.h
+++ b/finch/libgnt/gntwidget.h
@@ -144,7 +144,7 @@ struct _GntWidgetClass
 G_BEGIN_DECLS
 
 /**
- * gnt_widget_get_gtype:
+ * gnt_widget_get_type:
  *
  * Returns:  GType for GntWidget.
  */
diff --git a/finch/libgnt/gntwindow.h b/finch/libgnt/gntwindow.h
--- a/finch/libgnt/gntwindow.h
+++ b/finch/libgnt/gntwindow.h
@@ -77,7 +77,7 @@ struct _GntWindowClass
 G_BEGIN_DECLS
 
 /**
- * gnt_window_get_gtype:
+ * gnt_window_get_type:
  *
  * Returns:  GType for GntWindow.
  */
diff --git a/finch/libgnt/gntwm.h b/finch/libgnt/gntwm.h
--- a/finch/libgnt/gntwm.h
+++ b/finch/libgnt/gntwm.h
@@ -193,7 +193,7 @@ struct _GntWMClass
 G_BEGIN_DECLS
 
 /**
- * gnt_wm_get_gtype:
+ * gnt_wm_get_type:
  *
  * Returns: GType for GntWM.
  */
diff --git a/finch/libgnt/gntws.h b/finch/libgnt/gntws.h
--- a/finch/libgnt/gntws.h
+++ b/finch/libgnt/gntws.h
@@ -72,7 +72,7 @@ struct _GntWSClass
 G_BEGIN_DECLS
 
 /**
- * gnt_ws_get_gtype:
+ * gnt_ws_get_type:
  *
  * Returns: The GType for GntWS.
  *
diff --git a/libpurple/accountopt.h b/libpurple/accountopt.h
--- a/libpurple/accountopt.h
+++ b/libpurple/accountopt.h
@@ -227,7 +227,7 @@ void purple_account_option_add_list_item
 									   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.
diff --git a/libpurple/buddylist.h b/libpurple/buddylist.h
--- a/libpurple/buddylist.h
+++ b/libpurple/buddylist.h
@@ -193,10 +193,10 @@ PurpleBlistNode *purple_blist_get_root(v
  * discouraged if you do not actually need every buddy in the list.  Use
  * purple_blist_find_buddies instead.
  *
+ * See purple_blist_find_buddies().

More information about the Commits mailing list