Split up the Gcr GIR files into base/ui

 * Reorganize our libraries too, in a backwards compatible
   manner, in order to better match this split.
 * This reorganization was predicated on the fact that we can't
   have two GIRs with the same namespace. So the two namespaces are:
    - Gcr
    - GcrUi
 * The pkg-config files are:
    - gcr-base
    - gcr-ui
    - gcr (which depends on both of the above)

https://bugzilla.gnome.org/show_bug.cgi?id=689685

16 files changed, 237 insertions, 138 deletions

diff --git a/configure.ac b/configure.ac
index bd58fd1..8dde56d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
 GLIB_GSETTINGS
-GOBJECT_INTROSPECTION_CHECK([1.29])
+GOBJECT_INTROSPECTION_CHECK([1.34])
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
@@ -334,6 +334,7 @@ AC_SUBST(GCK_MAJOR)
 AC_SUBST(GCK_MINOR)
 
 GCR_LT_RELEASE=$GCR_CURRENT:$GCR_REVISION:$GCR_AGE
+AC_SUBST(GCR_CURRENT)
 AC_SUBST(GCR_LT_RELEASE)
 AC_SUBST(GCR_MAJOR)
 AC_SUBST(GCR_MINOR)
@@ -354,6 +355,7 @@ gck/Makefile
 gck/tests/Makefile
 gcr/gcr.pc
 gcr/gcr-base.pc
+gcr/gcr-ui.pc
 gcr/Makefile
 gcr/icons/Makefile
 gcr/icons/16x16/Makefile
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index 1008933..2b21161 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -119,7 +119,7 @@ expand_content_files=
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error \
 	-Wno-deprecated-declarations
 GTKDOC_LIBS= $(GLIB_LIBS) \
-	$(top_builddir)/$(DOC_MODULE)/libgcr-@GCR_MAJOR@.la \
+	$(top_builddir)/$(DOC_MODULE)/libgcr-ui-@GCR_MAJOR@.la \
 	$(top_builddir)/$(DOC_MODULE)/libgcr-base-@GCR_MAJOR@.la \
 	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la
 
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 4671581..ebf26df 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -36,6 +36,7 @@ HEADER_BASE_FILES = \
 	gcr-secret-exchange.h \
 	gcr-secure-memory.h \
 	gcr-simple-certificate.h \
+	gcr-simple-collection.h \
 	gcr-system-prompt.h \
 	gcr-system-prompter.h \
 	gcr-trust.h \
@@ -44,7 +45,7 @@ HEADER_BASE_FILES = \
 	gcr-unlock-options.h
 
 HEADER_UI_FILES = \
-	gcr.h \
+	gcr-ui.h \
 	gcr-certificate-basics-widget.h \
 	gcr-certificate-details-widget.h \
 	gcr-certificate-renderer.h \
@@ -61,7 +62,6 @@ HEADER_UI_FILES = \
 	gcr-prompt-dialog.h \
 	gcr-renderer.h \
 	gcr-secure-entry-buffer.h \
-	gcr-simple-collection.h \
 	gcr-tree-selector.h \
 	gcr-unlock-options-widget.h \
 	gcr-viewer.h \
@@ -73,7 +73,8 @@ inc_HEADERS = \
 	$(HEADER_BASE_FILES) \
 	$(HEADER_UI_FILES) \
 	gcr-enum-types-base.h \
-	gcr-enum-types.h
+	gcr-enum-types.h \
+	gcr.h
 
 # ------------------------------------------------------------------
 # LIBRARY
@@ -90,7 +91,7 @@ INCLUDES = \
 
 lib_LTLIBRARIES = \
 	libgcr-base-@GCR_MAJOR@.la \
-	libgcr-@GCR_MAJOR@.la
+	libgcr-ui-@GCR_MAJOR@.la
 
 BUILT_BASE_FILES = \
 	gcr-marshal.c gcr-marshal.h \
@@ -107,98 +108,122 @@ BUILT_SOURCES = \
 	$(BUILT_BASE_FILES) \
 	$(BUILT_UI_FILES)
 
-libgcr_base_@GCR_MAJOR@_la_SOURCES = \
-	gcr-callback-output-stream.c gcr-callback-output-stream.h \
+PUBLIC_BASE_FILES = \
+	gcr-base.h \
 	gcr-certificate.c gcr-certificate.h \
 	gcr-certificate-chain.c gcr-certificate-chain.h \
-	gcr-certificate-extensions.c gcr-certificate-extensions.h \
 	gcr-certificate-request.c gcr-certificate-request.h \
 	gcr-collection.c gcr-collection.h \
 	gcr-comparable.c gcr-comparable.h \
