[geary/geary-0.12] Revert "Workaround Ubuntu Ambiance and Radiance theme bugs in GTK+ 3.14-3.18."
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/geary-0.12] Revert "Workaround Ubuntu Ambiance and Radiance theme bugs in GTK+ 3.14-3.18."
- Date: Mon, 12 Feb 2018 22:46:26 +0000 (UTC)
commit ebab6ea5ad324a1c62516c321449fa6985b5a420
Author: Michael James Gratton <mike vee net>
Date: Tue Feb 13 09:44:48 2018 +1100
Revert "Workaround Ubuntu Ambiance and Radiance theme bugs in GTK+ 3.14-3.18."
This reverts commit 143ee81b98873ee5674d98f903f536230b030553.
This actually breaks Geary's CSS on Ubuntu 16.04, and it's unclear if it's
actually needed or not.
src/client/components/main-window.vala | 14 --------------
ui/CMakeLists.txt | 1 -
ui/ambiance.css | 7 -------
3 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index cb917d1..165e6c4 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -165,20 +165,6 @@ public class MainWindow : Gtk.ApplicationWindow {
} catch (Error e) {
error("Could not load CSS: %s", e.message);
}
-
- switch (Gtk.Settings.get_default().gtk_theme_name) {
- case "Ambiance":
- case "Radiance":
- // Add workarounds for Ubuntu Ambiance and Radiance theme
- // bugs in GTK+ 3.14-3.18.
- try {
- File file = File.new_for_uri(@"resource:///org/gnome/Geary/ambiance.css");
- provider.load_from_file(file);
- } catch (Error e) {
- error("Could not load CSS: %s", e.message);
- }
- break;
- }
}
private void setup_layout(Configuration config) {
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 3e313ee..dc41091 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -4,7 +4,6 @@ set(RESOURCE_LIST
STRIPBLANKS "account_cannot_remove.glade"
STRIPBLANKS "account_list.glade"
STRIPBLANKS "account_spinner.glade"
- "ambiance.css"
STRIPBLANKS "certificate_warning_dialog.glade"
"client-web-view.js"
"client-web-view-allow-remote-images.js"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]