From 464813ecbb1295856d74401ea51110ebb15b0900 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri, 6 Apr 2012 20:38:27 +0200
Subject: [PATCH] Assorted test-gapplication fixes

Move this test toghether with the others, and set the appmenu
only after the application is registered (i.e. in startup)

https://bugzilla.gnome.org/show_bug.cgi?id=678978
---
 .../interactive/gapplication.js                              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename src/test-gapplication.js => tests/interactive/gapplication.js (98%)

diff --git a/src/test-gapplication.js b/tests/interactive/gapplication.js
similarity index 98%
rename from src/test-gapplication.js
rename to tests/interactive/gapplication.js
index 8449c6ae8..fd6b72c98 100755
--- a/src/test-gapplication.js
+++ b/tests/interactive/gapplication.js
@@ -24,6 +24,7 @@ function do_action_state_change(action) {
 
 function main() {
     Gtk.init(null, null);
+    Gdk.set_program_class('test-gjsgapp');
 
     let app = new Gtk.Application({ application_id: 'org.gnome.Shell.GtkApplicationTest' });
     app.connect('activate', function() {
@@ -87,11 +88,11 @@ function main() {
     item.set_action_and_target_value('app.parameter-int', GLib.Variant.new('u', 43));
     menu.append_item(item);
 
-    app.set_app_menu(menu);
-
     let window = null;
 
     app.connect_after('startup', function(app) {
+	app.set_app_menu(menu);
+
 	window = new Gtk.ApplicationWindow({ title: "Test Application", application: app });
     });
     app.connect('activate', function(app) {