[geary/wip/765516-gtk-widget-conversation-viewer: 136/207] Minor code cleanup.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/765516-gtk-widget-conversation-viewer: 136/207] Minor code cleanup.
- Date: Tue, 4 Oct 2016 00:07:51 +0000 (UTC)
commit 49d3b8244051f67276dc33d71e24e3165e284d16
Author: Michael James Gratton <mike vee net>
Date: Fri Aug 12 00:10:52 2016 +1000
Minor code cleanup.
.../conversation-list/conversation-list-view.vala | 6 +-----
.../conversation-viewer/conversation-message.vala | 2 +-
.../conversation-viewer/conversation-viewer.vala | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/client/conversation-list/conversation-list-view.vala
b/src/client/conversation-list/conversation-list-view.vala
index 0ea62ef..587b07f 100644
--- a/src/client/conversation-list/conversation-list-view.vala
+++ b/src/client/conversation-list/conversation-list-view.vala
@@ -332,14 +332,10 @@ public class ConversationListView : Gtk.TreeView {
// not result in a lot of screen flashing and (again)
// unnecessary I/O as both classes update selection state.
this.selection_changed_id = Idle.add(() => {
- // no longer scheduled
+ // De-schedule the callback
this.selection_changed_id = 0;
- // Pass the is_clearing flag through here so the value is
- // accurate later on, when the idle callback actually
- // happens.
do_selection_changed();
-
return false;
}, Priority.LOW);
}
diff --git a/src/client/conversation-viewer/conversation-message.vala
b/src/client/conversation-viewer/conversation-message.vala
index 344aa62..6dfefd8 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -455,7 +455,7 @@ public class ConversationMessage : Gtk.Box {
});
// Only load it after we've hooked up the signals above
- this.web_view.load_string(body_text, "text/html", "UTF8", "");
+ this.web_view.load_string(body_text, "text/html", "UTF-8", "");
}
/**
diff --git a/src/client/conversation-viewer/conversation-viewer.vala
b/src/client/conversation-viewer/conversation-viewer.vala
index 91c5430..6f4a84f 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -213,7 +213,7 @@ public class ConversationViewer : Gtk.Stack {
if (conversations.size == 0) {
set_visible_child(this.no_conversations_page);
GearyApplication.instance.controller.enable_message_buttons(false);
- } else if (conversations.size >1) {
+ } else if (conversations.size > 1) {
set_visible_child(this.multiple_conversations_page);
GearyApplication.instance.controller.enable_multiple_message_buttons();
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]