tracker r2303 - in trunk: . docs/reference/libtracker-common src/libtracker-common

[mr svn gnome org]

Author: mr
Date: Fri Oct  3 10:25:15 2008
New Revision: 2303
URL: http://svn.gnome.org/viewvc/tracker?rev=2303&view=rev

Log:
	* docs/reference/libtracker-common/libtracker-common-sections.txt:
	Change the order of the functions so all the
	new/free/init/shutdown functions are at the top.

	* src/libtracker-common/tracker-hal.h: Don't define the TrackerHal
	object differently depending on if we HAVE_HAL. This was causing
	an error in the documentation building.


Modified:
   trunk/ChangeLog
   trunk/docs/reference/libtracker-common/Makefile.am
   trunk/docs/reference/libtracker-common/libtracker-common-sections.txt
   trunk/src/libtracker-common/tracker-hal.h

Modified: trunk/docs/reference/libtracker-common/Makefile.am
==============================================================================
--- trunk/docs/reference/libtracker-common/Makefile.am	(original)
+++ trunk/docs/reference/libtracker-common/Makefile.am	Fri Oct  3 10:25:15 2008
@@ -49,7 +49,7 @@
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =					\
+content_files =						\
 	version.xml
 
 expand_content_files =

Modified: trunk/docs/reference/libtracker-common/libtracker-common-sections.txt
==============================================================================
--- trunk/docs/reference/libtracker-common/libtracker-common-sections.txt	(original)
+++ trunk/docs/reference/libtracker-common/libtracker-common-sections.txt	Fri Oct  3 10:25:15 2008
@@ -2,6 +2,9 @@
 <SECTION>
 <FILE>tracker-config</FILE>
 <TITLE>Config</TITLE>
+TrackerConfig
+tracker_config_new
+tracker_config_get_type
 tracker_config_add_crawl_directory_roots
 tracker_config_add_disabled_modules
 tracker_config_add_no_watch_directory_roots
@@ -33,10 +36,8 @@
 tracker_config_get_no_index_file_types
 tracker_config_get_no_watch_directory_roots
 tracker_config_get_throttle
-tracker_config_get_type
 tracker_config_get_verbosity
 tracker_config_get_watch_directory_roots
-tracker_config_new
 tracker_config_remove_disabled_modules
 tracker_config_set_disable_indexing_on_battery
 tracker_config_set_disable_indexing_on_battery_init
@@ -73,13 +74,6 @@
 tracker_date_to_time_string
 </SECTION>
 
-<INCLUDE>libtracker-common/tracker-service.h</INCLUDE>
-<SECTION>
-<FILE>tracker-service</FILE>
-<TITLE>Services</TITLE>
-tracker_db_type_get_type
-</SECTION>
-
 <INCLUDE>libtracker-common/tracker-dbus.h</INCLUDE>
 <SECTION>
 <FILE>tracker-dbus</FILE>
@@ -140,6 +134,9 @@
 <SECTION>
 <FILE>tracker-field</FILE>
 <TITLE>Fields</TITLE>
+TrackerField
+tracker_field_new
+tracker_field_get_type
 tracker_field_append_child_id
 tracker_field_get_child_ids
 tracker_field_get_data_type
@@ -151,9 +148,7 @@
 tracker_field_get_multiple_values
 tracker_field_get_name
 tracker_field_get_store_metadata
-tracker_field_get_type
 tracker_field_get_weight
-tracker_field_new
 tracker_field_set_child_ids
 tracker_field_set_data_type
 tracker_field_set_delimited
@@ -173,6 +168,8 @@
 <SECTION>
 <FILE>tracker-field-data</FILE>
 <TITLE>Field Data</TITLE>
+tracker_field_data_new
+tracker_field_data_get_type
 tracker_field_data_get_alias
 tracker_field_data_get_data_type
 tracker_field_data_get_field_name
@@ -183,9 +180,7 @@
 tracker_field_data_get_needs_join
 tracker_field_data_get_select_field
 tracker_field_data_get_table_name
-tracker_field_data_get_type
 tracker_field_data_get_where_field
-tracker_field_data_new
 tracker_field_data_set_alias
 tracker_field_data_set_data_type
 tracker_field_data_set_field_name
@@ -223,12 +218,13 @@
 <SECTION>
 <FILE>tracker-hal</FILE>
 <TITLE>HAL</TITLE>
+TrackerHal
+tracker_hal_new
+tracker_hal_get_type
 tracker_hal_get_battery_exists
 tracker_hal_get_battery_in_use
 tracker_hal_get_mounted_directory_roots
 tracker_hal_get_removable_device_roots
-tracker_hal_get_type
-tracker_hal_new
 </SECTION>
 
 <INCLUDE>libtracker-common/tracker-ioprio.h</INCLUDE>
