diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-15 09:50:00 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-15 09:50:00 +0000 |
| commit | 0db85f075364cac32bfdd682e9828eff60345895 (patch) | |
| tree | 41f423103d814fbe558a2859b93f7e98f42786d8 /src | |
| parent | Fixing pointwise (diff) | |
| parent | GTK3: Fix compile for GTK3 versions less than 3.16. (diff) | |
| download | inkscape-0db85f075364cac32bfdd682e9828eff60345895.tar.gz inkscape-0db85f075364cac32bfdd682e9828eff60345895.zip | |
update to trunk
(bzr r13645.1.138)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 99e3ccfe6..4ce8ff145 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1068,10 +1068,12 @@ sp_main_gui(int argc, char const **argv) try { provider->load_from_path (inkscape_style); } +#if GTK_CHECK_VERSION(3,16,0) catch (const Gtk::CssProviderError& ex) { std::cerr << "CSSProviderError::load_from_path(): failed to load: " << inkscape_style << "\n (" << ex.what() << ")" << std::endl; } +#endif Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); Glib::ustring user_style = Inkscape::Application::profile_path("ui/style.css"); @@ -1080,8 +1082,10 @@ sp_main_gui(int argc, char const **argv) try { provider2->load_from_path (user_style); } +#if GTK_CHECK_VERSION(3,16,0) catch (const Gtk::CssProviderError& ex) {} +#endif Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); #endif |