Test suite fixes for the GTK Menu changes.

1 files changed, 9 insertions, 17 deletions

diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c
index b316456..cc072aa 100644
--- a/tests/test-libappindicator-dbus-server.c
+++ b/tests/test-libappindicator-dbus-server.c
@@ -7,16 +7,16 @@ Copyright 2009 Canonical Ltd.
 Authors:
     Ted Gould <ted@canonical.com>
 
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
 by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along 
+You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -24,7 +24,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
-#include <libdbusmenu-glib/server.h>
 #include <libappindicator/app-indicator.h>
 #include "test-defines.h"
 
@@ -44,16 +43,9 @@ main (gint argc, gchar * argv[])
 
 	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
 
-	DbusmenuServer * dms = dbusmenu_server_new(TEST_OBJECT);
-
-	AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, 
-	                                               "id", TEST_ID,
-	                                               "category-enum", TEST_CATEGORY,
-	                                               "status-enum", TEST_STATE,
-	                                               "icon-name", TEST_ICON_NAME,
-	                                               "attention-icon-name", TEST_ATTENTION_ICON_NAME,
-	                                               "menu-object", dms,
-	                                               NULL));
+	AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY);
+        app_indicator_set_status (ci, TEST_STATE);
+        app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME);
 
 	g_timeout_add_seconds(2, kill_func, NULL);