[geary] Don't require GTK+ 3.10 (yet)

[Jim Nelson <jnelson src gnome org>]

commit 095140abb233967b29c662554f2582f8ad821333
Author: Jim Nelson <jim yorba org>
Date:   Tue May 20 17:35:50 2014 -0700

    Don't require GTK+ 3.10 (yet)
    
    Prior code for the new inline composer required GTK+ 3.10 to build,
    but the symbol requiring it (Gtk.Window.close) was not vital to
    the inline composer's operation.

 src/client/application/geary-controller.vala |    4 ++--
 src/client/composer/composer-container.vala  |    2 +-
 src/client/composer/composer-embed.vala      |    4 ++--
 src/client/composer/composer-widget.vala     |    8 ++++----
 src/client/composer/composer-window.vala     |    4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 763d548..1b29656 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1785,7 +1785,7 @@ public class GearyController : Geary.BaseObject {
         
         // Safely destroy windows.
         foreach(ComposerWidget cw in composers_to_destroy)
-            ((ComposerContainer) cw.parent).close();
+            ((ComposerContainer) cw.parent).close_container();
         
         // If we cancelled the quit we can bail here.
         if (quit_cancelled) {
@@ -1899,7 +1899,7 @@ public class GearyController : Geary.BaseObject {
                     composers_to_destroy.add(cw);
             }
             foreach(ComposerWidget cw in composers_to_destroy)
-                ((ComposerContainer) cw.parent).close();
+                ((ComposerContainer) cw.parent).close_container();
             return true;
         }
         return false;
diff --git a/src/client/composer/composer-container.vala b/src/client/composer/composer-container.vala
index 5e9cd0b..be42724 100644
--- a/src/client/composer/composer-container.vala
+++ b/src/client/composer/composer-container.vala
@@ -10,5 +10,5 @@ public interface ComposerContainer {
     public abstract void present();
     public abstract unowned Gtk.Widget get_focus();
     public abstract void vanish();
-    public abstract void close();
+    public abstract void close_container();
 }
diff --git a/src/client/composer/composer-embed.vala b/src/client/composer/composer-embed.vala
index 3c635ea..2f143ff 100644
--- a/src/client/composer/composer-embed.vala
+++ b/src/client/composer/composer-embed.vala
@@ -73,7 +73,7 @@ public class ComposerEmbed : Gtk.Bin, ComposerContainer {
         } else {
             composer.set_focus();
         }
-        close();
+        close_container();
     }
     
     public bool set_position(ref Gdk.Rectangle allocation, double hscroll, double vscroll) {
@@ -132,7 +132,7 @@ public class ComposerEmbed : Gtk.Bin, ComposerContainer {
         }
     }
     
-    public void close() {
+    public void close_container() {
         if (visible)
             vanish();
         conversation_viewer.compose_overlay.remove(this);
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 77f8991..d56f834 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -834,7 +834,7 @@ public class ComposerWidget : Gtk.EventBox {
     
     private void on_close() {
         if (should_close() == CloseStatus.DO_CLOSE)
-            container.close();
+            container.close_container();
     }
     
     private void on_detach() {
@@ -933,7 +933,7 @@ public class ComposerWidget : Gtk.EventBox {
         }
         
         yield delete_draft_async();
-        container.close(); // Only close window after draft is deleted; this closes the drafts folder.
+        container.close_container(); // Only close window after draft is deleted; this closes the drafts 
folder.
     }
     
     private void on_drafts_opened(Geary.Folder.OpenState open_state, int count) {
@@ -1018,7 +1018,7 @@ public class ComposerWidget : Gtk.EventBox {
         // Do the save.
         yield save_async(null);
         
-        container.close();
+        container.close_container();
     }
     
     private async void delete_and_exit() {
@@ -1027,7 +1027,7 @@ public class ComposerWidget : Gtk.EventBox {
         // Do the delete.
         yield delete_draft_async();
         
-        container.close();
+        container.close_container();
     }
     
     private async void delete_draft_async() {
diff --git a/src/client/composer/composer-window.vala b/src/client/composer/composer-window.vala
index b65024e..e153b24 100644
--- a/src/client/composer/composer-window.vala
+++ b/src/client/composer/composer-window.vala
@@ -35,9 +35,9 @@ public class ComposerWindow : Gtk.Window, ComposerContainer {
         base.show();
     }
     
-    public new void close() {
+    public void close_container() {
         closing = true;
-        base.close();
+        destroy();
     }
     
     public override bool delete_event(Gdk.EventAny event) {