Moving the enum into the provider object and changing the name everywhere.

2 files changed, 35 insertions, 33 deletions

diff --git a/src/status-provider.h b/src/status-provider.h
index bbc86f6..b20f4f0 100644
--- a/src/status-provider.h
+++ b/src/status-provider.h
@@ -13,6 +13,18 @@ G_BEGIN_DECLS
 #define IS_STATUS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), STATUS_PROVIDER_TYPE))
 #define STATUS_PROVIDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), STATUS_PROVIDER_TYPE, StatusProviderClass))
 
+typedef enum
+{
+  STATUS_PROVIDER_STATUS_ONLINE,
+  STATUS_PROVIDER_STATUS_AWAY,
+  STATUS_PROVIDER_STATUS_DND,
+  STATUS_PROVIDER_STATUS_INVISIBLE,
+  STATUS_PROVIDER_STATUS_OFFLINE,
+  /* Leave as last */
+  STATUS_PROVIDER_STATUS_LAST
+}
+StatusProviderStatus;
+
 #define STATUS_PROVIDER_SIGNAL_STATUS_CHANGED  "status-changed"
 
 typedef struct _StatusProvider      StatusProvider;
@@ -23,21 +35,21 @@ struct _StatusProvider {
 typedef struct _StatusProviderClass StatusProviderClass;
 struct _StatusProviderClass {
 	/* Signals */
-	void (*status_changed) (guint newstatus);
+	void (*status_changed) (StatusProviderStatus newstatus);
 
 	/* Virtual Functions */
-	void  (*set_status) (StatusProvider * sp, guint newstatus);
-	guint (*get_status) (StatusProvider * sp);
+	void  (*set_status) (StatusProvider * sp, StatusProviderStatus newstatus);
+	StatusProviderStatus (*get_status) (StatusProvider * sp);
 
 	GObjectClass parent_class;
 };
 
 GType status_provider_get_type (void);
 
-void status_provider_set_status (StatusProvider * sp, guint status);
-guint status_provider_get_status (StatusProvider * sp);
+void status_provider_set_status (StatusProvider * sp, StatusProviderStatus status);
+StatusProviderStatus status_provider_get_status (StatusProvider * sp);
 
-void status_provider_emit_status_changed (StatusProvider * sp, guint newstatus);
+void status_provider_emit_status_changed (StatusProvider * sp, StatusProviderStatus newstatus);
 
 G_END_DECLS
 
diff --git a/src/status-service.c b/src/status-service.c
index cd131a4..e839b16 100644
--- a/src/status-service.c
+++ b/src/status-service.c
@@ -9,32 +9,22 @@
 
 #include "dbus-shared-names.h"
 
-typedef enum
-{
-  STATUS_SERVICE_STATUS_ONLINE,
-  STATUS_SERVICE_STATUS_AWAY,
-  STATUS_SERVICE_STATUS_DND,
-  STATUS_SERVICE_STATUS_INVISIBLE,
-  STATUS_SERVICE_STATUS_OFFLINE,
-  /* Leave as last */
-  STATUS_SERVICE_STATUS_LAST
-}
-StatusServiceStatus;
-
-static const gchar * status_strings [STATUS_SERVICE_STATUS_LAST] = {
-  /* STATUS_SERVICE_STATUS_ONLINE,    */ N_("Available"),
-  /* STATUS_SERVICE_STATUS_AWAY,      */ N_("Away"),
-  /* STATUS_SERVICE_STATUS_DND        */ N_("Busy"),
-  /* STATUS_SERVICE_STATUS_INVISIBLE  */ N_("Invisible"),
-  /* STATUS_SERVICE_STATUS_OFFLINE,   */ N_("Offline")
+#include "status-provider.h"
+
+static const gchar * status_strings [STATUS_PROVIDER_STATUS_LAST] = {
+  /* STATUS_PROVIDER_STATUS_ONLINE,    */ N_("Available"),
+  /* STATUS_PROVIDER_STATUS_AWAY,      */ N_("Away"),
+  /* STATUS_PROVIDER_STATUS_DND        */ N_("Busy"),
+  /* STATUS_PROVIDER_STATUS_INVISIBLE  */ N_("Invisible"),
+  /* STATUS_PROVIDER_STATUS_OFFLINE,   */ N_("Offline")
 };
 
-static const gchar * status_icons[STATUS_SERVICE_STATUS_LAST] = {
-  /* STATUS_SERVICE_STATUS_ONLINE, */     "user-online",
-  /* STATUS_SERVICE_STATUS_AWAY, */       "user-away",
-  /* STATUS_SERVICE_STATUS_DND, */        "user-busy",
-  /* STATUS_SERVICE_STATUS_INVISIBLE, */  "user-invisible",
-  /* STATUS_SERVICE_STATUS_OFFLINE */     "user-offline"
+static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = {
+  /* STATUS_PROVIDER_STATUS_ONLINE, */     "user-online",
+  /* STATUS_PROVIDER_STATUS_AWAY, */       "user-away",
+  /* STATUS_PROVIDER_STATUS_DND, */        "user-busy",
+  /* STATUS_PROVIDER_STATUS_INVISIBLE, */  "user-invisible",
+  /* STATUS_PROVIDER_STATUS_OFFLINE */     "user-offline"
 };
 
 
@@ -44,7 +34,7 @@ static GMainLoop * mainloop = NULL;
 static void
 menu_click (DbusmenuMenuitem * mi, gpointer data)
 {
-	StatusServiceStatus stat = (StatusServiceStatus)GPOINTER_TO_INT(data);
+	StatusProviderStatus status = (StatusProviderStatus)GPOINTER_TO_INT(data);
 
 }
 
@@ -54,8 +44,8 @@ build_menu (gpointer data)
 	DbusmenuMenuitem * root = DBUSMENU_MENUITEM(data);
 	g_return_val_if_fail(root != NULL, FALSE);
 
-	StatusServiceStatus i;
-	for (i = STATUS_SERVICE_STATUS_ONLINE; i < STATUS_SERVICE_STATUS_LAST; i++) {
+	StatusProviderStatus i;
+	for (i = STATUS_PROVIDER_STATUS_ONLINE; i < STATUS_PROVIDER_STATUS_LAST; i++) {
 		DbusmenuMenuitem * mi = dbusmenu_menuitem_new();
 
 		dbusmenu_menuitem_property_set(mi, "label", _(status_strings[i]));