-	gcr-dbus-constants.h \
-	gcr-debug.c gcr-debug.h \
 	gcr-filter-collection.c gcr-filter-collection.h \
 	gcr-fingerprint.c gcr-fingerprint.h \
+	gcr-icons.c gcr-icons.h \
+	gcr-importer.c gcr-importer.h \
+	gcr-import-interaction.c gcr-import-interaction.h \
+	gcr-library.c gcr-library.h \
+	gcr-mock-prompter.c gcr-mock-prompter.h \
+	gcr-parser.c gcr-parser.h \
+	gcr-pkcs11-certificate.c gcr-pkcs11-certificate.h \
+	gcr-prompt.c gcr-prompt.h \
+	gcr-secret-exchange.c gcr-secret-exchange.h \
+	gcr-secure-memory.c gcr-secure-memory.h \
+	gcr-simple-certificate.c gcr-simple-certificate.h \
+	gcr-simple-collection.c gcr-simple-collection.h \
+	gcr-system-prompt.c gcr-system-prompt.h \
+	gcr-system-prompter.c gcr-system-prompter.h \
+	gcr-types.h \
+	gcr-union-collection.c gcr-union-collection.h \
+	gcr-unlock-options.h \
+	$(NULL)
+
+PRIVATE_BASE_FILES = \
+	gcr-callback-output-stream.c gcr-callback-output-stream.h \
+	gcr-certificate-extensions.c gcr-certificate-extensions.h \
+	gcr-dbus-constants.h \
+	gcr-debug.c gcr-debug.h \
+	gcr-deprecated-base.h \
 	gcr-gnupg-collection.c gcr-gnupg-collection.h \
 	gcr-gnupg-importer.c gcr-gnupg-importer.h \
 	gcr-gnupg-key.c gcr-gnupg-key.h \
 	gcr-gnupg-process.c gcr-gnupg-process.h \
 	gcr-gnupg-records.c gcr-gnupg-records.h \
 	gcr-gnupg-util.c gcr-gnupg-util.h \
-	gcr-icons.c gcr-icons.h \
-	gcr-importer.c gcr-importer.h \
-	gcr-import-interaction.c gcr-import-interaction.h \
 	gcr-internal.h \
 	gcr-key-mechanisms.h gcr-key-mechanisms.c \
-	gcr-library.c gcr-library.h \
 	gcr-memory.c \
 	gcr-memory-icon.c gcr-memory-icon.h \
-	gcr-mock-prompter.c gcr-mock-prompter.h \
 	gcr-openpgp.c gcr-openpgp.h \
 	gcr-openssh.c gcr-openssh.h \
-	gcr-parser.c gcr-parser.h \
-	gcr-pkcs11-certificate.c gcr-pkcs11-certificate.h \
 	gcr-pkcs11-importer.c gcr-pkcs11-importer.h \
-	gcr-prompt.c gcr-prompt.h \
 	gcr-record.c gcr-record.h \
-	gcr-secret-exchange.c gcr-secret-exchange.h \
-	gcr-secure-memory.c gcr-secure-memory.h \
-	gcr-simple-certificate.c gcr-simple-certificate.h \
-	gcr-simple-collection.c gcr-simple-collection.h \
 	gcr-single-collection.c gcr-single-collection.h \
 	gcr-subject-public-key.c gcr-subject-public-key.h \
-	gcr-system-prompt.c gcr-system-prompt.h \
-	gcr-system-prompter.c gcr-system-prompter.h \
 	gcr-trust.c gcr-trust.h \
-	gcr-types.h \
-	gcr-union-collection.c gcr-union-collection.h \
+	gcr-ui.h \
 	gcr-util.c gcr-util.h \
 	$(NULL)
 
+libgcr_base_@GCR_MAJOR@_la_SOURCES = \
+	$(PUBLIC_BASE_FILES) \
+	$(PRIVATE_BASE_FILES) \
+	$(NULL)
+
 nodist_libgcr_base_@GCR_MAJOR@_la_SOURCES = \
 	$(BUILT_BASE_FILES)
 
