AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

GtkCssProvider: use mapped file to read CSS files.

Browse Source
This commit is contained in:
Carlos Garnacho 2010-09-24 22:10:20 +02:00
parent 80cf01c271
commit 20051e02eb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkcssprovider.c
View File

@ -2167,7 +2167,8 @@ gtk_css_provider_load_from_path (GtkCssProvider *css_provider,
{ {
GtkCssProviderPrivate *priv; GtkCssProviderPrivate *priv;
GError *internal_error = NULL; GError *internal_error = NULL;
gchar *data; GMappedFile *mapped_file;
const gchar *data;
gsize length; gsize length;
g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE); g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
@ -2175,13 +2176,21 @@ gtk_css_provider_load_from_path (GtkCssProvider *css_provider,
priv = css_provider->priv; priv = css_provider->priv;
if (g_file_get_contents (path, &data, &length, mapped_file = g_mapped_file_new (path, FALSE, &internal_error);
&internal_error))
if (internal_error)
{ {
g_propagate_error (error, internal_error); g_propagate_error (error, internal_error);
return FALSE; return FALSE;
} }
length = g_mapped_file_get_length (mapped_file);
data = g_mapped_file_get_contents (mapped_file);
/* FIXME: Set error */
if (!data)
return FALSE;
if (priv->selectors_info->len > 0) if (priv->selectors_info->len > 0)
g_ptr_array_remove_range (priv->selectors_info, 0, priv->selectors_info->len); g_ptr_array_remove_range (priv->selectors_info, 0, priv->selectors_info->len);
@ -2194,7 +2203,7 @@ gtk_css_provider_load_from_path (GtkCssProvider *css_provider,
parse_stylesheet (css_provider); parse_stylesheet (css_provider);
g_free (data); g_mapped_file_unref (mapped_file);
return TRUE; return TRUE;
} }