nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Closes #7407 Mark/copy button sensitivity fix

Browse source
This commit is contained in:
Eric Gregory 2013-08-29 12:37:31 -07:00
parent ab2326611b
commit 0b391fcead
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/client/geary-controller.vala
View file

@ -76,6 +76,7 @@ public class GearyController : Geary.BaseObject {
private Cancellable cancellable_folder = new Cancellable();
private Cancellable cancellable_search = new Cancellable();
private Cancellable cancellable_open_account = new Cancellable();
private Cancellable cancellable_context_dependent_buttons = new Cancellable();
private Gee.HashMap<Geary.Account, Cancellable> inbox_cancellables
= new Gee.HashMap<Geary.Account, Cancellable>();
private Gee.Set<Geary.App.Conversation> selected_conversations = new Gee.HashSet<Geary.App.Conversation>();
@ -997,6 +998,13 @@ public class GearyController : Geary.BaseObject {
old_cancellable.cancel();
}
private void cancel_context_dependent_buttons() {
Cancellable old_cancellable = cancellable_context_dependent_buttons;
cancellable_context_dependent_buttons = new Cancellable();
old_cancellable.cancel();
}
// We need to include the second parameter, or valac doesn't recognize the function as matching
// YorbaApplication.exiting's signature.
private bool on_application_exiting(YorbaApplication sender, bool panicked) {
@ -1632,7 +1640,8 @@ public class GearyController : Geary.BaseObject {
GearyApplication.instance.actions.get_action(ACTION_DELETE_MESSAGE).sensitive =
(current_folder is Geary.FolderSupport.Remove) || (current_folder is Geary.FolderSupport.Archive);
enable_context_dependent_buttons_async.begin(true, null);
cancel_context_dependent_buttons();
enable_context_dependent_buttons_async.begin(true, cancellable_context_dependent_buttons);
}
// Enables or disables the message buttons on the toolbar.
@ -1652,7 +1661,8 @@ public class GearyController : Geary.BaseObject {
GearyApplication.instance.actions.get_action(ACTION_DELETE_MESSAGE).sensitive = sensitive
&& ((current_folder is Geary.FolderSupport.Remove) || (current_folder is Geary.FolderSupport.Archive));
enable_context_dependent_buttons_async.begin(sensitive, null);
cancel_context_dependent_buttons();
enable_context_dependent_buttons_async.begin(sensitive, cancellable_context_dependent_buttons);
}
private async void enable_context_dependent_buttons_async(bool sensitive, Cancellable? cancellable) {
@ -1667,6 +1677,10 @@ public class GearyController : Geary.BaseObject {
e.message);
}
// Exit here if the user has cancelled.
if (cancellable != null && cancellable.is_cancelled())
return;
Gee.HashSet<Type> supported_operations = new Gee.HashSet<Type>();
if (selected_operations != null)
supported_operations.add_all(selected_operations.get_values());