-libgcr_@GCR_MAJOR@_la_SOURCES = \
+PUBLIC_UI_FILES = \
+	gcr-certificate-renderer.c gcr-certificate-renderer.h \
+	gcr-certificate-widget.c gcr-certificate-widget.h \
+	gcr-collection-model.c gcr-collection-model.h \
+	gcr-column.h \
+	gcr-combo-selector.c gcr-combo-selector.h \
+	gcr-failure-renderer.c gcr-failure-renderer.h \
+	gcr-key-renderer.c gcr-key-renderer.h \
+	gcr-key-widget.c gcr-key-widget.h \
+	gcr-import-button.c  gcr-import-button.h \
+	gcr-list-selector.c gcr-list-selector.h \
+	gcr-prompt-dialog.c gcr-prompt-dialog.h \
+	gcr-renderer.c gcr-renderer.h \
+	gcr-secure-entry-buffer.c gcr-secure-entry-buffer.h \
+	gcr-tree-selector.c gcr-tree-selector.h \
+	gcr-unlock-options-widget.c gcr-unlock-options-widget.h \
+	gcr-viewer.c gcr-viewer.h \
+	gcr-viewer-widget.c gcr-viewer-widget.h \
+	gcr-ui.h \
+	$(NULL)
+
+PRIVATE_UI_FILES = \
 	gcr-certificate-basics-widget.c gcr-certificate-basics-widget.h \
 	gcr-certificate-details-widget.c gcr-certificate-details-widget.h \
 	gcr-certificate-exporter.c gcr-certificate-exporter.h \
 	gcr-certificate-extensions.c gcr-certificate-extensions.h \
-	gcr-certificate-renderer.c gcr-certificate-renderer.h gcr-certificate-renderer-private.h \
+	gcr-certificate-renderer-private.h \
 	gcr-certificate-request-renderer.c gcr-certificate-request-renderer.h \
-	gcr-certificate-widget.c gcr-certificate-widget.h \
-	gcr-collection-model.c gcr-collection-model.h \
-	gcr-combo-selector.c gcr-combo-selector.h \
 	gcr-debug.c gcr-debug.h \
+	gcr-deprecated.h \
 	gcr-dialog-util.c gcr-dialog-util.h \
 	gcr-display-scrolled.c gcr-display-scrolled.h \
 	gcr-display-view.c gcr-display-view.h \
-	gcr-failure-renderer.c gcr-failure-renderer.h \
 	gcr-gnupg-renderer.c gcr-gnupg-renderer.h \
 	gcr-gnupg-records.c gcr-gnupg-records.h \
-	gcr-import-button.c gcr-import-button.h \
-	gcr-key-renderer.c gcr-key-renderer.h \
-	gcr-key-widget.c gcr-key-widget.h \
-	gcr-list-selector.c gcr-list-selector.h gcr-list-selector-private.h \
+	gcr-list-selector-private.h \
 	gcr-live-search.c gcr-live-search.h \
 	gcr-memory.c \
 	gcr-memory-icon.c gcr-memory-icon.h \
 	gcr-pkcs11-import-interaction.c gcr-pkcs11-import-interaction.h \
 	gcr-pkcs11-import-dialog.c gcr-pkcs11-import-dialog.h \
-	gcr-prompt-dialog.c gcr-prompt-dialog.h \
 	gcr-record.c gcr-record.h \
-	gcr-renderer.c gcr-renderer.h \
-	gcr-secure-entry-buffer.c gcr-secure-entry-buffer.h \
 	gcr-subject-public-key.c gcr-subject-public-key.h \
-	gcr-tree-selector.c gcr-tree-selector.h \
-	gcr-unlock-options.h \
-	gcr-unlock-options-widget.c gcr-unlock-options-widget.h \
 	gcr-unlock-renderer.c gcr-unlock-renderer.h \
-	gcr-viewer.c gcr-viewer.h \
-	gcr-viewer-widget.c gcr-viewer-widget.h \
 	gcr-viewer-window.c gcr-viewer-window.h \
 	$(NULL)
 
-nodist_libgcr_@GCR_MAJOR@_la_SOURCES = \
+libgcr_ui_@GCR_MAJOR@_la_SOURCES = \
+	$(PUBLIC_UI_FILES) \
+	$(PRIVATE_UI_FILES) \
+	$(NULL)
+
+nodist_libgcr_ui_@GCR_MAJOR@_la_SOURCES = \
 	$(BUILT_UI_FILES)
 
 libgcr_base_@GCR_MAJOR@_la_CFLAGS = \
@@ -206,7 +231,7 @@ libgcr_base_@GCR_MAJOR@_la_CFLAGS = \
 	-DP11_KIT_API_SUBJECT_TO_CHANGE \
 	-DGCR_COMPILATION
 
