Fixing status.

4 files changed, 8 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index bb4b6a4..4091c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus3) UNRELEASED; urgency=low
+
+  * Fixing status.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 24 Aug 2009 23:47:42 -0500
+
 indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus2) karmic; urgency=low
 
   * More status...
diff --git a/src/status-provider.c b/src/status-provider.c
index 83d44ac..1139e54 100644
--- a/src/status-provider.c
+++ b/src/status-provider.c
@@ -99,10 +99,3 @@ status_provider_get_status (StatusProvider * sp)
 	return class->get_status(sp);
 }
 
-void
-status_provider_emit_status_changed (StatusProvider * sp, StatusProviderStatus newstatus)
-{
-	g_return_if_fail(IS_STATUS_PROVIDER(sp));
-	g_signal_emit(sp, signals[STATUS_CHANGED], 0, newstatus, TRUE);
-	return;
-}
diff --git a/src/status-provider.h b/src/status-provider.h
index 9cc9885..522e61b 100644
--- a/src/status-provider.h
+++ b/src/status-provider.h
@@ -72,8 +72,6 @@ GType status_provider_get_type (void);
 void status_provider_set_status (StatusProvider * sp, StatusProviderStatus status);
 StatusProviderStatus status_provider_get_status (StatusProvider * sp);
 
-void status_provider_emit_status_changed (StatusProvider * sp, StatusProviderStatus newstatus);
-
 G_END_DECLS
 
 #endif
diff --git a/src/status-service.c b/src/status-service.c
index 5a60fa6..14d8a34 100644
--- a/src/status-service.c
+++ b/src/status-service.c
@@ -75,12 +75,12 @@ static StatusProviderStatus global_status = STATUS_PROVIDER_STATUS_OFFLINE;
 static void
 status_update (void) {
 	StatusProviderStatus oldglobal = global_status;
-	global_status = STATUS_PROVIDER_STATUS_ONLINE;
+	global_status = STATUS_PROVIDER_STATUS_OFFLINE;
 
 	int i;
 	for (i = 0; i < STATUS_PROVIDER_CNT; i++) {
 		StatusProviderStatus localstatus = status_provider_get_status(status_providers[i]);
-		if (localstatus > global_status) {
+		if (localstatus < global_status) {
 			global_status = localstatus;
 		}
 	}