Fix fault with uninitialised string

[moonshot-ui.git] / src / moonshot-identity-management-view.vala

diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala
index 6090fb8..631e6ff 100644 (file)
--- a/src/moonshot-identity-management-view.vala
+++ b/src/moonshot-identity-management-view.vala
@@ -676,8 +676,9 @@ class IdentityManagerView : Window {
                                       Gtk.DialogFlags.DESTROY_WITH_PARENT,
                                       Gtk.MessageType.QUESTION,
                                       Gtk.ButtonsType.YES_NO,
-                                      _("Are you sure you want to stop '%s' ID Card to use %s?"),
-                                      custom_vbox.current_idcard.id_card.display_name);
+                                      _("Are you sure you want to stop '%s' ID Card from using %s?"),
+                                      custom_vbox.current_idcard.id_card.display_name,
+                                      _("this service"));
               var ret = dialog.run();
               dialog.hide();
               
@@ -931,18 +932,26 @@ SUCH DAMAGE.
 
         var main_vbox = new VBox (false, 0);
         main_vbox.set_border_width (12);
-        var menubar = this.ui_manager.get_widget ("/MenuBar");
-        main_vbox.pack_start (menubar, false, false, 0);
-        main_vbox.pack_start (hbox, true, true, 0);
+ 
 #if OS_MACOS
-               var menushell = this.ui_manager.get_widget("/Menu") as Gtk.MenuShell;
+        // hide the  File | Quit menu item which is now on the Mac Menu
+        Gtk.Widget quit_item =  this.ui_manager.get_widget("/MenuBar/FileMenu/Quit");
+        quit_item.hide();
+        
+               Gtk.MenuShell menushell = this.ui_manager.get_widget("/MenuBar") as Gtk.MenuShell;
                osxApp.set_menu_bar(menushell);
+               osxApp.set_use_quartz_accelerators(true);
+               osxApp.sync_menu_bar();
+               osxApp.ready(); 
+#else
+        var menubar = this.ui_manager.get_widget ("/MenuBar");
+        main_vbox.pack_start (menubar, false, false, 0);
 #endif
+        main_vbox.pack_start (hbox, true, true, 0);
         add (main_vbox);
-
         main_vbox.show_all();
         this.vbox_right.hide ();
-    }
+  } 
 
     private void set_atk_name_description (Widget widget, string name, string description)
     {