Merge lp:~mitya57/libappindicator/test-simple-app into lp:libappindicator/15.10

[Dmitry Shachnev]

The previous version of the simple test application was crashing with SIGSEGV in g_object_new call. This one seems to actually work.

[Alberts Muktupāvels (muktupavels)]

I probably would use gtk_menu_shell_append not gtk_menu_attach, but that should not be problem.

Code looks good, but I did not test it.

review: Approve

[lp:~mitya57/libappindicator/test-simple-app]

274. By Dmitry Shachnev on 2015-06-28

Make test-simple-app really working

[Dmitry Shachnev (mitya57)]

gtk_menu_shell_append is of course better, updated

[Ted Gould (ted)]

review: Approve

Unmerged revisions

274. By Dmitry Shachnev on 2015-06-28

Make test-simple-app really working

=== modified file 'tests/test-simple-app.c'
--- tests/test-simple-app.c	2013-01-16 19:53:52 +0000
+++ tests/test-simple-app.c	2015-06-28 19:27:57 +0000
@@ -20,10 +20,7 @@
 */
 
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
-#include <libdbusmenu-glib/server.h>
 #include <app-indicator.h>
 
 static GMainLoop * mainloop = NULL;
@@ -31,21 +28,24 @@
 int
 main (int argc, char ** argv)
 {
-	DbusmenuServer * dms = dbusmenu_server_new("/menu");
-	DbusmenuMenuitem * dmi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(dmi, "label", "Bob");
+	gtk_init(&argc, &argv);
+	GtkWidget *menu_item = gtk_menu_item_new_with_label("Test");
+	GtkMenu *menu = GTK_MENU(gtk_menu_new());
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+	gtk_widget_show(menu_item);
 
-	AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, 
-	                                               "id", "test-application",
-	                                               "status-enum", APP_INDICATOR_STATUS_ACTIVE,
-	                                               "icon-name", "system-shutdown",
-	                                               "menu-object", dms,
-	                                               NULL));
+	AppIndicator * ci = app_indicator_new("test-application",
+	                                      "system-shutdown",
+	                                      APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+	app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
+	app_indicator_set_menu(ci, menu);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 
 	g_object_unref(G_OBJECT(ci));
+	g_object_unref(G_OBJECT(menu));
+	g_object_unref(G_OBJECT(menu_item));
 	g_debug("Quiting");
 
 	return 0;