adjust to new gvdb APIs

6 files changed, 33 insertions, 30 deletions

diff --git a/engine/dconf-engine-source.c b/engine/dconf-engine-source.c
index 2fe58f4..4eb7faa 100644
--- a/engine/dconf-engine-source.c
+++ b/engine/dconf-engine-source.c
@@ -28,10 +28,10 @@ void
 dconf_engine_source_free (DConfEngineSource *source)
 {
   if (source->values)
-    gvdb_table_unref (source->values);
+    gvdb_table_free (source->values);
 
   if (source->locks)
-    gvdb_table_unref (source->locks);
+    gvdb_table_free (source->locks);
 
   source->vtable->finalize (source);
   g_free (source->bus_name);
@@ -51,8 +51,8 @@ dconf_engine_source_refresh (DConfEngineSource *source)
       /* Record if we had a gvdb before or not. */
       was_open = source->values != NULL;
 
-      g_clear_pointer (&source->values, gvdb_table_unref);
-      g_clear_pointer (&source->locks, gvdb_table_unref);
+      g_clear_pointer (&source->values, gvdb_table_free);
+      g_clear_pointer (&source->locks, gvdb_table_free);
 
       source->values = source->vtable->reopen (source);
       if (source->values)
diff --git a/service/dconf-gvdb-utils.c b/service/dconf-gvdb-utils.c
index 4e93cc8..79291d3 100644
--- a/service/dconf-gvdb-utils.c
+++ b/service/dconf-gvdb-utils.c
@@ -81,7 +81,7 @@ dconf_gvdb_utils_read_file (const gchar  *filename,
           g_free (names[i]);
         }
 
-      gvdb_table_unref (table);
+      gvdb_table_free (table);
       g_free (names);
     }
 
diff --git a/tests/dconf-mock-gvdb.c b/tests/dconf-mock-gvdb.c
index 6bc6d14..a922a49 100644
--- a/tests/dconf-mock-gvdb.c
+++ b/tests/dconf-mock-gvdb.c
@@ -34,7 +34,7 @@ dconf_mock_gvdb_item_free (gpointer data)
     g_variant_unref (item->value);
 
   if (item->table)
-    gvdb_table_unref (item->table);
+    gvdb_table_free (item->table);
 
   g_slice_free (DConfMockGvdbItem, item);
 }
@@ -43,7 +43,7 @@ static void
 dconf_mock_gvdb_init (void)
 {
   if (dconf_mock_gvdb_tables == NULL)
-    dconf_mock_gvdb_tables = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gvdb_table_unref);
+    dconf_mock_gvdb_tables = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gvdb_table_free);
 }
 
 GvdbTable *
@@ -98,7 +98,7 @@ dconf_mock_gvdb_install (const gchar *filename,
 }
 
 void
