First pass at the pretty meag-change to make it so that we can detect people on the system vs. the session bus. Basically reworking a bunch of structures. Fun.

1 files changed, 6 insertions, 5 deletions

diff --git a/libindicate/listener.h b/libindicate/listener.h
index f931b04..c4e724d 100644
--- a/libindicate/listener.h
+++ b/libindicate/listener.h
@@ -54,11 +54,11 @@ G_BEGIN_DECLS
 #define INDICATE_LISTENER_SIGNAL_SERVER_ADDED          "server-added"
 #define INDICATE_LISTENER_SIGNAL_SERVER_REMOVED        "server-removed"
 
-#define INDICATE_LISTENER_SERVER_DBUS_NAME(server)   ((gchar *)server)
-#define INDICATE_LISTENER_INDICATOR_ID(indicator)    (GPOINTER_TO_UINT(indicator))
+#define INDICATE_LISTENER_SERVER_DBUS_NAME(server)   (indicate_listener_server_get_dbusname(server))
+#define INDICATE_LISTENER_INDICATOR_ID(indicator)    (indicate_listener_indicator_get_id(indicator))
 
-typedef gchar IndicateListenerServer;
-typedef guint IndicateListenerIndicator;
+typedef struct _IndicateListenerServer IndicateListenerServer;
+typedef struct _IndicateListenerIndicator IndicateListenerIndicator;
 
 typedef struct _IndicateListener IndicateListener;
 struct _IndicateListener {
@@ -118,7 +118,8 @@ void                  indicate_listener_server_get_desktop (IndicateListener * l
                                                             IndicateListenerServer * server,
                                                             indicate_listener_get_server_property_cb callback,
                                                             gpointer data);
-
+const gchar *         indicate_listener_server_get_dbusname (IndicateListenerServer * server);
+guint                 indicate_listener_indicator_get_id    (IndicateListenerIndicator * indicator);