Fix tests and deprecations (fixes #1)

1 files changed, 39 insertions, 39 deletions

diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c
index 48f4997..36d1bdd 100644
--- a/tests/service-manager-nostart-connect.c
+++ b/tests/service-manager-nostart-connect.c
@@ -1,5 +1,5 @@
 /*
-Test for libindicator
+Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
 
@@ -22,7 +22,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libindicator/indicator-service-manager.h"
+#include "libayatana-indicator/indicator-service-manager.h"
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
@@ -30,57 +30,57 @@ static gboolean passed = FALSE;
 gboolean
 timeout (gpointer data)
 {
-	passed = FALSE;
-	g_error("Timeout with no connection.");
-	g_main_loop_quit(mainloop);
-	return FALSE;
+    passed = FALSE;
+    g_error("Timeout with no connection.");
+    g_main_loop_quit(mainloop);
+    return FALSE;
 }
 
 void
 connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
 {
-	static gboolean has_connected = FALSE;
-
-	if (has_connected && connected) {
-		g_warning("We got two connected signals.  FAIL.");
-		passed = FALSE;
-		return;
-	}
-
-	if (!connected) {
-		g_debug("Not connected");
-		return;
-	}
-
-	has_connected = TRUE;
-	g_debug("Connection");
-	passed = TRUE;
-	g_main_loop_quit(mainloop);
-	return;
+    static gboolean has_connected = FALSE;
+
+    if (has_connected && connected) {
+        g_warning("We got two connected signals.  FAIL.");
+        passed = FALSE;
+        return;
+    }
+
+    if (!connected) {
+        g_debug("Not connected");
+        return;
+    }
+
+    has_connected = TRUE;
+    g_debug("Connection");
+    passed = TRUE;
+    g_main_loop_quit(mainloop);
+    return;
 }
 
 int
 main (int argc, char ** argv)
 {
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+    g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 
-	g_usleep(150000);
+    g_usleep(150000);
 
-	IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test");
-	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection), NULL);
+    IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test");
+    g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection), NULL);
 
-	g_timeout_add_seconds(1, timeout, NULL);
+    g_timeout_add_seconds(1, timeout, NULL);
 
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
+    mainloop = g_main_loop_new(NULL, FALSE);
+    g_main_loop_run(mainloop);
 
-	g_object_unref(is);
+    g_object_unref(is);
 
-	g_debug("Quiting");
-	if (passed) {
-		g_debug("Passed");
-		return 0;
-	}
-	g_debug("Failed");
-	return 1;
+    g_debug("Quiting");
+    if (passed) {
+        g_debug("Passed");
+        return 0;
+    }
+    g_debug("Failed");
+    return 1;
 }