packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libostree: Make OstreeTlsCertInteraction explicitly private 

Similar to previous commit, this should be private.

https://bugzilla.gnome.org/show_bug.cgi?id=731369
This commit is contained in:
Colin Walters 2014-06-08 07:58:12 -04:00
parent 9f734494ff
commit 4ce93db595
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-fetcher.c
View File

@ -225,7 +225,7 @@ ostree_fetcher_set_client_cert (OstreeFetcher *fetcher,
{ {
#ifdef HAVE_LIBSOUP_CLIENT_CERTS #ifdef HAVE_LIBSOUP_CLIENT_CERTS
gs_unref_object GTlsInteraction *interaction = gs_unref_object GTlsInteraction *interaction =
(GTlsInteraction*)ostree_tls_cert_interaction_new (fetcher->client_cert); (GTlsInteraction*)_ostree_tls_cert_interaction_new (fetcher->client_cert);
g_object_set (fetcher->session, "tls-interaction", interaction, NULL); g_object_set (fetcher->session, "tls-interaction", interaction, NULL);
#else #else
g_warning ("This version of OSTree is compiled without client side certificate support"); g_warning ("This version of OSTree is compiled without client side certificate support");

8
src/libostree/ostree-tls-cert-interaction.c
View File

@ -34,7 +34,7 @@ struct _OstreeTlsCertInteractionClass
#include <string.h> #include <string.h>
G_DEFINE_TYPE (OstreeTlsCertInteraction, ostree_tls_cert_interaction, G_TYPE_TLS_INTERACTION); G_DEFINE_TYPE (OstreeTlsCertInteraction, _ostree_tls_cert_interaction, G_TYPE_TLS_INTERACTION);
static GTlsInteractionResult static GTlsInteractionResult
request_certificate (GTlsInteraction *interaction, request_certificate (GTlsInteraction *interaction,
@ -49,19 +49,19 @@ request_certificate (GTlsInteraction *interaction,
} }
static void static void
ostree_tls_cert_interaction_init (OstreeTlsCertInteraction *interaction) _ostree_tls_cert_interaction_init (OstreeTlsCertInteraction *interaction)
{ {
} }
static void static void
ostree_tls_cert_interaction_class_init (OstreeTlsCertInteractionClass *klass) _ostree_tls_cert_interaction_class_init (OstreeTlsCertInteractionClass *klass)
{ {
GTlsInteractionClass *interaction_class = G_TLS_INTERACTION_CLASS (klass); GTlsInteractionClass *interaction_class = G_TLS_INTERACTION_CLASS (klass);
interaction_class->request_certificate = request_certificate; interaction_class->request_certificate = request_certificate;
} }
OstreeTlsCertInteraction * OstreeTlsCertInteraction *
ostree_tls_cert_interaction_new (GTlsCertificate *cert) _ostree_tls_cert_interaction_new (GTlsCertificate *cert)
{ {
OstreeTlsCertInteraction *self = g_object_new (OSTREE_TYPE_TLS_CERT_INTERACTION, NULL); OstreeTlsCertInteraction *self = g_object_new (OSTREE_TYPE_TLS_CERT_INTERACTION, NULL);
self->cert = g_object_ref (cert); self->cert = g_object_ref (cert);

6
src/libostree/ostree-tls-cert-interaction.h
View File

@ -22,7 +22,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define OSTREE_TYPE_TLS_CERT_INTERACTION (ostree_tls_cert_interaction_get_type ()) #define OSTREE_TYPE_TLS_CERT_INTERACTION (_ostree_tls_cert_interaction_get_type ())
#define OSTREE_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteraction)) #define OSTREE_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteraction))
#define OSTREE_TLS_CERT_INTERACTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass)) #define OSTREE_TLS_CERT_INTERACTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass))
#define OSTREE_IS_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OSTREE_TYPE_TLS_CERT_INTERACTION)) #define OSTREE_IS_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OSTREE_TYPE_TLS_CERT_INTERACTION))
@ -32,8 +32,8 @@ G_BEGIN_DECLS
typedef struct _OstreeTlsCertInteraction OstreeTlsCertInteraction; typedef struct _OstreeTlsCertInteraction OstreeTlsCertInteraction;
typedef struct _OstreeTlsCertInteractionClass OstreeTlsCertInteractionClass; typedef struct _OstreeTlsCertInteractionClass OstreeTlsCertInteractionClass;
GType ostree_tls_cert_interaction_get_type (void) G_GNUC_CONST; GType _ostree_tls_cert_interaction_get_type (void) G_GNUC_CONST;
OstreeTlsCertInteraction * ostree_tls_cert_interaction_new (GTlsCertificate *cert); OstreeTlsCertInteraction * _ostree_tls_cert_interaction_new (GTlsCertificate *cert);
G_END_DECLS G_END_DECLS