-libgcr_@GCR_MAJOR@_la_CFLAGS = \
+libgcr_ui_@GCR_MAJOR@_la_CFLAGS = \
 	$(GTK_CFLAGS) \
 	-DUIDIR=\""$(uidir)"\" \
 	$(libgcr_base_@GCR_MAJOR@_la_CFLAGS)
@@ -216,7 +241,7 @@ libgcr_base_@GCR_MAJOR@_la_LDFLAGS = \
 	-no-undefined \
 	-export-symbols-regex '^gcr_.*|^SECMEM_.*'
 
-libgcr_@GCR_MAJOR@_la_LDFLAGS = \
+libgcr_ui_@GCR_MAJOR@_la_LDFLAGS = \
 	$(libgcr_base_@GCR_MAJOR@_la_LDFLAGS)
 
 libgcr_base_@GCR_MAJOR@_la_LIBADD = \
@@ -226,20 +251,26 @@ libgcr_base_@GCR_MAJOR@_la_LIBADD = \
 	$(LIBGCRYPT_LIBS) \
 	$(P11_KIT_LIBS)
 
-libgcr_@GCR_MAJOR@_la_LIBADD = \
+libgcr_ui_@GCR_MAJOR@_la_LIBADD = \
 	$(GTK_LIBS) \
 	$(libgcr_base_@GCR_MAJOR@_la_LIBADD) \
 	$(builddir)/libgcr-base-$(GCR_MAJOR).la
 
+# libgcr-3.so (and  friends) symlink to libgcr-ui-3.so for compatibility raisons
+install-exec-hook:
+	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so
+	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_CURRENT@
+	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_LT_RELEASE@
+
 noinst_LTLIBRARIES = libgcr-testable.la
 libgcr_testable_la_SOURCES =
 libgcr_testable_la_LIBADD = \
 	$(libgcr_base_@GCR_MAJOR@_la_OBJECTS) \
-	$(libgcr_@GCR_MAJOR@_la_OBJECTS) \
+	$(libgcr_ui_@GCR_MAJOR@_la_OBJECTS) \
 	$(libgcr_base_@GCR_MAJOR@_la_LIBADD)
 libgcr_testable_la_DEPENDENCIES = \
 	$(libgcr_base_@GCR_MAJOR@_la_OBJECTS) \
-	$(libgcr_@GCR_MAJOR@_la_OBJECTS)
+	$(libgcr_ui_@GCR_MAJOR@_la_OBJECTS)
 
 gcr-marshal.h: gcr-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=_gcr_marshal > $@
@@ -276,12 +307,17 @@ gcr-dbus-generated.c: $(DBUS_XML_DEFINITIONS)
 gcr-dbus-generated.h: gcr-dbus-generated.c
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gcr-$(GCR_MAJOR).pc gcr-base-$(GCR_MAJOR).pc
+pkgconfig_DATA = \
+	gcr-$(GCR_MAJOR).pc \
+	gcr-base-$(GCR_MAJOR).pc \
+	gcr-ui-$(GCR_MAJOR).pc
 
 gcr-$(GCR_MAJOR).pc: gcr.pc
 	cp gcr.pc gcr-$(GCR_MAJOR).pc
 gcr-base-$(GCR_MAJOR).pc: gcr-base.pc
 	cp gcr-base.pc gcr-base-$(GCR_MAJOR).pc
+gcr-ui-$(GCR_MAJOR).pc: gcr-ui.pc
+	cp gcr-ui.pc gcr-ui-$(GCR_MAJOR).pc
 
 # ----------------------------------------------------------------
 # SYSTEM INTEGRATION
@@ -332,7 +368,7 @@ gcr_viewer_CFLAGS = \
 	-DGCR_API_SUBJECT_TO_CHANGE
 
 gcr_viewer_LDADD = \
-	$(builddir)/libgcr-$(GCR_MAJOR).la \
+	$(builddir)/libgcr-ui-$(GCR_MAJOR).la \
 	$(builddir)/libgcr-base-$(GCR_MAJOR).la \
 	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(GLIB_LIBS) \
@@ -348,11 +384,41 @@ gcr_prompter_CFLAGS = \
 	$(GTK_CFLAGS)
 
 gcr_prompter_LDADD = \
-	$(builddir)/libgcr-$(GCR_MAJOR).la \
+	$(builddir)/libgcr-ui-$(GCR_MAJOR).la \
 	$(builddir)/libgcr-base-$(GCR_MAJOR).la \
 	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(GTK_LIBS)
 
