diff --git a/meson.build b/meson.build index 75a31e65bcae20f54aacb8aacdf318b9adc1945f..75086ffc38486450a4c117019d631724711aab66 100644 --- a/meson.build +++ b/meson.build @@ -6,9 +6,9 @@ project('rugby', 'c', ]) add_global_arguments(['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38', - '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10', + '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_16', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38', - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10'], + '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_16'], language: 'c') subdir('src') diff --git a/src/meson.build b/src/meson.build index a459bbd41db13d194ca2058cea353f2629da3ce8..508d26deead11e42700136e406e8bc1601a6acf8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,7 +2,7 @@ gnome = import('gnome') res = gnome.compile_resources('gen-resources', '../data/rugby.gresource.xml', source_dir: '../data') -gtk = dependency('gtk+-3.0', version : '>= 3.10') +gtk = dependency('gtk+-3.0', version : '>= 3.16') src = ['rugby.c', 'rugby-application.c', diff --git a/src/rugby-application.c b/src/rugby-application.c index 8776aa7738d626043d3b3b2b6d507da1a46257e4..faa6be7ac759b937328b7cd0c6fcefb5df5f5344 100644 --- a/src/rugby-application.c +++ b/src/rugby-application.c @@ -171,31 +171,6 @@ rugby_application_startup (GApplication *application) g_object_unref (builder); } -/* From Web neé Epiphany */ -static gboolean -_gtk_css_provider_load_from_resource (GtkCssProvider *provider, - const char *resource_path, - GError **error) -{ - GBytes *data; - gboolean res; - - g_return_val_if_fail (GTK_IS_CSS_PROVIDER (provider), FALSE); - g_return_val_if_fail (resource_path != NULL, FALSE); - - data = g_resources_lookup_data (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, error); - if (data == NULL) - return FALSE; - - res = gtk_css_provider_load_from_data (provider, - g_bytes_get_data (data, NULL), - g_bytes_get_size (data), - error); - g_bytes_unref (data); - - return res; -} - static void rugby_application_activate (GApplication *self) { @@ -260,9 +235,7 @@ rugby_application_activate (GApplication *self) /* init CSS */ provider = gtk_css_provider_new (); - - if (!_gtk_css_provider_load_from_resource (provider, "/uk/me/bcowan/rugby/rugby.css", &err)) - g_error ("Error loading CSS: %s", err->message); + gtk_css_provider_load_from_resource (provider, "/uk/me/bcowan/rugby/rugby.css"); gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (provider),