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

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

Browse source 
* 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.
This commit is contained in:
Michael James Gratton 2016-12-06 16:22:39 +11:00
parent d4acac034d
commit 3ef1ac973e
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/client/conversation-viewer/conversation-viewer.vala
View file

@ -326,19 +326,21 @@ public class ConversationViewer : Gtk.Stack {
} }
} }
[GtkCallback] // XXX We can't use this signal with GTK 3.14.
private void on_find_next(Gtk.Widget entry) { // [GtkCallback]
if (this.current_list != null) { // private void on_find_next(Gtk.Widget entry) {
//this.current_list.show_prev_search_term(); // if (this.current_list != null) {
} // //this.current_list.show_prev_search_term();
} // }
// }
[GtkCallback] // XXX We can't use this signal with GTK 3.14.
private void on_find_prev(Gtk.Widget entry) { // [GtkCallback]
if (this.current_list != null) { // private void on_find_prev(Gtk.Widget entry) {
//this.current_list.show_next_search_term(); // if (this.current_list != null) {
} // //this.current_list.show_next_search_term();
} // }
// }
} }

2
ui/conversation-viewer.ui
View file

@ -58,8 +58,6 @@
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="primary_icon_sensitive">False</property> <property name="primary_icon_sensitive">False</property>
<property name="placeholder_text" translatable="yes">Find in conversation</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"/> <signal name="search-changed" handler="on_find_text_changed" swapped="no"/>
</object> </object>
<packing> <packing>

2
ui/empty-placeholder.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.14"/>
<template class="EmptyPlaceholder" parent="GtkGrid"> <template class="EmptyPlaceholder" parent="GtkGrid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>

2
ui/geary.css
View file

@ -130,7 +130,7 @@ row.geary-folder-popover-list-row > label {
background: @theme_base_color; background: @theme_base_color;
} }
.geary-header-value flowboxchild label:not(.geary-primary) { .geary-header-value flowboxchild label.dim-label {
margin-left: 6px; margin-left: 6px;
} }