+
+EXTRA_DIST = \
+	gcr.pc.in \
+	gcr-base.pc.in \
+	gcr-marshal.list \
+	gcr-oids.list \
+	gcr-mkoids \
+	$(ui_DATA) \
+	$(DBUS_XML_DEFINITIONS) \
+	gcr-enum-types.h.template \
+	gcr-enum-types.c.template \
+	gcr-base.symbols \
+	gcr-ui.symbols \
+	$(desktop_in_in_files) \
+	$(service_in_files) \
+	$(mime_DATA)
+
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	$(pkgconfig_DATA) \
+	$(service_DATA) \
+	$(desktop_in_files) \
+	$(desktop_DATA) \
+	$(gir_DATA) \
+	$(typelibs_DATA) \
+	gcr-base-actual.abi \
+	gcr-base-expected.abi \
+	gcr-ui-actual.abi \
+	gcr-ui-expected.abi
+
 # ------------------------------------------------------------------
 # INTROSPECTION
 
@@ -360,7 +426,7 @@ if HAVE_INTROSPECTION
 
 include $(INTROSPECTION_MAKEFILE)
 
-INTROSPECTION_GIRS = Gcr-@GCR_MAJOR@.gir
+INTROSPECTION_GIRS = Gcr-@GCR_MAJOR@.gir GcrUi-@GCR_MAJOR@.gir
 INTROSPECTION_SCANNER_ARGS = \
 	$(INTROSPECTION_FLAGS) \
 	--warn-all \
@@ -370,15 +436,28 @@ INTROSPECTION_COMPILER_ARGS = \
 	--includedir=$(srcdir) \
 	--includedir=$(top_builddir)/gck
 
-Gcr-@GCR_MAJOR@.gir: libgcr-@GCR_MAJOR@.la
+Gcr-@GCR_MAJOR@.gir: libgcr-base-@GCR_MAJOR@.la
 
-Gcr_@GCR_MAJOR@_gir_PACKAGES = gtk+-3.0 p11-kit-1
-Gcr_@GCR_MAJOR@_gir_EXPORT_PACKAGES = gcr-@GCR_MAJOR@
-Gcr_@GCR_MAJOR@_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0
-Gcr_@GCR_MAJOR@_gir_LIBS = libgcr-base-@GCR_MAJOR@.la libgcr-@GCR_MAJOR@.la
+Gcr_@GCR_MAJOR@_gir_PACKAGES = p11-kit-1
+Gcr_@GCR_MAJOR@_gir_EXPORT_PACKAGES = gcr-base-@GCR_MAJOR@
+Gcr_@GCR_MAJOR@_gir_INCLUDES = GLib-2.0 GObject-2.0
+Gcr_@GCR_MAJOR@_gir_LIBS = libgcr-base-@GCR_MAJOR@.la
 Gcr_@GCR_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DGCR_COMPILATION -DGCR_API_SUBJECT_TO_CHANGE
-Gcr_@GCR_MAJOR@_gir_FILES = $(libgcr_base_@GCR_MAJOR@_la_SOURCES) $(libgcr_@GCR_MAJOR@_la_SOURCES)
-Gcr_@GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr.h" --c-include "gcr-base.h"
+Gcr_@GCR_MAJOR@_gir_FILES = $(PUBLIC_BASE_FILES)
+Gcr_@GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr-base.h" \
+	--identifier-prefix Gcr
+
+GcrUi-@GCR_MAJOR@.gir: libgcr-ui-@GCR_MAJOR@.la Gcr-@GCR_MAJOR@.gir
+
+GcrUi_@GCR_MAJOR@_gir_PACKAGES = gtk+-3.0 p11-kit-1
+GcrUi_@GCR_MAJOR@_gir_EXPORT_PACKAGES = gcr-ui-@GCR_MAJOR@
+GcrUi_@GCR_MAJOR@_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0
+GcrUi_@GCR_MAJOR@_gir_LIBS = libgcr-ui-@GCR_MAJOR@.la
+GcrUi_@GCR_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DGCR_COMPILATION -DGCR_API_SUBJECT_TO_CHANGE
+GcrUi_@GCR_MAJOR@_gir_FILES = $(PUBLIC_UI_FILES)
+GcrUi_@GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr-ui.h" \
+	--identifier-prefix Gcr --symbol-prefix gcr \
+	--include-uninstalled=$(builddir)/Gcr-@GCR_MAJOR@.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -390,54 +469,25 @@ endif
 
 # ----------------------------------------------------------------
 
-gcr-expected-base.abi: gcr-base.symbols
+gcr-base-expected.abi: gcr-base.symbols
 	$(AM_V_GEN) cpp -P $< | sort > $@
