[gnome-contacts] Make ContactsApp not a Window

[Alexander Larsson <alexl src gnome org>]

commit be9eb4cf76a07808e4caa9858e93cbce389328b1
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Aug 30 10:52:14 2011 +0200

    Make ContactsApp not a Window
    
    this is in preparation for GtkApplication support

 src/contacts-app.vala         |   18 +++++++++++-------
 src/contacts-link-dialog.vala |    2 +-
 src/main.vala                 |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index 487aebb..bb1ec97 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -20,19 +20,20 @@
 using Gtk;
 using Folks;
 
-public class Contacts.App : Window {
+public class Contacts.App : Object {
+  public Window window;
   public static App app;
   private Store contacts_store;
   private ListPane list_pane;
   private ContactPane contacts_pane;
 
-  public override bool delete_event (Gdk.EventAny event) {
+  private bool window_delete_event (Gdk.EventAny event) {
     // Clear the contacts so any changed information is stored
     contacts_pane.show_contact (null);
     return false;
   }
 
-  public override bool map_event (Gdk.EventAny event) {
+  private bool window_map_event (Gdk.EventAny event) {
     list_pane.filter_entry.grab_focus ();
     return true;
   }
@@ -99,12 +100,15 @@ public class Contacts.App : Window {
 
   public App () {
     this.app = this;
-    set_title (_("Contacts"));
-    set_size_request (745, 510);
-    this.destroy.connect (Gtk.main_quit);
+    window = new Window ();
+    window.set_title (_("Contacts"));
+    window.set_size_request (745, 510);
+    window.destroy.connect (Gtk.main_quit);
+    window.delete_event.connect (window_delete_event);
+    window.map_event.connect (window_map_event);
 
     var grid = new Grid();
-    add (grid);
+    window.add (grid);
 
     contacts_store = new Store ();
     list_pane = new ListPane (contacts_store);
diff --git a/src/contacts-link-dialog.vala b/src/contacts-link-dialog.vala
index 5c5957e..b02780d 100644
--- a/src/contacts-link-dialog.vala
+++ b/src/contacts-link-dialog.vala
@@ -66,7 +66,7 @@ public class Contacts.LinkDialog : Dialog {
   public LinkDialog (Contact contact) {
     this.contact = contact;
     set_title (_("Link Contact"));
-    set_transient_for (App.app);
+    set_transient_for (App.app.window);
     set_modal (true);
     add_buttons (Stock.CLOSE,  null);
 
diff --git a/src/main.vala b/src/main.vala
index ee73433..a9697ff 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -61,7 +61,7 @@ main (string[] args) {
 
   // We delay the initial show a tiny bit so most contacts are loaded when we show
   Timeout.add (100, () => {
-      app.show ();
+      app.window.show ();
       return false;
     });