/soc/2013/ankitkv/gobjectification: 2940eba98d2d: Removed .types...

Ankit Vani a at nevitus.org
Sat Oct 12 14:42:42 EDT 2013


Changeset: 2940eba98d2d0b5770e86a471dbe2d906403109c
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-12 22:38 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/2940eba98d2d

Description:

Removed .types files, gtkdoc-scan now works correctly and creates these for us

diffstat:

 doc/reference/finch/Makefile.am         |    3 +-
 doc/reference/finch/finch.types         |    3 -
 doc/reference/libpurple/Makefile.am     |    3 +-
 doc/reference/libpurple/libpurple.types |  124 --------------------------------
 doc/reference/pidgin/Makefile.am        |    3 +-
 doc/reference/pidgin/pidgin.types       |   39 ----------
 6 files changed, 6 insertions(+), 169 deletions(-)

diffs (241 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
@@ -30,6 +30,7 @@ SCANGOBJ_OPTIONS=
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
 SCAN_OPTIONS=\
 	--deprecated-guards="PURPLE_DISABLE_DEPRECATED|GNT_DISABLE_DEPRECATED|FINCH_DISABLE_DEPRECATED" \
+	--rebuild-types \
 	--rebuild-sections
 
 # Extra options to supply to gtkdoc-mkdb.
@@ -108,7 +109,7 @@ EXTRA_DIST += version.xml.in
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = $(DOC_MODULE)-sections.txt
+DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
 
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
diff --git a/doc/reference/finch/finch.types b/doc/reference/finch/finch.types
deleted file mode 100644
--- a/doc/reference/finch/finch.types
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "gntplugin.h"
-
-finch_plugin_info_get_type
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -30,6 +30,7 @@ SCANGOBJ_OPTIONS=
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
 SCAN_OPTIONS=\
 	--deprecated-guards="PURPLE_DISABLE_DEPRECATED" \
+	--rebuild-types \
 	--rebuild-sections
 
 # Extra options to supply to gtkdoc-mkdb.
@@ -121,7 +122,7 @@ EXTRA_DIST += version.xml.in
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = $(DOC_MODULE)-sections.txt
+DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
 
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
diff --git a/doc/reference/libpurple/libpurple.types b/doc/reference/libpurple/libpurple.types
deleted file mode 100644
--- a/doc/reference/libpurple/libpurple.types
+++ /dev/null
@@ -1,124 +0,0 @@
-#include "purple.h"
-#include "ciphers/aescipher.h"
-#include "ciphers/des3cipher.h"
-#include "ciphers/descipher.h"
-#include "ciphers/hmaccipher.h"
-#include "ciphers/md4hash.h"
-#include "ciphers/md5hash.h"
-#include "ciphers/pbkdf2cipher.h"
-#include "ciphers/rc4cipher.h"
-#include "ciphers/sha1hash.h"
-#include "ciphers/sha256hash.h"
-#include "media-gst.h"
-#include "media/codec.h"
-#include "media/candidate.h"
-#include "media/backend-fs2.h"
-#include "media/backend-iface.h"
-#include "media/enum-types.h"
-
-purple_account_get_type
-purple_account_presence_get_type
-purple_account_privacy_type_get_type
-purple_account_request_response_get_type
-purple_account_request_type_get_type
-purple_aes_cipher_get_type
-purple_attention_type_get_type
-purple_blist_node_get_type
-purple_buddy_get_type
-purple_buddy_icon_get_type
-purple_buddy_icon_spec_get_type
-purple_buddy_list_get_type
-purple_buddy_presence_get_type
-purple_certificate_get_type
-purple_certificate_pool_get_type
-purple_chat_conversation_get_type
-purple_chat_get_type
-purple_chat_user_flags_get_type
-purple_chat_user_get_type
-purple_cipher_batch_mode_get_type
-purple_cipher_get_type
-purple_circular_buffer_get_type
-purple_connection_error_get_type
-purple_connection_error_info_get_type
-purple_connection_flags_get_type
-purple_connection_get_type
-purple_connection_state_get_type
-purple_contact_get_type
-purple_conversation_get_type
-purple_conversation_message_get_type
-purple_conversation_update_type_get_type
-purple_counting_node_get_type
-purple_des3_cipher_get_type
-purple_des_cipher_get_type
-purple_desktop_item_get_type
-purple_group_get_type
-purple_hash_get_type
-purple_hmac_cipher_get_type
-purple_icon_scale_rules_get_type
-purple_im_conversation_get_type
-purple_imgstore_get_type
-purple_im_typing_state_get_type
-purple_keyring_get_type
-purple_log_get_type
-purple_md4_hash_get_type
-purple_md5_hash_get_type
-purple_media_backend_fs2_get_type
-purple_media_backend_get_type
-purple_media_candidate_get_type
-purple_media_candidate_type_get_type
-purple_media_caps_get_type
-purple_media_codec_get_type
-purple_media_element_info_get_type
-purple_media_element_type_get_type
-purple_media_get_type
-purple_media_info_type_get_type
-purple_media_manager_get_type
-purple_media_network_protocol_get_type
-purple_media_session_type_get_type
-purple_media_state_changed_get_type
-purple_message_flags_get_type
-purple_mood_get_type
-purple_notify_user_info_get_type
-purple_pbkdf2_cipher_get_type
-purple_plugin_action_get_type
-purple_plugin_info_flags_get_type
-purple_plugin_info_get_type
-purple_presence_get_type
-purple_protocol_action_get_type
-purple_protocol_attention_iface_get_type
-purple_protocol_chat_entry_get_type
-purple_protocol_chat_iface_get_type
-purple_protocol_client_iface_get_type
-purple_protocol_factory_iface_get_type
-purple_protocol_get_type
-purple_protocol_im_iface_get_type
-purple_protocol_media_iface_get_type
-purple_protocol_options_get_type
-purple_protocol_override_flags_get_type
-purple_protocol_privacy_iface_get_type
-purple_protocol_roomlist_iface_get_type
-purple_protocol_server_iface_get_type
-purple_protocol_xfer_iface_get_type
-purple_rc4_cipher_get_type
-purple_roomlist_field_get_type
-purple_roomlist_field_type_get_type
-purple_roomlist_get_type
-purple_roomlist_room_get_type
-purple_roomlist_room_type_get_type
-purple_sha1_hash_get_type
-purple_sha256_hash_get_type
-purple_smiley_get_type
-purple_sound_theme_get_type
-purple_sound_theme_loader_get_type
-purple_status_attribute_get_type
-purple_status_get_type
-purple_status_primitive_get_type
-purple_status_type_get_type
-purple_theme_get_type
-purple_theme_loader_get_type
-purple_theme_manager_get_type
-purple_whiteboard_get_type
-purple_xfer_get_type
-purple_xfer_status_get_type
-purple_xfer_type_get_type
-purple_xmlnode_get_type
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
@@ -30,6 +30,7 @@ SCANGOBJ_OPTIONS=
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
 SCAN_OPTIONS=\
 	--deprecated-guards="PURPLE_DISABLE_DEPRECATED|PIDGIN_DISABLE_DEPRECATED" \
+	--rebuild-types \
 	--rebuild-sections
 
 # Extra options to supply to gtkdoc-mkdb.
@@ -115,7 +116,7 @@ EXTRA_DIST += version.xml.in
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = $(DOC_MODULE)-sections.txt
+DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
 
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
diff --git a/doc/reference/pidgin/pidgin.types b/doc/reference/pidgin/pidgin.types
deleted file mode 100644
--- a/doc/reference/pidgin/pidgin.types
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "gtkblist-theme.h"
-#include "gtkblist-theme-loader.h"
-#include "gtkcellrendererexpander.h"
-#include "gtkconv-theme.h"
-#include "gtkconv-theme-loader.h"
-#include "gtkicon-theme.h"
-#include "gtkicon-theme-loader.h"
-#include "gtkimhtml.h"
-#include "gtkimhtmltoolbar.h"
-#include "gtkmenutray.h"
-#include "gtkplugin.h"
-#include "gtkscrollbook.h"
-#include "gtksourceundomanager.h"
-#include "gtkstatusbox.h"
-#include "gtkstatus-icon-theme.h"
-#include "gtkwebview.h"
-#include "gtkwebviewtoolbar.h"
-#include "minidialog.h"
-#include "pidginstock.h"
-
-gtk_imhtml_get_type
-gtk_imhtmltoolbar_get_type
-gtk_source_undo_manager_get_type
-gtk_webview_get_type
-gtk_webviewtoolbar_get_type
-pidgin_blist_theme_get_type
-pidgin_blist_theme_loader_get_type
-pidgin_cell_renderer_expander_get_type
-pidgin_conversation_theme_get_type
-pidgin_conversation_theme_loader_get_type
-pidgin_icon_theme_get_type
-pidgin_icon_theme_loader_get_type
-pidgin_menu_tray_get_type
-pidgin_mini_dialog_get_type
-pidgin_plugin_info_get_type
-pidgin_scroll_book_get_type
-pidgin_status_box_get_type
-pidgin_status_icon_theme_get_type
-pidgin_stock_icon_theme_get_type



More information about the Commits mailing list