Hard require GLib 2.34

Anyone wanting to build against an earlier version can use the
embedded-dependencies system.
This commit is contained in:
Colin Walters committed 2012-07-15 18:22:41 -04:00
1 parent 464f4a81c9
commit da43fb6db5
7 files changed
+10 -237

No files matched your search

+8 -8
View File
@@ -120,7 +120,7 @@ ostree_repo_finalize (GObject *object)
ot_clear_ptrarray (&self->cached_content_indexes);
g_hash_table_destroy (self->cached_pack_index_mappings);
g_hash_table_destroy (self->cached_pack_data_mappings);
ot_mutex_free (self->cache_lock);
g_mutex_clear (&self->cache_lock);
G_OBJECT_CLASS (ostree_repo_parent_class)->finalize (object);
}
@@ -214,7 +214,7 @@ ostree_repo_class_init (OstreeRepoClass *klass)
static void
ostree_repo_init (OstreeRepo *self)
{
ot_mutex_init (self->cache_lock);
g_mutex_init (&self->cache_lock);
self->cached_pack_index_mappings = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify)g_variant_unref);
@@ -1924,7 +1924,7 @@ ostree_repo_list_pack_indexes (OstreeRepo *self,
ot_lptrarray GPtrArray *ret_meta_indexes = NULL;
ot_lptrarray GPtrArray *ret_data_indexes = NULL;
ot_mutex_lock (self->cache_lock);
g_mutex_lock (&self->cache_lock);
if (self->cached_meta_indexes)
{
ret_meta_indexes = g_ptr_array_ref (self->cached_meta_indexes);
@@ -1955,7 +1955,7 @@ ostree_repo_list_pack_indexes (OstreeRepo *self,
ot_transfer_out_value (out_meta_indexes, &ret_meta_indexes);
ot_transfer_out_value (out_data_indexes, &ret_data_indexes);
out:
ot_mutex_unlock (self->cache_lock);
g_mutex_unlock (&self->cache_lock);
return ret;
}
@@ -3392,7 +3392,7 @@ ostree_repo_load_pack_index (OstreeRepo *self,
ot_lvariant GVariant *ret_variant = NULL;
ot_lobj GFile *path = NULL;
ot_mutex_lock (self->cache_lock);
g_mutex_lock (&self->cache_lock);
ret_variant = g_hash_table_lookup (self->cached_pack_index_mappings, pack_checksum);
if (ret_variant)
@@ -3415,7 +3415,7 @@ ostree_repo_load_pack_index (OstreeRepo *self,
ret = TRUE;
ot_transfer_out_value (out_variant, &ret_variant);
out:
ot_mutex_unlock (self->cache_lock);
g_mutex_unlock (&self->cache_lock);
return ret;
}
@@ -3441,7 +3441,7 @@ ostree_repo_map_pack_file (OstreeRepo *self,
GMappedFile *map = NULL;
ot_lobj GFile *path = NULL;
ot_mutex_lock (self->cache_lock);
g_mutex_lock (&self->cache_lock);
map = g_hash_table_lookup (self->cached_pack_data_mappings, pack_checksum);
if (map == NULL)
@@ -3465,7 +3465,7 @@ ostree_repo_map_pack_file (OstreeRepo *self,
if (out_len)
*out_len = ret_len;
out:
ot_mutex_unlock (self->cache_lock);
g_mutex_unlock (&self->cache_lock);
return ret;
}