-gvdb_table_unref (GvdbTable *table)
+gvdb_table_free (GvdbTable *table)
 {
   if (g_atomic_int_dec_and_test (&table->ref_count))
     {
@@ -108,7 +108,7 @@ gvdb_table_unref (GvdbTable *table)
 }
 
 GvdbTable *
-gvdb_table_ref (GvdbTable *table)
+dconf_mock_gvdb_table_ref (GvdbTable *table)
 {
   g_atomic_int_inc (&table->ref_count);
 
@@ -125,7 +125,7 @@ gvdb_table_get_table (GvdbTable   *table,
   item = g_hash_table_lookup (table->table, key);
 
   if (item && item->table)
-    subtable = gvdb_table_ref (item->table);
+    subtable = dconf_mock_gvdb_table_ref (item->table);
   else
     subtable = NULL;
 
@@ -179,7 +179,7 @@ gvdb_table_new (const gchar  *filename,
   dconf_mock_gvdb_init ();
   table = g_hash_table_lookup (dconf_mock_gvdb_tables, filename);
   if (table)
-    gvdb_table_ref (table);
+    dconf_mock_gvdb_table_ref (table);
   g_mutex_unlock (&dconf_mock_gvdb_lock);
 
   if (table == NULL)
diff --git a/tests/dconf-mock.h b/tests/dconf-mock.h
index e01bcb5..10e6095 100644
--- a/tests/dconf-mock.h
+++ b/tests/dconf-mock.h
@@ -28,5 +28,6 @@ void                    dconf_mock_gvdb_table_insert                    (GvdbTab
 void                    dconf_mock_gvdb_table_invalidate                (GvdbTable   *table);
 void                    dconf_mock_gvdb_install                         (const gchar *filename,
                                                                          GvdbTable   *table);
+GvdbTable *             dconf_mock_gvdb_table_ref                       (GvdbTable   *table);
 
 #endif
diff --git a/tests/engine.c b/tests/engine.c
index 20c050f..62b5b1e 100644
--- a/tests/engine.c
+++ b/tests/engine.c
@@ -393,7 +393,7 @@ test_system_source (void)
   first_table = dconf_mock_gvdb_table_new ();
   dconf_mock_gvdb_install ("/etc/dconf/db/site", first_table);
   /* Hang on to a copy for ourselves for below... */
-  gvdb_table_ref (first_table);
+  dconf_mock_gvdb_table_ref (first_table);
 
   /* See that we get the database. */
   reopened = dconf_engine_source_refresh (source);
@@ -416,7 +416,7 @@ test_system_source (void)
 
   /* Now mark the first table invalid and reopen */
   dconf_mock_gvdb_table_invalidate (first_table);
-  gvdb_table_unref (first_table);
+  gvdb_table_free (first_table);
   reopened = dconf_engine_source_refresh (source);
   g_assert (reopened);
   g_assert (source->values == next_table);
@@ -442,7 +442,7 @@ invalidate_state (guint     n_sources,
         if (state[i])
           {
             dconf_mock_gvdb_table_invalidate (state[i]);
-            gvdb_table_unref (state[i]);
+            gvdb_table_free (state[i]);
           }
       }
     else
@@ -494,7 +494,7 @@ setup_state (guint     n_sources,
           if (state)
             {
               if (table)
-                state[i] = gvdb_table_ref (table);
+                state[i] = dconf_mock_gvdb_table_ref (table);
               else
                 state[i] = NULL;
             }
diff --git a/tests/gvdb.c b/tests/gvdb.c
index 7c80ee5..084b422 100644
--- a/tests/gvdb.c
+++ b/tests/gvdb.c
@@ -42,9 +42,6 @@ test_reader_empty (void)
   g_assert_no_error (error);
   g_assert (table != NULL);
 
-  table = gvdb_table_ref (table);
-  gvdb_table_unref (table);
-
   g_assert (gvdb_table_is_valid (table));
 
   names = gvdb_table_get_names (table, &n_names);
@@ -80,7 +77,7 @@ test_reader_empty (void)
       g_assert (list == NULL);
     }
 
-  gvdb_table_unref (table);
+  gvdb_table_free (table);
 }
 
 static void
@@ -190,7 +187,7 @@ test_reader_values (void)
   }
 #endif
 
-  gvdb_table_unref (table);
+  gvdb_table_free (table);
 }
 
 static void
@@ -214,7 +211,7 @@ test_reader_values_bigendian (void)
   }
 #endif
 
-  gvdb_table_unref (table);
+  gvdb_table_free (table);
 }
 
 static void
@@ -261,8 +258,8 @@ test_nested (void)
   has = gvdb_table_has_value (locks, "/second");
   g_assert (has);
 
-  gvdb_table_unref (table);
-  gvdb_table_unref (locks);
+  gvdb_table_free (table);
+  gvdb_table_free (locks);
 }
 
 /* This function exercises the API against @table but does not do any
@@ -327,7 +324,7 @@ inspect_carefully (GvdbTable *table)
       if (subtable)
         {
           inspect_carefully (subtable);
-          gvdb_table_unref (subtable);
+          gvdb_table_free (subtable);
           found_items++;
         }
     }
@@ -364,6 +361,7 @@ test_corrupted (gconstpointer user_data)
 
       for (i = 0; i < 10000; i++)
         {
+          GBytes *bytes;
           gint j;
 
           /* Make a broken copy, but leave the signature intact so that
@@ -375,13 +373,15 @@ test_corrupted (gconstpointer user_data)
             else
               copy[j] = orig[j];
 
-          table = gvdb_table_new_from_data (copy, length, FALSE, NULL, NULL, NULL, &error);
+          bytes = g_bytes_new_static (copy, length);
+          table = gvdb_table_new_from_bytes (bytes, FALSE, &error);
+          g_bytes_unref (bytes);
 
           /* If we damaged the header, it may not open */
           if (table)
             {
               inspect_carefully (table);
-              gvdb_table_unref (table);
+              gvdb_table_free (table);
             }
           else
             {
@@ -395,15 +395,17 @@ test_corrupted (gconstpointer user_data)
   else
     {
       GvdbTable *table;
+      GBytes *bytes;
+
+      bytes = g_mapped_file_get_bytes (mapped);
+      table = gvdb_table_new_from_bytes (bytes, FALSE, &error);
+      g_bytes_unref (bytes);
 
-      table = gvdb_table_new_from_data (g_mapped_file_get_contents (mapped),
-                                        g_mapped_file_get_length (mapped),
-                                        FALSE, NULL, NULL, NULL, &error);
       g_assert_no_error (error);
       g_assert (table);
 
       inspect_carefully (table);
-      gvdb_table_unref (table);
+      gvdb_table_free (table);
     }
 
   g_mapped_file_unref (mapped);