Commit 3ef1ac97 authored by Michael Gratton's avatar Michael Gratton 🤞

Fix runtime errors when built/running against GTK +3.14.

* ui/conversation-viewer.ui,
  src/client/conversation-viewer/conversation-viewer.vala: next-match and
  previous-match signals are only available in GTK+ >= 3.16.

* ui/empty-placeholder.ui: Drop declared GTK+ requirement to 3.14.

* ui/geary.css: The :not() pseudeo class is only available in GTK+ >= 3.20.
parent d4acac03
......@@ -326,19 +326,21 @@ public class ConversationViewer : Gtk.Stack {
}
}
[GtkCallback]
private void on_find_next(Gtk.Widget entry) {
if (this.current_list != null) {
//this.current_list.show_prev_search_term();
}
}
[GtkCallback]
private void on_find_prev(Gtk.Widget entry) {
if (this.current_list != null) {
//this.current_list.show_next_search_term();
}
}
// XXX We can't use this signal with GTK 3.14.
// [GtkCallback]
// private void on_find_next(Gtk.Widget entry) {
// if (this.current_list != null) {
// //this.current_list.show_prev_search_term();
// }
// }
// XXX We can't use this signal with GTK 3.14.
// [GtkCallback]
// private void on_find_prev(Gtk.Widget entry) {
// if (this.current_list != null) {
// //this.current_list.show_next_search_term();
// }
// }
}
......@@ -58,8 +58,6 @@
<property name="primary_icon_activatable">False</property>
<property name="primary_icon_sensitive">False</property>
<property name="placeholder_text" translatable="yes">Find in conversation</property>
<signal name="next-match" handler="on_find_next" swapped="no"/>
<signal name="previous-match" handler="on_find_prev" swapped="no"/>
<signal name="search-changed" handler="on_find_text_changed" swapped="no"/>
</object>
<packing>
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="gtk+" version="3.14"/>
<template class="EmptyPlaceholder" parent="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
......
......@@ -130,7 +130,7 @@ row.geary-folder-popover-list-row > label {
background: @theme_base_color;
}
.geary-header-value flowboxchild label:not(.geary-primary) {
.geary-header-value flowboxchild label.dim-label {
margin-left: 6px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment