Switching around the show_interest and remove_interest functions so that

they are now asyncronous.  Not that being asynchronous is important but
more that now they get the Method Invocation interface that we can use
to find out the sender of the message.  Changed various APIs as a result
of this, and moved the DBus functions to be internal.

1 files changed, 3 insertions, 14 deletions

diff --git a/libindicate/server.h b/libindicate/server.h
index 4d6bbc5..0db5bef 100644
--- a/libindicate/server.h
+++ b/libindicate/server.h
@@ -86,8 +86,9 @@ struct _IndicateServerClass {
 	gboolean (*get_indicator_properties) (IndicateServer * server, guint id, gchar *** properties, GError **error);
 	gboolean (*show_indicator_to_user) (IndicateServer * server, guint id, GError ** error);
 	guint    (*get_next_id) (IndicateServer * server);
-	gboolean (*show_interest) (IndicateServer * server, IndicateInterests interest);
-	gboolean (*remove_interest) (IndicateServer * server, IndicateInterests interest);
+	gboolean (*show_interest) (IndicateServer * server, gchar * sender, IndicateInterests interest);
+	gboolean (*remove_interest) (IndicateServer * server, gchar * sender, IndicateInterests interest);
+	gboolean (*check_interest) (IndicateServer * server, IndicateInterests interest);
 
 	/* Reserver for future use */
 	void (*indicate_server_reserved1)(void);
@@ -127,18 +128,6 @@ void indicate_server_set_default (IndicateServer * server);
 gboolean indicate_server_check_interest (IndicateServer * server, IndicateInterests interest);
 
 
-/* DBus API */
-gboolean indicate_server_get_indicator_count (IndicateServer * server, guint * count, GError **error);
-gboolean indicate_server_get_indicator_count_by_type (IndicateServer * server, gchar * type, guint * count, GError **error);
-gboolean indicate_server_get_indicator_list (IndicateServer * server, GArray ** indicators, GError ** error);
-gboolean indicate_server_get_indicator_list_by_type (IndicateServer * server, gchar * type, guint ** indicators, GError ** error);
-gboolean indicate_server_get_indicator_property (IndicateServer * server, guint id, gchar * property, gchar ** value, GError **error);
-gboolean indicate_server_get_indicator_property_group (IndicateServer * server, guint id, GPtrArray * properties, gchar *** value, GError **error);
-gboolean indicate_server_get_indicator_properties (IndicateServer * server, guint id, gchar *** properties, GError **error);
-gboolean indicate_server_show_indicator_to_user (IndicateServer * server, guint id, GError ** error);
-gboolean indicate_server_show_interest (IndicateServer * server, gchar * interest, GError ** error);
-gboolean indicate_server_remove_interest (IndicateServer * server, gchar * interest, GError ** error);
-
 /* Signal emission functions for sub-classes of the server */
 void indicate_server_emit_indicator_added (IndicateServer *server, guint id, const gchar *type);
 void indicate_server_emit_indicator_removed (IndicateServer *server, guint id, const gchar *type);