-gcr-expected.abi: gcr.symbols
+gcr-ui-expected.abi: gcr-ui.symbols
 	$(AM_V_GEN) cpp -P $< | sort > $@
 
-gcr-actual-base.abi: $(builddir)/.libs/libgcr-base-@GCR_MAJOR@.so
+gcr-base-actual.abi: $(builddir)/.libs/libgcr-base-@GCR_MAJOR@.so
 	$(AM_V_GEN)  $(NM) -D -g --defined-only $< | \
 		cut -d ' ' -f 3 | grep -Ev '^(__bss_start|_edata|_end)' | sort > $@
-gcr-actual.abi: $(builddir)/.libs/libgcr-@GCR_MAJOR@.so
+gcr-ui-actual.abi: $(builddir)/.libs/libgcr-ui-@GCR_MAJOR@.so
 	$(AM_V_GEN)  $(NM) -D -g --defined-only $< | \
 		cut -d ' ' -f 3 | grep -Ev '^(__bss_start|_edata|_end)' | sort > $@
 
-check-symbols: gcr-expected.abi gcr-actual.abi gcr-expected-base.abi gcr-actual-base.abi
-	$(AM_V_GEN) diff -U0 --ignore-blank-lines gcr-expected-base.abi gcr-actual-base.abi || \
+check-symbols: gcr-ui-expected.abi gcr-ui-actual.abi gcr-base-expected.abi gcr-base-actual.abi
+	$(AM_V_GEN) diff -U0 --ignore-blank-lines gcr-base-expected.abi gcr-base-actual.abi || \
 		(echo "check-symbols: Symbols have CHANGED. Fix gcr-base.symbols"; exit 1)
-	$(AM_V_GEN) diff -U0 --ignore-blank-lines gcr-expected.abi gcr-actual.abi || \
-		(echo "check-symbols: Symbols have CHANGED. Fix gcr.symbols"; exit 1)
+	$(AM_V_GEN) diff -U0 --ignore-blank-lines gcr-ui-expected.abi gcr-ui-actual.abi || \
+		(echo "check-symbols: Symbols have CHANGED. Fix gcr-ui.symbols"; exit 1)
 
 check-local: check-symbols
 
 check-memory:
 	make -C tests check-memory
-
-EXTRA_DIST = \
-	gcr.pc.in \
-	gcr-base.pc.in \
-	gcr-marshal.list \
-	gcr-oids.list \
-	gcr-mkoids \
-	$(ui_DATA) \
-	$(DBUS_XML_DEFINITIONS) \
-	gcr-enum-types.h.template \
-	gcr-enum-types.c.template \
-	gcr.symbols \
-	gcr-base.symbols \
-	$(desktop_in_in_files) \
-	$(service_in_files) \
-	$(mime_DATA)
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(pkgconfig_DATA) \
-	$(service_DATA) \
-	$(desktop_in_files) \
-	$(desktop_DATA) \
-	$(gir_DATA) \
-	$(typelibs_DATA) \
-	gcr-actual.abi \
-	gcr-actual-base.abi \
-	gcr-expected.abi \
-	gcr-expected-base.abi
diff --git a/gcr/gcr-base.pc.in b/gcr/gcr-base.pc.in
index afb0114..894a63f 100644
--- a/gcr/gcr-base.pc.in
+++ b/gcr/gcr-base.pc.in
@@ -5,8 +5,6 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
-pkcs11dir=@P11_MODULE_PATH@
-pkcs11standalonedir=@pkcs11standalonedir@
 
 Name: gcr-base-@GCR_MAJOR@
 Description: GObject library for high level crypto parsing
diff --git a/gcr/gcr-certificate-basics-widget.c b/gcr/gcr-certificate-basics-widget.c
index b7251dc..b1bc3c6 100644
--- a/gcr/gcr-certificate-basics-widget.c
+++ b/gcr/gcr-certificate-basics-widget.c
@@ -39,7 +39,7 @@ gcr_certificate_basics_widget_get_type (void)
  *
  * Deprecated: Since 2.30
  *
- * Returns: (transfer full) (type Gcr.CertificateWidget): a new certificate widget
+ * Returns: (transfer full) (type GcrUi.CertificateWidget): a new certificate widget
  */
 GcrCertificateBasicsWidget *
 gcr_certificate_basics_widget_new (GcrCertificate *cert)
diff --git a/gcr/gcr-certificate-details-widget.c b/gcr/gcr-certificate-details-widget.c
index cfcbfd5..1c164ac 100644
--- a/gcr/gcr-certificate-details-widget.c
+++ b/gcr/gcr-certificate-details-widget.c
@@ -39,7 +39,7 @@ gcr_certificate_details_widget_get_type (void)
  *
  * Deprecated: Since 2.30
  *
