[gnome-contacts] Cleanup: set App.window private

[Niels De Graef <nielsdg src gnome org>]

commit 8ae0df3164ac7138aafdbab4a4a7bdbfb2703d12
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Aug 26 16:08:06 2017 +0200

    Cleanup: set App.window private

 src/contacts-app.vala                    |    2 +-
 src/contacts-avatar-dialog.vala          |    4 ++--
 src/contacts-contact-editor.vala         |    2 +-
 src/contacts-contact-pane.vala           |    4 ++--
 src/contacts-linked-accounts-dialog.vala |   10 ++++++----
 5 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index 5a7d1a2..61c2f91 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -26,7 +26,7 @@ public class Contacts.App : Gtk.Application {
   /* moving creation to Window */
   public Store contacts_store;
 
-  public Contacts.Window window;
+  private Window window;
 
   private bool is_prepare_scheluded = false;
   private bool is_quiescent_scheduled = false;
diff --git a/src/contacts-avatar-dialog.vala b/src/contacts-avatar-dialog.vala
index 9233218..ee178ca 100644
--- a/src/contacts-avatar-dialog.vala
+++ b/src/contacts-avatar-dialog.vala
@@ -72,9 +72,9 @@ public class Contacts.AvatarDialog : Dialog {
    */
   public signal void set_avatar (GLib.Icon avatar_icon);
 
-  public AvatarDialog (Contact? contact) {
+  public AvatarDialog (Window main_window, Contact? contact) {
     Object (
-      transient_for: App.app.window,
+      transient_for: main_window,
       use_header_bar: 1
     );
 
diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
index 70837f1..1b6cbc5 100644
--- a/src/contacts-contact-editor.vala
+++ b/src/contacts-contact-editor.vala
@@ -980,7 +980,7 @@ public class Contacts.ContactEditor : Grid {
 
   // Show the avatar dialog when the avatar is clicked
   private void on_avatar_frame_clicked () {
-    var dialog = new AvatarDialog (this.contact);
+    var dialog = new AvatarDialog ((Window) get_toplevel (), this.contact);
     dialog.set_avatar.connect ( (icon) =>  {
         this.avatar_frame.set_data ("value", icon);
         this.avatar_frame.set_data ("changed", true);
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index 3d37650..11c2068 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -275,8 +275,8 @@ public class Contacts.ContactPane : Stack {
     }
   }
 
-  void linked_accounts () {
-    var dialog = new LinkedAccountsDialog (contact);
+  private void linked_accounts () {
+    var dialog = new LinkedAccountsDialog ((Window) get_toplevel (), contact);
     var result = dialog.run ();
     if (result == ResponseType.CLOSE &&
        dialog.any_unlinked) {
diff --git a/src/contacts-linked-accounts-dialog.vala b/src/contacts-linked-accounts-dialog.vala
index b893833..0c902f0 100644
--- a/src/contacts-linked-accounts-dialog.vala
+++ b/src/contacts-linked-accounts-dialog.vala
@@ -25,8 +25,12 @@ public class Contacts.LinkedAccountsDialog : Dialog {
 
   public bool any_unlinked;
 
-  public LinkedAccountsDialog (Contact contact) {
-    Object (use_header_bar: 1);
+  public LinkedAccountsDialog (Window main_win, Contact contact) {
+    Object (
+      use_header_bar: 1,
+      transient_for: main_win,
+      modal: true
+    );
 
     this.contact = contact;
     any_unlinked = false;
@@ -35,8 +39,6 @@ public class Contacts.LinkedAccountsDialog : Dialog {
     headerbar.set_title (_("%s").printf (contact.display_name));
     headerbar.set_subtitle (_("Linked Accounts"));
 
-    set_transient_for (App.app.window);
-    set_modal (true);
     set_default_size (600, 400);
 
     var grid = new Grid ();