Merge from upstream, includes documentation.

1 files changed, 34 insertions, 120 deletions

diff --git a/docs/reference/libindicate-sections.txt b/docs/reference/libindicate-sections.txt
index f5f3290..6e2a8cd 100644
--- a/docs/reference/libindicate-sections.txt
+++ b/docs/reference/libindicate-sections.txt
@@ -2,148 +2,62 @@
 
 <SECTION>
 <FILE>indicator</FILE>
-<TITLE>Everything</TITLE>
-
-INDICATE_INDICATOR
-INDICATE_INDICATOR_CLASS
-INDICATE_INDICATOR_GET_CLASS
-INDICATE_INDICATOR_MESSAGE
-INDICATE_INDICATOR_MESSAGE_CLASS
-INDICATE_INDICATOR_MESSAGE_GET_CLASS
-INDICATE_INDICATOR_SIGNAL_DISPLAY
-INDICATE_INDICATOR_SIGNAL_HIDE
-INDICATE_INDICATOR_SIGNAL_MODIFIED
-INDICATE_INDICATOR_SIGNAL_SHOW
-INDICATE_IS_INDICATOR
-INDICATE_IS_INDICATOR_CLASS
-INDICATE_IS_INDICATOR_MESSAGE
-INDICATE_IS_INDICATOR_MESSAGE_CLASS
-INDICATE_IS_LISTENER
-INDICATE_IS_LISTENER_CLASS
-INDICATE_IS_SERVER
-INDICATE_IS_SERVER_CLASS
-INDICATE_LISTENER
-INDICATE_LISTENER_CLASS
-INDICATE_LISTENER_GET_CLASS
-INDICATE_LISTENER_INDICATOR_ID
-INDICATE_LISTENER_SERVER_DBUS_NAME
-INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED
-INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED
-INDICATE_LISTENER_SIGNAL_INDICATOR_REMOVED
-INDICATE_LISTENER_SIGNAL_SERVER_ADDED
-INDICATE_LISTENER_SIGNAL_SERVER_REMOVED
-INDICATE_SERVER
-INDICATE_SERVER_CLASS
-INDICATE_SERVER_GET_CLASS
-INDICATE_TYPE_INDICATOR
-INDICATE_TYPE_INDICATOR_MESSAGE
-INDICATE_TYPE_LISTENER
-INDICATE_TYPE_SERVER
+<TITLE>IndicateIndicator</TITLE>
 IndicateIndicator
 IndicateIndicatorClass
-IndicateIndicatorMessage
-IndicateIndicatorMessageClass
-IndicateListener
-IndicateListenerClass
-IndicateListenerIndicator
-IndicateListenerServer
-IndicateServer
-IndicateServerClass
-dbus_g_proxy_begin_call
-dbus_glib_marshal_indicate_server_BOOLEAN__POINTER_POINTER
-dbus_glib_marshal_indicate_server_BOOLEAN__STRING_POINTER_POINTER
-dbus_glib_marshal_indicate_server_BOOLEAN__UINT_BOXED_POINTER_POINTER
-dbus_glib_marshal_indicate_server_BOOLEAN__UINT_POINTER
-dbus_glib_marshal_indicate_server_BOOLEAN__UINT_POINTER_POINTER
-dbus_glib_marshal_indicate_server_BOOLEAN__UINT_STRING_POINTER_POINTER
-g_marshal_value_peek_boolean
-g_marshal_value_peek_boxed
-g_marshal_value_peek_char
-g_marshal_value_peek_double
-g_marshal_value_peek_enum
-g_marshal_value_peek_flags
-g_marshal_value_peek_float
-g_marshal_value_peek_int
-g_marshal_value_peek_int64
-g_marshal_value_peek_long
-g_marshal_value_peek_object
-g_marshal_value_peek_param
-g_marshal_value_peek_pointer
-g_marshal_value_peek_string
-g_marshal_value_peek_uchar
-g_marshal_value_peek_uint
-g_marshal_value_peek_uint64
-g_marshal_value_peek_ulong
 indicate_indicator_get_id
 indicate_indicator_get_indicator_type
 indicate_indicator_get_property
