* Upstream Merge

  * Change Mono bindings to only parse particular files
  * Test fixes for Hudson builds

5 files changed, 24 insertions, 9 deletions

diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml
index 0d82430..2649eb4 100644
--- a/bindings/mono/app-indicator.sources.xml
+++ b/bindings/mono/app-indicator.sources.xml
@@ -2,10 +2,10 @@
 	<api filename="libappindicator-api.raw">
 		<library name="libappindicator.so.0">
 			<namespace name="AppIndicator">
-				<directory path="../../src">
-					<exclude>app-indicator-enum-types.h.in</exclude>
-					<exclude>app-indicator-enum-types.c.in</exclude>
-				</directory>
+				<file>../../src/app-indicator.c</file>
+				<file>../../src/app-indicator-enum-types.c</file>
+				<file>../../src/app-indicator-enum-types.h</file>
+				<file>../../src/app-indicator.h</file>
 			</namespace>
 		</library>
 	</api>
diff --git a/debian/changelog b/debian/changelog
index 285b966..997a691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-application (0.2.0-0ubuntu4~ppa1~monofix1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Change Mono bindings to only parse particular files
+    * Test fixes for Hudson builds
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Jun 2010 12:43:59 -0500
+
 indicator-application (0.2.0-0ubuntu3) UNRELEASED; urgency=low
 
   * renamed cil binary to libappindicator0.1 to match the assembly 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d3b18d8..8d356bc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -142,7 +142,7 @@ XML_REPORT   = libappindicator-check-results.xml
 HTML_REPORT  = libappindicator-check-results.html
 
 libappindicator-tests: libappindicator-tests-gtester Makefile.am
-	@echo "#!/bin/sh" > $@
+	@echo "#!/bin/bash" > $@
 	@echo . $(srcdir)/run-xvfb.sh >> $@
 	@echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
 	@chmod +x $@
diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c
index 426b6a6..418b779 100644
--- a/tests/test-libappindicator-fallback-item.c
+++ b/tests/test-libappindicator-fallback-item.c
@@ -138,7 +138,7 @@ main (int argc, char ** argv)
 	GtkWidget * menu = gtk_menu_new();
 	app_indicator_set_menu(APP_INDICATOR(item), GTK_MENU(menu));
 
-	g_timeout_add_seconds(1, kill_func, NULL);
+	g_timeout_add_seconds(2, kill_func, NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c
index 70e01d1..5494082 100644
--- a/tests/test-libappindicator-fallback-watcher.c
+++ b/tests/test-libappindicator-fallback-watcher.c
@@ -27,6 +27,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../src/dbus-shared.h"
 
+gboolean kill_func (gpointer userdata);
+
 static GMainLoop * mainloop = NULL;
 
 static DBusHandlerResult
@@ -36,6 +38,10 @@ dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_dat
 		DBusMessage * reply = dbus_message_new_method_return(message);
 		dbus_connection_send(connection, reply, NULL);
 		dbus_message_unref(reply);
+
+		/* Let the messages get out, but we're done at this point */
+		g_timeout_add(50, kill_func, NULL);
+
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
 
@@ -78,7 +84,7 @@ main (int argv, char ** argc)
 		return 1;
 	}
 
-	g_usleep(250000);
+	g_usleep(500000);
 
 	g_debug("Initing");
 
@@ -96,8 +102,9 @@ main (int argv, char ** argc)
 
 	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
 
-	/* After we've got the name, let it unfallback, and then we'll drop again */
-	g_timeout_add(250, kill_func, NULL);
+	/* This is the final kill function.  It really shouldn't happen
+	   unless we get an error. */
+	g_timeout_add(2000, kill_func, NULL);
 
 	g_debug("Entering Mainloop");