@@ -242,12 +238,13 @@
 <SECTION>
 <FILE>tracker-language</FILE>
 <TITLE>Language</TITLE>
+TrackerLanguage
+tracker_language_new
+tracker_language_get_type
 tracker_language_check_exists
 tracker_language_get_config
 tracker_language_get_default_code
 tracker_language_get_stop_words
-tracker_language_get_type
-tracker_language_new
 tracker_language_set_config
 tracker_language_stem_word
 </SECTION>
@@ -264,6 +261,8 @@
 <SECTION>
 <FILE>tracker-module-config</FILE>
 <TITLE>Module Config</TITLE>
+tracker_module_config_init
+tracker_module_config_shutdown
 tracker_module_config_get_description
 tracker_module_config_get_enabled
 tracker_module_config_get_ignored_directories
@@ -277,8 +276,6 @@
 tracker_module_config_get_modules
 tracker_module_config_get_monitor_directories
 tracker_module_config_get_monitor_recurse_directories
-tracker_module_config_init
-tracker_module_config_shutdown
 </SECTION>
 
 <INCLUDE>libtracker-common/tracker-nfs-lock.h</INCLUDE>
@@ -295,10 +292,8 @@
 <SECTION>
 <FILE>tracker-ontology</FILE>
 <TITLE>Ontology</TITLE>
-tracker_ontology_field_add
-tracker_ontology_field_get_display_name
-tracker_ontology_field_get_id
-tracker_ontology_field_is_child_of
+tracker_ontology_init
+tracker_ontology_shutdown
 tracker_ontology_get_field_by_id
 tracker_ontology_get_field_by_name
 tracker_ontology_get_field_name_by_service_name
@@ -312,7 +307,6 @@
 tracker_ontology_get_service_parent
 tracker_ontology_get_service_parent_by_id
 tracker_ontology_get_service_parent_id_by_id
-tracker_ontology_init
 tracker_ontology_service_add
 tracker_ontology_service_get_key_metadata
 tracker_ontology_service_get_show_directories
@@ -322,16 +316,20 @@
 tracker_ontology_service_has_text
 tracker_ontology_service_has_thumbnails
 tracker_ontology_service_is_valid
-tracker_ontology_shutdown
+tracker_ontology_field_add
+tracker_ontology_field_get_display_name
+tracker_ontology_field_get_id
+tracker_ontology_field_is_child_of
 </SECTION>
 
 <INCLUDE>libtracker-common/tracker-parser.h</INCLUDE>
 <SECTION>
 <FILE>tracker-parser</FILE>
 <TITLE>Parser</TITLE>
+TrackerParser
+tracker_parser_new
 tracker_parser_free
 tracker_parser_is_stop_word
-tracker_parser_new
 tracker_parser_next
 tracker_parser_process_word
 tracker_parser_reset
@@ -345,6 +343,10 @@
 <SECTION>
 <FILE>tracker-service</FILE>
 <TITLE>Service</TITLE>
+TrackerService
+tracker_service_new
+tracker_service_get_type
+tracker_db_type_get_type
 tracker_service_get_content_metadata
 tracker_service_get_db_type
 tracker_service_get_embedded
@@ -359,8 +361,6 @@
 tracker_service_get_property_prefix
 tracker_service_get_show_service_directories
 tracker_service_get_show_service_files
-tracker_service_get_type
-tracker_service_new
 tracker_service_set_content_metadata
 tracker_service_set_db_type
 tracker_service_set_embedded

Modified: trunk/src/libtracker-common/tracker-hal.h
==============================================================================
--- trunk/src/libtracker-common/tracker-hal.h	(original)
+++ trunk/src/libtracker-common/tracker-hal.h	Fri Oct  3 10:25:15 2008
@@ -26,8 +26,6 @@
 
 G_BEGIN_DECLS
 
-#ifdef HAVE_HAL
-
 #define TRACKER_TYPE_HAL	 (tracker_hal_get_type ())
 #define TRACKER_HAL(o)		 (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_HAL, TrackerHal))
 #define TRACKER_HAL_CLASS(k)	 (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_HAL, TrackerHalClass))
@@ -46,6 +44,8 @@
 	GObjectClass parent_class;
 };
 
+#ifdef HAVE_HAL
+
 GType	    tracker_hal_get_type		    (void) G_GNUC_CONST;
 
 TrackerHal *tracker_hal_new			    (void);
@@ -54,10 +54,6 @@
 GSList *    tracker_hal_get_mounted_directory_roots (TrackerHal *hal);
 GSList *    tracker_hal_get_removable_device_roots  (TrackerHal *hal);
 
-#else  /* HAVE_HAL */
-
-typedef void TrackerHal;
-
 #endif /* HAVE_HAL */
 
 G_END_DECLS