-indicate_indicator_get_type
 indicate_indicator_hide
 indicate_indicator_is_visible
 indicate_indicator_list_properties
-indicate_indicator_message_get_type
-indicate_indicator_message_new
 indicate_indicator_new
 indicate_indicator_set_property
+indicate_indicator_set_property_icon
+indicate_indicator_set_property_time
 indicate_indicator_show
 indicate_indicator_user_display
-indicate_listener_display
-indicate_listener_get_property
-indicate_listener_get_property_cb
-indicate_listener_get_type
-indicate_listener_marshal_VOID__POINTER_POINTER_STRING
-indicate_listener_marshal_VOID__POINTER_POINTER_STRING_STRING
-indicate_listener_marshal_VOID__UINT_STRING
-indicate_listener_new
+</SECTION>
+
+<SECTION>
+<FILE>indicator-message</FILE>
+<TITLE>IndicateIndicatorMessage</TITLE>
+IndicateIndicatorMessage
+IndicateIndicatorMessageClass
+indicate_indicator_message_new
+</SECTION>
+
+<SECTION>
+<FILE>server</FILE>
+<TITLE>IndicateServer</TITLE>
+IndicateServer
+IndicateServerClass
 indicate_server_add_indicator
+indicate_server_check_interest
 indicate_server_emit_indicator_added
 indicate_server_emit_indicator_modified
 indicate_server_emit_indicator_removed
-indicate_server_get_desktop
-indicate_server_get_indicator_count
-indicate_server_get_indicator_count_by_type
-indicate_server_get_indicator_list
-indicate_server_get_indicator_list_by_type
-indicate_server_get_indicator_properties
-indicate_server_get_indicator_property
-indicate_server_get_indicator_property_group
+indicate_server_emit_server_display
 indicate_server_get_next_id
-indicate_server_get_type
 indicate_server_hide
-indicate_server_new
 indicate_server_ref_default
 indicate_server_remove_indicator
-indicate_server_set_dbus_object
 indicate_server_set_default
 indicate_server_set_desktop_file
+indicate_server_set_type
 indicate_server_show
-indicate_server_show_indicator_to_user
-org_freedesktop_indicator_get_desktop
-org_freedesktop_indicator_get_desktop_async
-org_freedesktop_indicator_get_desktop_reply
-org_freedesktop_indicator_get_indicator_count
-org_freedesktop_indicator_get_indicator_count_async
-org_freedesktop_indicator_get_indicator_count_by_type
-org_freedesktop_indicator_get_indicator_count_by_type_async
-org_freedesktop_indicator_get_indicator_count_by_type_reply
-org_freedesktop_indicator_get_indicator_count_reply
-org_freedesktop_indicator_get_indicator_list
-org_freedesktop_indicator_get_indicator_list_async
-org_freedesktop_indicator_get_indicator_list_by_type
-org_freedesktop_indicator_get_indicator_list_by_type_async
-org_freedesktop_indicator_get_indicator_list_by_type_reply
-org_freedesktop_indicator_get_indicator_list_reply
-org_freedesktop_indicator_get_indicator_properties
-org_freedesktop_indicator_get_indicator_properties_async
-org_freedesktop_indicator_get_indicator_properties_reply
-org_freedesktop_indicator_get_indicator_property
-org_freedesktop_indicator_get_indicator_property_async
-org_freedesktop_indicator_get_indicator_property_group
-org_freedesktop_indicator_get_indicator_property_group_async
-org_freedesktop_indicator_get_indicator_property_group_reply
-org_freedesktop_indicator_get_indicator_property_reply
-org_freedesktop_indicator_show_indicator_to_user
-org_freedesktop_indicator_show_indicator_to_user_async
-org_freedesktop_indicator_show_indicator_to_user_reply
+</SECTION>
 
+<SECTION>
+<FILE>listener</FILE>
+<TITLE>IndicateListener</TITLE>
+IndicateListener
+IndicateListenerClass
+IndicateListenerIndicator
+IndicateListenerServer
+indicate_listener_display
+indicate_listener_get_property
+indicate_listener_get_property_cb
+indicate_listener_new
 </SECTION>
+