aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-01-07 20:36:35 -0600
committerTed Gould <ted@canonical.com>2009-01-07 20:36:35 -0600
commit9389a6a60d0439f659348da14c2b5ad861a1e345 (patch)
tree808ee9de20e0c7161b35d81ec9d2172f4486d8bc
parent4381e65e5c848433f2c3cac37d911f29fc7a5282 (diff)
downloadlibayatana-indicator-9389a6a60d0439f659348da14c2b5ad861a1e345.tar.gz
libayatana-indicator-9389a6a60d0439f659348da14c2b5ad861a1e345.tar.bz2
libayatana-indicator-9389a6a60d0439f659348da14c2b5ad861a1e345.zip
Fixing stuff so that everything links all together
-rw-r--r--libindicate/indicator.c3
-rw-r--r--libindicate/indicator.h2
-rw-r--r--libindicate/server.h14
3 files changed, 12 insertions, 7 deletions
diff --git a/libindicate/indicator.c b/libindicate/indicator.c
index e2455a2..0a41c19 100644
--- a/libindicate/indicator.c
+++ b/libindicate/indicator.c
@@ -1,7 +1,6 @@
#include "glib.h"
#include "indicator.h"
-#include "indicate.h"
/* Signals */
enum {
@@ -39,7 +38,7 @@ indicate_indicator_class_init (IndicateIndicatorClass * class)
static void
indicate_indicator_init (IndicateIndicator * indicator)
{
- id = 0;
+ indicator->id = 0;
/* TODO: Need to connect to a server here */
diff --git a/libindicate/indicator.h b/libindicate/indicator.h
index dd21c9d..e427f25 100644
--- a/libindicate/indicator.h
+++ b/libindicate/indicator.h
@@ -48,7 +48,7 @@ guint indicate_indicator_get_id (IndicateIndicator * indicator);
/* Every entry has a type. This should be created by the
* subclass and exported through this pretty function */
-const gchar * indicate_indicator_get_type (IndicateIndicator * indicator);
+const gchar * indicate_indicator_get_indicator_type (IndicateIndicator * indicator);
#endif /* INDICATE_INDICATOR_H_INCLUDED__ */
diff --git a/libindicate/server.h b/libindicate/server.h
index 632e357..79a314b 100644
--- a/libindicate/server.h
+++ b/libindicate/server.h
@@ -42,10 +42,16 @@ void indicate_server_set_desktop_file (const gchar * path);
void indicate_server_show (IndicateServer * server);
void indicate_server_hide (IndicateServer * server);
-/* The functions to count indicators for simpler displays of the
- * indicators in the application */
-guint indicate_server_indicator_count (IndicateServer * server);
-guint indicate_server_indicator_count_by_type (IndicateServer * server, const gchar * type);
+/* DBus API */
+gboolean indicate_server_get_desktop (IndicateServer * server, gchar ** desktop_path, GError **error);
+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, guint ** 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, gchar ** 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);
#endif /* INDICATE_INDICATOR_H_INCLUDED__ */