[gtk+/parser: 52/74] cssprovider: Keep base url in the scanner

[Benjamin Otte <otte src gnome org>]

commit 3275eb935d1f36db91a097a1b8ae65bfda753647
Author: Benjamin Otte <otte redhat com>
Date:   Mon Apr 11 17:30:01 2011 +0200

    cssprovider: Keep base url in the scanner
    
    And provide a nice function to query it. Simplifies a bunch of code.

 gtk/gtkcssprovider.c |   62 +++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 33 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index fa04d19..0ac61e3 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -789,6 +789,7 @@ struct SelectorStyleInfo
 struct _GtkCssScannerPrivate
 {
   GFile *file;
+  GFile *base;
   GSList *state;
   GSList *cur_selectors;
   GHashTable *cur_properties;
@@ -1159,7 +1160,16 @@ gtk_css_scanner_new (GFile       *file,
   priv = scanner->user_data = g_slice_new0 (GtkCssScannerPrivate);
 
   if (file)
-    priv->file = g_object_ref (file);
+    {
+      priv->file = g_object_ref (file);
+      priv->base = g_file_get_parent (file);
+    }
+  else
+    {
+      char *dir = g_get_current_dir ();
+      priv->base = g_file_new_for_path (dir);
+      g_free (dir);
+    }
 
   priv->cur_properties = g_hash_table_new_full (g_str_hash,
                                                 g_str_equal,
@@ -1195,6 +1205,14 @@ gtk_css_scanner_new (GFile       *file,
   return scanner;
 }
 
+static GFile *
+gtk_css_scanner_get_base_url (GScanner *scanner)
+{
+  GtkCssScannerPrivate *priv = scanner->user_data;
+
+  return priv->base;
+}
+
 static void
 gtk_css_provider_init (GtkCssProvider *css_provider)
 {
@@ -2217,8 +2235,7 @@ parse_rule (GtkCssProvider  *css_provider,
         {
           gboolean loaded;
           gchar *path = NULL;
-          GFile *base, *actual;
-          char *dirname;
+          GFile *actual;
           GError *error = NULL;
 
           gtk_css_scanner_push_scope (scanner, SCOPE_VALUE);
@@ -2235,16 +2252,10 @@ parse_rule (GtkCssProvider  *css_provider,
               return G_TOKEN_IDENTIFIER;
             }
 
-          if (scanner->input_name)
-            dirname = g_path_get_dirname (scanner->input_name);
-          else
-            dirname = g_get_current_dir ();
-
-          base = g_file_new_for_path (dirname);
-          g_free (dirname);
-
-          actual = _gtk_css_parse_url (base, path, NULL, &error);
-          g_object_unref (base);
+          actual = _gtk_css_parse_url (gtk_css_scanner_get_base_url (scanner),
+                                       path,
+                                       NULL,
+                                       &error);
 
           if (actual == NULL)
             {
@@ -2502,26 +2513,11 @@ parse_rule (GtkCssProvider  *css_provider,
           else
             {
               GError *error = NULL;
-              GFile *base;
-              char *dirname;
-              gboolean success;
-
-              if (scanner->input_name)
-                dirname = g_path_get_dirname (scanner->input_name);
-              else
-                dirname = g_get_current_dir ();
-
-              base = g_file_new_for_path (dirname);
-              g_free (dirname);
-
-              success = _gtk_css_value_from_string (val,
-                                                    base,
-                                                    value_str,
-                                                    &error);
-
-              g_object_unref (base);
-
-              if (success)
+              
+              if (_gtk_css_value_from_string (val,
+                                              gtk_css_scanner_get_base_url (scanner),
+                                              value_str,
+                                              &error))
                 {
                   g_hash_table_insert (priv->cur_properties, prop, val);
                 }