Skip to content
Snippets Groups Projects
Commit 8b7bda90 authored by Bruce Cowan's avatar Bruce Cowan :airplane:
Browse files

Get rid of custom CSS loading code

parent d672b078
No related branches found
No related tags found
No related merge requests found
...@@ -6,9 +6,9 @@ project('rugby', 'c', ...@@ -6,9 +6,9 @@ project('rugby', 'c',
]) ])
add_global_arguments(['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38', 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', '-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') language: 'c')
subdir('src') subdir('src')
......
...@@ -2,7 +2,7 @@ gnome = import('gnome') ...@@ -2,7 +2,7 @@ gnome = import('gnome')
res = gnome.compile_resources('gen-resources', '../data/rugby.gresource.xml', source_dir: '../data') 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', src = ['rugby.c',
'rugby-application.c', 'rugby-application.c',
......
...@@ -171,31 +171,6 @@ rugby_application_startup (GApplication *application) ...@@ -171,31 +171,6 @@ rugby_application_startup (GApplication *application)
g_object_unref (builder); 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 static void
rugby_application_activate (GApplication *self) rugby_application_activate (GApplication *self)
{ {
...@@ -260,9 +235,7 @@ rugby_application_activate (GApplication *self) ...@@ -260,9 +235,7 @@ rugby_application_activate (GApplication *self)
/* init CSS */ /* init CSS */
provider = gtk_css_provider_new (); provider = gtk_css_provider_new ();
gtk_css_provider_load_from_resource (provider, "/uk/me/bcowan/rugby/rugby.css");
if (!_gtk_css_provider_load_from_resource (provider, "/uk/me/bcowan/rugby/rugby.css", &err))
g_error ("Error loading CSS: %s", err->message);
gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER (provider),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment