* Merging new upstream release from Ubuntu.0.3.10-1

* New upstream release.
  * Fixing unwatching crash (LP: #603489)
  * Adding configurable timeout for slow test systems

1 files changed, 0 insertions, 64 deletions

diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c
deleted file mode 100644
index aedc0ed..0000000
--- a/tests/service-version-manager.c
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#include <glib.h>
-#include "libindicator/indicator-service-manager.h"
-#include "service-version-values.h"
-
-static GMainLoop * mainloop = NULL;
-static gboolean con_good = FALSE;
-static gboolean con_bad = FALSE;
-
-gboolean
-timeout (gpointer data)
-{
-	g_debug("Timeout.");
-	g_main_loop_quit(mainloop);
-	return FALSE;
-}
-
-void
-connection_bad (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
-{
-	if (!connected) return;
-	g_debug("Connection From Bad!");
-	con_bad = TRUE;
-	return;
-}
-
-void
-connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
-{
-	if (!connected) return;
-	g_debug("Connection From Good.");
-	con_good = TRUE;
-	return;
-}
-
-int
-main (int argc, char ** argv)
-{
-	g_type_init();
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-	g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS"));
-
-	IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD);
-	g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL);
-
-	IndicatorServiceManager * badis = indicator_service_manager_new_version("org.ayatana.version.bad", SERVICE_VERSION_GOOD);
-	g_signal_connect(G_OBJECT(badis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_bad), NULL);
-
-	g_timeout_add_seconds(1, timeout, NULL);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_object_unref(goodis);
-	g_object_unref(badis);
-
-	g_debug("Quiting");
-	if (con_good && !con_bad) {
-		g_debug("Passed");
-		return 0;
-	}
-	g_debug("Failed");
-	return 1;
-}