Remove OstreeTlsCertInteraction bits from introspection

We filter out everything named `-private.h` from scanning,
which differs from the gtk-doc exclude.  Eventually this will
be solved when we switch to the new gir-based docs.

Came up in https://github.com/ostreedev/ostree-rs/pull/34#discussion_r723337772

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 6b94f76f591c15ae523ce9025fc52b279490c3fe..1f698afcc4443d53caf9ea801c5ab56fb0e9d085 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -146,7 +146,7 @@ endif
 if HAVE_LIBSOUP_CLIENT_CERTS
 libostree_1_la_SOURCES += \
        src/libostree/ostree-tls-cert-interaction.c \
-       src/libostree/ostree-tls-cert-interaction.h \
+       src/libostree/ostree-tls-cert-interaction-private.h \
        $(NULL)
 endif
 

diff --git a/apidoc/Makefile.am b/apidoc/Makefile.am
index f8aa59980a5f5835f777059a82ee38e2d37b8e2b..f1f8faedb204946f8632e73707892574f27b8778 100644 (file)
--- a/apidoc/Makefile.am
+++ b/apidoc/Makefile.am
@@ -87,7 +87,7 @@ IGNORE_HFILES= \
        ostree-repo-pull-private.h \
        ostree-repo-static-delta-private.h \
        ostree-sysroot-private.h \
-       ostree-tls-cert-interaction.h \
+       ostree-tls-cert-interaction-private.h \
        $(NULL)
 
 # Images to copy into HTML directory.

diff --git a/src/libostree/ostree-fetcher-soup.c b/src/libostree/ostree-fetcher-soup.c
index e1e5002e7e34127e6be7480173da0cca8a15f04d..5f707175b2ce0d811a5b8fea5da3f152c714314f 100644 (file)
--- a/src/libostree/ostree-fetcher-soup.c
+++ b/src/libostree/ostree-fetcher-soup.c
@@ -35,7 +35,7 @@
 #include "ostree-fetcher.h"
 #include "ostree-fetcher-util.h"
 #ifdef HAVE_LIBSOUP_CLIENT_CERTS
-#include "ostree-tls-cert-interaction.h"
+#include "ostree-tls-cert-interaction-private.h"
 #endif
 #include "ostree-enumtypes.h"
 #include "ostree.h"

diff --git a/src/libostree/ostree-tls-cert-interaction-private.h b/src/libostree/ostree-tls-cert-interaction-private.h
new file mode 100644 (file)
index 0000000..58db65a
--- /dev/null
+++ b/src/libostree/ostree-tls-cert-interaction-private.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 Colin Walters <walters@verbum.org>
+ *
+ * SPDX-License-Identifier: LGPL-2.0+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "otutil.h"
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#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_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_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), OSTREE_TYPE_TLS_CERT_INTERACTION))
+#define OSTREE_TLS_CERT_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass))
+
+typedef struct _OstreeTlsCertInteraction        OstreeTlsCertInteraction;
+typedef struct _OstreeTlsCertInteractionClass   OstreeTlsCertInteractionClass;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeTlsCertInteraction, g_object_unref)
+
+GType                       _ostree_tls_cert_interaction_get_type    (void) G_GNUC_CONST;
+
+OstreeTlsCertInteraction *  _ostree_tls_cert_interaction_new         (const char *cert_path,
+                                                                      const char *key_path);
+
+G_END_DECLS

diff --git a/src/libostree/ostree-tls-cert-interaction.c b/src/libostree/ostree-tls-cert-interaction.c
index bd90166ab00a47dc30ca3e7c40f2b68bd0d0bbd2..7614244eff808d280788ced8d89262ecde165298 100644 (file)
--- a/src/libostree/ostree-tls-cert-interaction.c
+++ b/src/libostree/ostree-tls-cert-interaction.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "ostree-tls-cert-interaction.h"
+#include "ostree-tls-cert-interaction-private.h"
 
 struct _OstreeTlsCertInteraction
 {

diff --git a/src/libostree/ostree-tls-cert-interaction.h b/src/libostree/ostree-tls-cert-interaction.h
deleted file mode 100644 (file)
index 58db65a..0000000
--- a/src/libostree/ostree-tls-cert-interaction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2013 Colin Walters <walters@verbum.org>
- *
- * SPDX-License-Identifier: LGPL-2.0+
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "otutil.h"
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#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_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_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), OSTREE_TYPE_TLS_CERT_INTERACTION))
-#define OSTREE_TLS_CERT_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass))
-
-typedef struct _OstreeTlsCertInteraction        OstreeTlsCertInteraction;
-typedef struct _OstreeTlsCertInteractionClass   OstreeTlsCertInteractionClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeTlsCertInteraction, g_object_unref)
-
-GType                       _ostree_tls_cert_interaction_get_type    (void) G_GNUC_CONST;
-
-OstreeTlsCertInteraction *  _ostree_tls_cert_interaction_new         (const char *cert_path,
-                                                                      const char *key_path);
-
-G_END_DECLS