[gnome-contacts] App singleton cleanup: Remove show_message()

[Niels De Graef <nielsdg src gnome org>]

commit 0111a9cccb226234be307d2f6a03572f8692cd85
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sun Aug 27 22:39:04 2017 +0200

    App singleton cleanup: Remove show_message()

 src/contacts-app.vala          |    6 ------
 src/contacts-contact-pane.vala |   21 +++++++++++++++------
 src/contacts-window.vala       |    2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index 5cad7d3..7101708 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -282,12 +282,6 @@ public class Contacts.App : Gtk.Application {
       window.present ();
   }
 
-  public void show_message (string message) {
-    var notification = new InAppNotification (message);
-    notification.show ();
-    window.add_notification (notification);
-  }
-
   public void new_contact () {
     window.new_contact ();
   }
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index f49c3f2..686897b 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -29,6 +29,8 @@ const int PROFILE_SIZE = 96;
 [GtkTemplate (ui = "/org/gnome/contacts/ui/contacts-contact-pane.ui")]
 public class Contacts.ContactPane : Stack {
 
+  private Window parent_window;
+
   private Store store;
 
   public Contact? contact;
@@ -196,7 +198,8 @@ public class Contacts.ContactPane : Stack {
       set_visible_child (this.none_selected_page);
   }
 
-  public ContactPane (Store contacts_store) {
+  public ContactPane (Window parent_window, Store contacts_store) {
+    this.parent_window = parent_window;
     this.store = contacts_store;
        this.store.quiescent.connect (update_sheet);
 
@@ -267,7 +270,7 @@ public class Contacts.ContactPane : Stack {
   }
 
   private void linked_accounts () {
-    var dialog = new LinkedAccountsDialog ((Window) get_toplevel (), contact);
+    var dialog = new LinkedAccountsDialog (this.parent_window, contact);
     var result = dialog.run ();
     if (result == ResponseType.CLOSE &&
        dialog.any_unlinked) {
@@ -318,7 +321,7 @@ public class Contacts.ContactPane : Stack {
                                                try {
                                                  Contact.set_persona_property.end (result);
                                                } catch (Error e2) {
-                                                 App.app.show_message (e2.message);
+                                                 show_message (e2.message);
                                                  update_sheet ();
                                                }
                                              });
@@ -332,7 +335,7 @@ public class Contacts.ContactPane : Stack {
                                                   try {
                                                     Contact.set_individual_property.end (result);
                                                   } catch (Error e) {
-                                                    App.app.show_message (e.message);
+                                                    show_message (e.message);
                                                     /* FIXME: add this back */
                                                     /* l.set_markup (Markup.printf_escaped ("<span 
font='16'>%s</span>", contact.display_name)); */
                                                   }
@@ -346,7 +349,7 @@ public class Contacts.ContactPane : Stack {
                                                   try {
                                                     Contact.set_individual_property.end (result);
                                                   } catch (GLib.Error e) {
-                                                    App.app.show_message (e.message);
+                                                    show_message (e.message);
                                                   }
                                                 });
        }
@@ -426,7 +429,7 @@ public class Contacts.ContactPane : Stack {
 
   private void show_message_dialog (string message) {
     var dialog =
-        new MessageDialog (this.get_toplevel () as Window,
+        new MessageDialog (this.parent_window,
                            DialogFlags.DESTROY_WITH_PARENT | DialogFlags.MODAL,
                            MessageType.ERROR,
                            ButtonsType.OK,
@@ -434,4 +437,10 @@ public class Contacts.ContactPane : Stack {
     dialog.run ();
     dialog.destroy ();
   }
+
+  private void show_message (string message) {
+    var notification = new InAppNotification (message);
+    notification.show ();
+    this.parent_window.add_notification (notification);
+  }
 }
diff --git a/src/contacts-window.vala b/src/contacts-window.vala
index c295b83..25c8364 100644
--- a/src/contacts-window.vala
+++ b/src/contacts-window.vala
@@ -187,7 +187,7 @@ public class Contacts.Window : Gtk.ApplicationWindow {
   }
 
   private void create_contact_pane () {
-    this.contact_pane = new ContactPane (this.store);
+    this.contact_pane = new ContactPane (this, this.store);
     this.contact_pane.visible = true;
     this.contact_pane.hexpand = true;
     this.contact_pane.will_delete.connect (contact_pane_delete_contact_cb);