- * Returns: (transfer full) (type Gcr.CertificateWidget): a new certificate widget
+ * Returns: (transfer full) (type GcrUi.CertificateWidget): a new certificate widget
  */
 GcrCertificateDetailsWidget *
 gcr_certificate_details_widget_new (GcrCertificate *cert)
diff --git a/gcr/gcr-failure-renderer.c b/gcr/gcr-failure-renderer.c
index ef37f2f..6b92317 100644
--- a/gcr/gcr-failure-renderer.c
+++ b/gcr/gcr-failure-renderer.c
@@ -183,7 +183,7 @@ gcr_renderer_iface_init (GcrRendererIface *iface)
  *
  * Create a new renderer for an error.
  *
- * Returns: (transfer full) (type Gcr.FailureRenderer): the new renderer
+ * Returns: (transfer full) (type GcrUi.FailureRenderer): the new renderer
  */
 GcrRenderer *
 gcr_failure_renderer_new (const gchar *label,
diff --git a/gcr/gcr-live-search.c b/gcr/gcr-live-search.c
index 919e7ff..f062e8c 100644
--- a/gcr/gcr-live-search.c
+++ b/gcr/gcr-live-search.c
@@ -552,7 +552,7 @@ _gcr_live_search_init (GcrLiveSearch *self)
  *
  * Create a new #GcrLiveSearch.
  *
- * Returns: (transfer full) (type Gcr.LiveSearch): The new widget
+ * Returns: (transfer full) (type GcrUi.LiveSearch): The new widget
  */
 GtkWidget *
 _gcr_live_search_new (GtkWidget *hook)
diff --git a/gcr/gcr-ui.h b/gcr/gcr-ui.h
new file mode 100644
index 0000000..0570f52
--- /dev/null
+++ b/gcr/gcr-ui.h
@@ -0,0 +1,62 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * This program 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.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Stef Walter <stefw@collabora.co.uk>
+ */
+
+#ifndef GCR_API_SUBJECT_TO_CHANGE
+#error "This API has not yet reached stability."
+#endif
+
+#ifndef __GCR_UI_H__
+#define __GCR_UI_H__
+
+#include <glib.h>
+
+#include "gcr-base.h"
+
+#define __GCR_INSIDE_HEADER__
+
+#include <gcr/gcr-certificate-renderer.h>
+#include <gcr/gcr-certificate-widget.h>
+#include <gcr/gcr-collection-model.h>
+#include <gcr/gcr-column.h>
+#include <gcr/gcr-combo-selector.h>
+#include <gcr/gcr-deprecated.h>
+#include <gcr/gcr-key-renderer.h>
+#include <gcr/gcr-key-widget.h>
+#include <gcr/gcr-enum-types.h>
+#include <gcr/gcr-failure-renderer.h>
+#include <gcr/gcr-key-renderer.h>
+#include <gcr/gcr-key-widget.h>
+#include <gcr/gcr-import-button.h>
+#include <gcr/gcr-list-selector.h>
+#include <gcr/gcr-prompt-dialog.h>
+#include <gcr/gcr-renderer.h>
+#include <gcr/gcr-secure-entry-buffer.h>
+#include <gcr/gcr-tree-selector.h>
+#include <gcr/gcr-union-collection.h>
+#include <gcr/gcr-unlock-options-widget.h>
+#include <gcr/gcr-viewer.h>
+#include <gcr/gcr-viewer-widget.h>
+
+#undef __GCR_INSIDE_HEADER__
+
+#endif /* __GCR_UI_H__ */
diff --git a/gcr/gcr-ui.pc.in b/gcr/gcr-ui.pc.in
new file mode 100644
index 0000000..cd35150
--- /dev/null
+++ b/gcr/gcr-ui.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+Name: gcr-ui-@GCR_MAJOR@
+Description: GObject and GUI library for high level crypto parsing and display
+Version: @VERSION@
+Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gcr-base-@GCR_MAJOR@ gck-@GCK_MAJOR@
+Requires.private: p11-kit-1
+Libs: -L${libdir} -lgcr-@GCR_MAJOR@
+Cflags: -I${includedir}/gcr-@GCR_MAJOR@
diff --git a/gcr/gcr.symbols b/gcr/gcr-ui.symbols
index 4017eb2..4017eb2 100644
--- a/gcr/gcr.symbols
+++ b/gcr/gcr-ui.symbols
diff --git a/gcr/gcr-unlock-options-widget.c b/gcr/gcr-unlock-options-widget.c
index 5721caf..b852a1d 100644
--- a/gcr/gcr-unlock-options-widget.c
+++ b/gcr/gcr-unlock-options-widget.c
@@ -315,7 +315,7 @@ gcr_unlock_options_widget_class_init (GcrUnlockOptionsWidgetClass *klass)
  *
  * Create a new #GcrUnlockOptionsWidget.
  *
- * Returns: (transfer full) (type Gcr.UnlockOptionsWidget): a new #GcrUnlockOptionsWidget
+ * Returns: (transfer full) (type GcrUi.UnlockOptionsWidget): a new #GcrUnlockOptionsWidget
  */
 GtkWidget *
 gcr_unlock_options_widget_new (void)
diff --git a/gcr/gcr-viewer-widget.c b/gcr/gcr-viewer-widget.c
index e624ae2..682976d 100644
--- a/gcr/gcr-viewer-widget.c
+++ b/gcr/gcr-viewer-widget.c
@@ -380,7 +380,7 @@ gcr_viewer_widget_class_init (GcrViewerWidgetClass *klass)
 	/**
 	 * GcrViewerWidget::added:
 	 * @self: the viewer widget
-	 * @renderer: (type Gcr.Renderer): the renderer that was added
+	 * @renderer: (type GcrUi.Renderer): the renderer that was added
 	 * @parsed: (type Gcr.Parsed): the parsed item that was added
 	 *
 	 * This signal is emitted when an item is added to the viewer widget.
diff --git a/gcr/gcr-viewer-window.c b/gcr/gcr-viewer-window.c
index d539ad6..0b2e78f 100644
--- a/gcr/gcr-viewer-window.c
+++ b/gcr/gcr-viewer-window.c
@@ -162,7 +162,7 @@ gcr_viewer_window_class_init (GcrViewerWindowClass *klass)
  *
  * Create a new viewer window.
  *
- * Returns: (transfer full) (type Gcr.ViewerWindow): a new viewer window
+ * Returns: (transfer full) (type GcrUi.ViewerWindow): a new viewer window
  */
 GtkWindow *
 gcr_viewer_window_new (void)
diff --git a/gcr/gcr.h b/gcr/gcr.h
index 0c79fbf..ae8c752 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -31,31 +31,7 @@
 #include <glib.h>
 
 #include "gcr-base.h"
-
-#define __GCR_INSIDE_HEADER__
-
-#include <gcr/gcr-certificate-renderer.h>
-#include <gcr/gcr-certificate-widget.h>
-#include <gcr/gcr-collection-model.h>
-#include <gcr/gcr-column.h>
-#include <gcr/gcr-combo-selector.h>
-#include <gcr/gcr-deprecated.h>
-#include <gcr/gcr-key-renderer.h>
-#include <gcr/gcr-key-widget.h>
-#include <gcr/gcr-enum-types.h>
-#include <gcr/gcr-failure-renderer.h>
-#include <gcr/gcr-key-renderer.h>
-#include <gcr/gcr-key-widget.h>
-#include <gcr/gcr-import-button.h>
-#include <gcr/gcr-list-selector.h>
-#include <gcr/gcr-prompt-dialog.h>
-#include <gcr/gcr-renderer.h>
-#include <gcr/gcr-secure-entry-buffer.h>
-#include <gcr/gcr-tree-selector.h>
-#include <gcr/gcr-union-collection.h>
-#include <gcr/gcr-unlock-options-widget.h>
-#include <gcr/gcr-viewer.h>
-#include <gcr/gcr-viewer-widget.h>
+#include "gcr-ui.h"
 
 #undef __GCR_INSIDE_HEADER__
 
diff --git a/gcr/gcr.pc.in b/gcr/gcr.pc.in
index 5410bfa..c118b1e 100644
--- a/gcr/gcr.pc.in
+++ b/gcr/gcr.pc.in
@@ -5,12 +5,8 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
-pkcs11dir=@P11_MODULE_PATH@
-pkcs11standalonedir=@pkcs11standalonedir@
 
 Name: gcr-@GCR_MAJOR@
 Description: GObject and GUI library for high level crypto parsing and display
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gcr-base-@GCR_MAJOR@ gck-@GCK_MAJOR@ p11-kit-1
-Libs: -L${libdir} -lgcr-@GCR_MAJOR@
-Cflags: -I${includedir}/gcr-@GCR_MAJOR@
+Requires: gcr-ui-@GCR_MAJOR@ gcr-base-@GCR_MAJOR@