[dconf-editor] Correctly quit with app-menu action.



commit c586509ef7a6e311ba7f16b8e47780b8801c0a8d
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Mon Apr 25 00:40:26 2016 +0200

    Correctly quit with app-menu action.

 editor/dconf-editor.vala |    2 ++
 editor/dconf-window.vala |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index 856f83d..5060b04 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -156,5 +156,7 @@ class ConfigurationEditor : Gtk.Application
     private void quit_cb ()
     {
         get_active_window ().destroy ();
+
+        base.quit ();
     }
 }
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index a1d9dcd..70cc525 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -120,13 +120,15 @@ class DConfWindow : ApplicationWindow
     [GtkCallback]
     private void on_destroy ()
     {
-        ((Window) this).get_application ().withdraw_notification ("copy");
+        get_application ().withdraw_notification ("copy");
 
         settings.set_string ("saved-view", current_path);
         settings.set_int ("window-width", window_width);
         settings.set_int ("window-height", window_height);
         settings.set_boolean ("window-is-maximized", window_is_maximized);
         settings.set_boolean ("window-is-fullscreen", window_is_fullscreen);
+
+        base.destroy ();
     }
 
     /*\
@@ -250,7 +252,7 @@ class DConfWindow : ApplicationWindow
     {
         for (uint position = 0;; position++)
         {
-            Object? object = key_model.get_object (position);
+            Object? object = objects.get_object (position);
             if (object == null)
                 return;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]