diff options
author | Stef Walter <stefw@collabora.co.uk> | 2011-12-08 20:17:22 +0100 |
---|---|---|
committer | Stef Walter <stefw@collabora.co.uk> | 2011-12-08 21:10:37 +0100 |
commit | ef7e91d66839d4104ee6ba9681e49506f5dd5fa3 (patch) | |
tree | 9a05e5ac7990d340ad7064e27eb0aaa0e531d96a | |
parent | 742d24ccecd31071a5e763c1e1884fb0dac5558b (diff) | |
download | gcr-ef7e91d66839d4104ee6ba9681e49506f5dd5fa3.tar.gz |
gck: Bump gck libtool version, as we removed interfaces from libgck
* libgck API is not yet stable.
* Gck is only used internally in the gcr projcet, gnome-keyring project
and the seahorse project.
* We want to be threadsafe with regard to attributes, and the
functions removed can't be implemented within the new framework.
* Remove deprecated functions at the same time, since this is an
opportunity to cleanup.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | docs/reference/gck/gck-sections.txt | 9 | ||||
-rw-r--r-- | docs/reference/gcr/gcr-sections.txt | 1 | ||||
-rw-r--r-- | gck/gck-attributes.c | 7 | ||||
-rw-r--r-- | gck/gck-deprecated.h | 14 | ||||
-rw-r--r-- | gck/gck-misc.c | 7 | ||||
-rw-r--r-- | gck/gck-module.c | 8 | ||||
-rw-r--r-- | gck/gck-modules.c | 2 | ||||
-rw-r--r-- | gck/gck-slot.c | 19 | ||||
-rw-r--r-- | gck/gck-uri.c | 17 | ||||
-rw-r--r-- | gck/gck.h | 2 | ||||
-rw-r--r-- | gck/gck.symbols | 3 | ||||
-rw-r--r-- | gck/tests/test-gck-module.c | 4 | ||||
-rw-r--r-- | gck/tests/test-gck-modules.c | 4 | ||||
-rw-r--r-- | gck/tests/test-gck-slot.c | 2 | ||||
-rw-r--r-- | gck/tests/test-gck-uri.c | 2 | ||||
-rw-r--r-- | gcr/gcr-key-mechanisms.c | 2 |
17 files changed, 21 insertions, 84 deletions
diff --git a/configure.ac b/configure.ac index e21581e..e5b586f 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ GCK_MINOR=0 GCK_MICRO=0 # GCK libtool versioning -GCK_CURRENT=0 +GCK_CURRENT=1 GCK_REVISION=0 GCK_AGE=0 diff --git a/docs/reference/gck/gck-sections.txt b/docs/reference/gck/gck-sections.txt index 98cf196..936da1a 100644 --- a/docs/reference/gck/gck-sections.txt +++ b/docs/reference/gck/gck-sections.txt @@ -94,7 +94,6 @@ GCK_TYPE_BUILDER GCK_TYPE_BUILDER_FLAGS GCK_TYPE_ATTRIBUTES gck_attributes_get_type -gck_attributes_get_boxed_type gck_builder_flags_get_type gck_builder_get_type GckAllocator @@ -192,8 +191,6 @@ GckSlotPrivate GCK_TYPE_MECHANISM_INFO GCK_TYPE_SLOT_INFO GCK_TYPE_TOKEN_INFO -GckMechanisms -gck_mechanisms_free gck_mechanism_info_get_type gck_slot_info_get_type gck_token_info_get_type @@ -376,7 +373,6 @@ gck_uri_data_copy gck_uri_data_free GCK_URI_ERROR <SUBSECTION Private> -gck_uri_get_error_quark GCK_URI_DATA_TYPE gck_uri_data_get_type gck_uri_error_get_quark @@ -440,7 +436,6 @@ gck_value_to_boolean gck_value_to_ulong GCK_INVALID <SUBSECTION Private> -gck_get_error_quark gck_error_get_quark GCK_TYPE_LIST gck_list_get_boxed_type @@ -451,6 +446,4 @@ gck_error_get_type <SECTION> <FILE>gck-private</FILE> <SUBSECTION Private> -GCK_URI_BAD_PREFIX -CKR_GCK_MODULE_PROBLEM -</SECTION>
\ No newline at end of file +</SECTION> diff --git a/docs/reference/gcr/gcr-sections.txt b/docs/reference/gcr/gcr-sections.txt index 29432bc..f7c916e 100644 --- a/docs/reference/gcr/gcr-sections.txt +++ b/docs/reference/gcr/gcr-sections.txt @@ -376,6 +376,7 @@ gcr_collection_model_new gcr_collection_model_new_full gcr_collection_model_set_columns gcr_collection_model_get_collection +gcr_collection_model_set_collection gcr_collection_model_iter_for_object gcr_collection_model_object_for_iter gcr_collection_model_is_selected diff --git a/gck/gck-attributes.c b/gck/gck-attributes.c index 5c24276..a8e5839 100644 --- a/gck/gck-attributes.c +++ b/gck/gck-attributes.c @@ -2096,13 +2096,6 @@ gck_attributes_get_type (void) return type; } -GType -gck_attributes_get_boxed_type (void) -{ - /* Deprecated version */ - return gck_attributes_get_type (); -} - /** * gck_attributes_new_empty: * diff --git a/gck/gck-deprecated.h b/gck/gck-deprecated.h index 3121a9d..fb5ab33 100644 --- a/gck/gck-deprecated.h +++ b/gck/gck-deprecated.h @@ -30,19 +30,7 @@ G_BEGIN_DECLS #ifndef GCK_DISABLE_DEPRECATED -typedef GArray GckMechanisms; - -#define gck_mechanisms_free(a) (g_array_free (a, TRUE)) - -#define CKR_GCK_MODULE_PROBLEM GCK_ERROR_MODULE_PROBLEM - -GQuark gck_get_error_quark (void); - -GQuark gck_uri_get_error_quark (void); - -#define GCK_URI_BAD_PREFIX GCK_URI_BAD_SCHEME - -GType gck_attributes_get_boxed_type (void) G_GNUC_CONST; +/* No deprecated functions at this time */ #endif /* GCK_DISABLE_DEPRECATED */ diff --git a/gck/gck-misc.c b/gck/gck-misc.c index 42780ff..6ecdf43 100644 --- a/gck/gck-misc.c +++ b/gck/gck-misc.c @@ -80,13 +80,6 @@ EGG_SECURE_DEFINE_GLIB_GLOBALS (); */ GQuark -gck_get_error_quark (void) -{ - /* This is the deprecated version */ - return gck_error_get_quark (); -} - -GQuark gck_error_get_quark (void) { static GQuark domain = 0; diff --git a/gck/gck-module.c b/gck/gck-module.c index e5503fa..ec44e7c 100644 --- a/gck/gck-module.c +++ b/gck/gck-module.c @@ -348,17 +348,17 @@ perform_initialize (Initialize *args) /* Load the actual module */ module = g_module_open (args->path, 0); if (!module) { - g_set_error (&args->error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM, + g_set_error (&args->error, GCK_ERROR, (int)GCK_ERROR_MODULE_PROBLEM, _("Error loading PKCS#11 module: %s"), g_module_error ()); - return CKR_GCK_MODULE_PROBLEM; + return GCK_ERROR_MODULE_PROBLEM; } /* Get the entry point */ if (!g_module_symbol (module, "C_GetFunctionList", (void**)&get_function_list)) { - g_set_error (&args->error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM, + g_set_error (&args->error, GCK_ERROR, (int)GCK_ERROR_MODULE_PROBLEM, _("Invalid PKCS#11 module: %s"), g_module_error ()); g_module_close (module); - return CKR_GCK_MODULE_PROBLEM; + return GCK_ERROR_MODULE_PROBLEM; } /* Get the function list */ diff --git a/gck/gck-modules.c b/gck/gck-modules.c index 06301e1..e4cbe96 100644 --- a/gck/gck-modules.c +++ b/gck/gck-modules.c @@ -63,7 +63,7 @@ perform_initialize_registered (InitializeRegistered *args) message = p11_kit_message (); if (message == NULL) message = gck_message_from_rv (rv); - g_set_error (&args->error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM, + g_set_error (&args->error, GCK_ERROR, (int)GCK_ERROR_MODULE_PROBLEM, _("Couldn't initialize registered PKCS#11 modules: %s"), message); return rv; } diff --git a/gck/gck-slot.c b/gck/gck-slot.c index 7dd3c2a..fe25352 100644 --- a/gck/gck-slot.c +++ b/gck/gck-slot.c @@ -371,14 +371,8 @@ gck_mechanism_info_free (GckMechanismInfo *mech_info) } /** - * GckMechanisms: - * - * A set of GckMechanismInfo structures. - */ - -/** * gck_mechanisms_length: - * @a: A GckMechanisms set. + * @a: an array of unsigned long mechanism types set * * Get the number of GckMechanismInfo in the set. * @@ -387,8 +381,8 @@ gck_mechanism_info_free (GckMechanismInfo *mech_info) /** * gck_mechanisms_at: - * @a: A GckMechanisms set. - * @i: The index of a mechanism + * @a: an array of unsigned long mechanism types set + * @i: the index of a mechanism type * * Get a specific mechanism in a the set. * @@ -396,13 +390,6 @@ gck_mechanism_info_free (GckMechanismInfo *mech_info) */ /** - * gck_mechanisms_free: - * @a: A GckMechanism set. - * - * Free a GckMechanisms set. - */ - -/** * gck_mechanisms_check: * @mechanisms: A list of mechanisms, perhaps retrieved from gck_slot_get_mechanisms(). * @...: A list of mechanism types followed by GCK_INVALID. diff --git a/gck/gck-uri.c b/gck/gck-uri.c index d8665fa..6a19bc5 100644 --- a/gck/gck-uri.c +++ b/gck/gck-uri.c @@ -119,15 +119,7 @@ */ /** - * GCK_URI_BAD_PREFIX: - * - * Use %GCK_URI_BAD_SCHEME instead. - * - * Deprecated: Since 3.2 - */ - -/** - * CKR_GCK_MODULE_PROBLEM: + * GCK_ERROR_MODULE_PROBLEM: * * Use %GCK_ERROR_MODULE_PROBLEM instead. * @@ -145,13 +137,6 @@ struct _GckUri { }; GQuark -gck_uri_get_error_quark (void) -{ - /* This is deprecated version */ - return gck_uri_get_error_quark (); -} - -GQuark gck_uri_error_get_quark (void) { static GQuark domain = 0; @@ -336,7 +336,7 @@ GckBuilder * gck_builder_copy (GckBuilder *builder void gck_builder_clear (GckBuilder *builder); -#define GCK_TYPE_ATTRIBUTES (gck_attributes_get_boxed_type ()) +#define GCK_TYPE_ATTRIBUTES (gck_attributes_get_type ()) GType gck_attributes_get_type (void) G_GNUC_CONST; diff --git a/gck/gck.symbols b/gck/gck.symbols index e84ae27..f402d3f 100644 --- a/gck/gck.symbols +++ b/gck/gck.symbols @@ -38,7 +38,6 @@ gck_attributes_find_boolean gck_attributes_find_date gck_attributes_find_string gck_attributes_find_ulong -gck_attributes_get_boxed_type gck_attributes_get_type gck_attributes_new_empty gck_attributes_ref @@ -97,7 +96,6 @@ gck_enumerator_set_interaction gck_enumerator_set_object_type gck_error_get_quark gck_error_get_type -gck_get_error_quark gck_list_ref_copy gck_list_unref_free gck_list_get_boxed_type @@ -282,7 +280,6 @@ gck_uri_data_new gck_uri_error_get_quark gck_uri_error_get_type gck_uri_flags_get_type -gck_uri_get_error_quark gck_uri_parse gck_value_to_boolean gck_value_to_ulong diff --git a/gck/tests/test-gck-module.c b/gck/tests/test-gck-module.c index 2a1d3a1..9c6f56a 100644 --- a/gck/tests/test-gck-module.c +++ b/gck/tests/test-gck-module.c @@ -94,14 +94,14 @@ test_invalid_modules (Test *test, gconstpointer unused) /* Shouldn't be able to load modules */ invalid = gck_module_initialize ("blah-blah-non-existant", NULL, &error); - g_assert_error (error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM); + g_assert_error (error, GCK_ERROR, (int)GCK_ERROR_MODULE_PROBLEM); g_assert (invalid == NULL); g_clear_error (&error); /* Shouldn't be able to load any file successfully */ invalid = gck_module_initialize ("/usr/lib/libm.so", NULL, &error); - g_assert_error (error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM); + g_assert_error (error, GCK_ERROR, (int)GCK_ERROR_MODULE_PROBLEM); g_assert (invalid == NULL); g_clear_error (&error); diff --git a/gck/tests/test-gck-modules.c b/gck/tests/test-gck-modules.c index e212d1c..a83e45f 100644 --- a/gck/tests/test-gck-modules.c +++ b/gck/tests/test-gck-modules.c @@ -116,7 +116,7 @@ test_token_for_uri_error (Test *test, gconstpointer unused) slot = gck_modules_token_for_uri (test->modules, "http://invalid.uri", &error); g_assert (slot == NULL); g_assert (error != NULL); - g_assert (g_error_matches (error, GCK_URI_ERROR, GCK_URI_BAD_PREFIX)); + g_assert (g_error_matches (error, GCK_URI_ERROR, GCK_URI_BAD_SCHEME)); g_error_free (error); } @@ -151,7 +151,7 @@ test_object_for_uri_error (Test *test, gconstpointer unused) object = gck_modules_object_for_uri (test->modules, "http://invalid.uri", 0, &error); g_assert (object == NULL); g_assert (error != NULL); - g_assert (g_error_matches (error, GCK_URI_ERROR, GCK_URI_BAD_PREFIX)); + g_assert (g_error_matches (error, GCK_URI_ERROR, GCK_URI_BAD_SCHEME)); g_error_free (error); } diff --git a/gck/tests/test-gck-slot.c b/gck/tests/test-gck-slot.c index 3048026..8abcd6d 100644 --- a/gck/tests/test-gck-slot.c +++ b/gck/tests/test-gck-slot.c @@ -178,7 +178,7 @@ test_slot_mechanisms (Test *test, gconstpointer unused) gck_mechanism_info_free (info); } - gck_mechanisms_free (mechs); + g_array_free (mechs, TRUE); } static void diff --git a/gck/tests/test-gck-uri.c b/gck/tests/test-gck-uri.c index 8370133..51f65bf 100644 --- a/gck/tests/test-gck-uri.c +++ b/gck/tests/test-gck-uri.c @@ -60,7 +60,7 @@ test_parse_bad_scheme (void) uri_data = gck_uri_parse ("http:\\example.com\test", GCK_URI_FOR_ANY, &error); g_assert (uri_data == NULL); - g_assert_error (error, GCK_URI_ERROR, GCK_URI_BAD_PREFIX); + g_assert_error (error, GCK_URI_ERROR, GCK_URI_BAD_SCHEME); g_error_free (error); } diff --git a/gcr/gcr-key-mechanisms.c b/gcr/gcr-key-mechanisms.c index b21ccbb..b0afbb9 100644 --- a/gcr/gcr-key-mechanisms.c +++ b/gcr/gcr-key-mechanisms.c @@ -74,7 +74,7 @@ find_first_usable_mechanism (GckObject *key, break; } - gck_mechanisms_free (mechs); + g_array_free (mechs, TRUE); if (i < n_mechanisms) return mechanisms[i]; |