From bff2070f6872338fd5a74fe81e76ac114e99696a Mon Sep 17 00:00:00 2001 From: Yosef Or Boczko Date: Tue, 9 Jul 2013 12:15:23 -0700 Subject: [PATCH] Avoid conflict with Gtk.Window.close: Closes #7196 This doesn't affect Vala 0.20.1, but this will be a problem with GTK 3.9.7 and the patch does not introduce any backward compatability problems. --- THANKS | 1 + src/console/main.vala | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/THANKS b/THANKS index 9ce4c57a..8751bb44 100644 --- a/THANKS +++ b/THANKS @@ -2,6 +2,7 @@ The Geary team would like to thank the following contributors: Robert Ancell Jürg Billeter +Yosef Or Boczko Martijn Braam Attila Bukor Andrea Corbellini diff --git a/src/console/main.vala b/src/console/main.vala index f0c4376a..f245eb46 100644 --- a/src/console/main.vala +++ b/src/console/main.vala @@ -179,7 +179,7 @@ class ImapConsole : Gtk.Window { break; case "close": - close(cmd, args); + close_cmd(cmd, args); break; case "fetch-fields": @@ -520,7 +520,7 @@ class ImapConsole : Gtk.Window { } } - private void close(string cmd, string[] args) throws Error { + private void close_cmd(string cmd, string[] args) throws Error { check_connected(cmd, args, 0, null); status("Closing");