GNOME.org
 

[gcr/main: 9/27] Rename gcr-ui into gcr-gtk3


commit 0ad4f809d4e2ffa93ed1a4bd2c24e3d74a23fc2b
Author: Corentin Noël <corentin elementary io>
Date:   Tue Nov 30 23:56:31 2021 +0100

    Rename gcr-ui into gcr-gtk3

 .gitlab-ci.yml                                     |   2 +-
 .../gcr-ui.toml.in => gcr-gtk3/gcr-gtk3.toml.in}   |   0
 .../{ui => gcr-gtk3}/images/certificate-widget.png | Bin
 docs/{ui => gcr-gtk3}/images/combo-selector.png    | Bin
 docs/{ui => gcr-gtk3}/images/import-button.png     | Bin
 docs/{ui => gcr-gtk3}/images/key-widget.png        | Bin
 docs/{ui => gcr-gtk3}/images/list-selector.png     | Bin
 docs/{ui => gcr-gtk3}/images/tree-selector.png     | Bin
 docs/{ui => gcr-gtk3}/images/viewer-widget.png     | Bin
 docs/{ui => gcr-gtk3}/meson.build                  |  16 ++--
 docs/{ui => gcr-gtk3}/widget-gallery.md            |   0
 docs/meson.build                                   |   4 +-
 {ui => gcr-gtk3}/GcrUi-3.metadata                  |   0
 {ui => gcr-gtk3}/eggimagemenuitem.c                |   0
 {ui => gcr-gtk3}/eggimagemenuitem.h                |   0
 {ui => gcr-gtk3}/fixtures/ca-certificates.crt      |   0
 {ui => gcr-gtk3}/fixtures/der-certificate.crt      | Bin
 {ui => gcr-gtk3}/fixtures/der-rsa-2048.p10         | Bin
 {ui => gcr-gtk3}/fixtures/email.p12                | Bin
 {ui => gcr-gtk3}/fixtures/pem-dsa-1024.key         |   0
 {ui => gcr-gtk3}/frob-certificate.c                |   4 +-
 {ui => gcr-gtk3}/frob-combo-selector.c             |   4 +-
 {ui => gcr-gtk3}/frob-gnupg-selector.c             |   4 +-
 {ui => gcr-gtk3}/frob-import-button.c              |   4 +-
 {ui => gcr-gtk3}/frob-key.c                        |   4 +-
 {ui => gcr-gtk3}/frob-prompt.c                     |   2 +-
 {ui => gcr-gtk3}/frob-request.c                    |   4 +-
 {ui => gcr-gtk3}/frob-system-prompt.c              |   0
 {ui => gcr-gtk3}/frob-tree-selector.c              |   4 +-
 {ui => gcr-gtk3}/frob-unlock-options.c             |   2 +-
 {ui => gcr-gtk3}/frob-unlock.c                     |   6 +-
 {ui => gcr-gtk3}/gcr-certificate-basics-widget.c   |   0
 {ui => gcr-gtk3}/gcr-certificate-basics-widget.h   |   0
 {ui => gcr-gtk3}/gcr-certificate-details-widget.c  |   0
 {ui => gcr-gtk3}/gcr-certificate-details-widget.h  |   0
 {ui => gcr-gtk3}/gcr-certificate-exporter.c        |   0
 {ui => gcr-gtk3}/gcr-certificate-exporter.h        |   0
 .../gcr-certificate-renderer-private.h             |   0
 {ui => gcr-gtk3}/gcr-certificate-renderer.c        |   0
 {ui => gcr-gtk3}/gcr-certificate-renderer.h        |   0
 .../gcr-certificate-request-renderer.c             |   0
 .../gcr-certificate-request-renderer.h             |   0
 {ui => gcr-gtk3}/gcr-certificate-widget.c          |   0
 {ui => gcr-gtk3}/gcr-certificate-widget.h          |   0
 {ui => gcr-gtk3}/gcr-collection-model.c            |   2 +-
 {ui => gcr-gtk3}/gcr-collection-model.h            |   0
 {ui => gcr-gtk3}/gcr-combo-selector.c              |   0
 {ui => gcr-gtk3}/gcr-combo-selector.h              |   0
 {ui => gcr-gtk3}/gcr-crypto-types.xml              |   0
 {ui => gcr-gtk3}/gcr-deprecated.h                  |   0
 {ui => gcr-gtk3}/gcr-dialog-util.c                 |   0
 {ui => gcr-gtk3}/gcr-dialog-util.h                 |   0
 {ui => gcr-gtk3}/gcr-display-scrolled.c            |   0
 {ui => gcr-gtk3}/gcr-display-scrolled.h            |   0
 {ui => gcr-gtk3}/gcr-display-view.c                |   0
 {ui => gcr-gtk3}/gcr-display-view.h                |   0
 {ui => gcr-gtk3}/gcr-failure-renderer.c            |   0
 {ui => gcr-gtk3}/gcr-failure-renderer.h            |   0
 {ui => gcr-gtk3}/gcr-gnupg-renderer.c              |   0
 {ui => gcr-gtk3}/gcr-gnupg-renderer.h              |   0
 ui/gcr-ui.h => gcr-gtk3/gcr-gtk3.h                 |  46 +++++-----
 ui/gcr-ui.pc.in => gcr-gtk3/gcr-gtk3.pc.in         |   0
 ui/gcr-ui.symbols => gcr-gtk3/gcr-gtk3.symbols     |   0
 {ui => gcr-gtk3}/gcr-import-button.c               |   0
 {ui => gcr-gtk3}/gcr-import-button.h               |   0
 {ui => gcr-gtk3}/gcr-key-renderer.c                |   0
 {ui => gcr-gtk3}/gcr-key-renderer.h                |   0
 {ui => gcr-gtk3}/gcr-key-widget.c                  |   0
 {ui => gcr-gtk3}/gcr-key-widget.h                  |   0
 {ui => gcr-gtk3}/gcr-list-selector-private.h       |   0
 {ui => gcr-gtk3}/gcr-list-selector.c               |   0
 {ui => gcr-gtk3}/gcr-list-selector.h               |   0
 {ui => gcr-gtk3}/gcr-live-search.c                 |   0
 {ui => gcr-gtk3}/gcr-live-search.h                 |   0
 {ui => gcr-gtk3}/gcr-pkcs11-import-dialog.c        |   2 +-
 {ui => gcr-gtk3}/gcr-pkcs11-import-dialog.h        |   0
 {ui => gcr-gtk3}/gcr-pkcs11-import-dialog.ui       |   0
 {ui => gcr-gtk3}/gcr-pkcs11-import-interaction.c   |   0
 {ui => gcr-gtk3}/gcr-pkcs11-import-interaction.h   |   0
 {ui => gcr-gtk3}/gcr-prompt-dialog.c               |   0
 {ui => gcr-gtk3}/gcr-prompt-dialog.h               |   0
 {ui => gcr-gtk3}/gcr-prompter-tool.c               |   2 +-
 {ui => gcr-gtk3}/gcr-prompter.desktop.in.in        |   0
 {ui => gcr-gtk3}/gcr-renderer.c                    |   0
 {ui => gcr-gtk3}/gcr-renderer.h                    |   0
 {ui => gcr-gtk3}/gcr-secure-entry-buffer.c         |   0
 {ui => gcr-gtk3}/gcr-secure-entry-buffer.h         |   0
 {ui => gcr-gtk3}/gcr-tree-selector.c               |   0
 {ui => gcr-gtk3}/gcr-tree-selector.h               |   0
 {ui => gcr-gtk3}/gcr-unlock-options-widget.c       |   2 +-
 {ui => gcr-gtk3}/gcr-unlock-options-widget.h       |   0
 {ui => gcr-gtk3}/gcr-unlock-options-widget.ui      |   0
 {ui => gcr-gtk3}/gcr-unlock-renderer.c             |   0
 {ui => gcr-gtk3}/gcr-unlock-renderer.h             |   0
 {ui => gcr-gtk3}/gcr-viewer-tool.c                 |   0
 {ui => gcr-gtk3}/gcr-viewer-widget.c               |   0
 {ui => gcr-gtk3}/gcr-viewer-widget.h               |   0
 {ui => gcr-gtk3}/gcr-viewer-window.c               |   0
 {ui => gcr-gtk3}/gcr-viewer-window.h               |   2 +-
 {ui => gcr-gtk3}/gcr-viewer.c                      |   0
 {ui => gcr-gtk3}/gcr-viewer.desktop.in.in          |   0
 {ui => gcr-gtk3}/gcr-viewer.h                      |   0
 {ui => gcr-gtk3}/gcr.gresource.xml                 |   0
 {ui => gcr-gtk3}/icons/16x16/gcr-gnupg.png         | Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-key-pair.png      | Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-key.png           | Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-password.png      | Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-smart-card.png    | Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-gnupg.png         | Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-key-pair.png      | Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-key.png           | Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-password.png      | Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-smart-card.png    | Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-gnupg.png         | Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-key-pair.png      | Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-key.png           | Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-password.png      | Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-smart-card.png    | Bin
 {ui => gcr-gtk3}/icons/256x256/gcr-gnupg.png       | Bin
 {ui => gcr-gtk3}/icons/256x256/gcr-password.png    | Bin
 {ui => gcr-gtk3}/icons/256x256/gcr-smart-card.png  | Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-gnupg.png         | Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-key-pair.png      | Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-key.png           | Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-password.png      | Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-smart-card.png    | Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-gnupg.png         | Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-key-pair.png      | Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-key.png           | Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-password.png      | Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-smart-card.png    | Bin
 {ui => gcr-gtk3}/icons/meson.build                 |   0
 {ui => gcr-gtk3}/icons/render-icons.py             |   4 +-
 {ui => gcr-gtk3}/icons/src/gcr-gnupg.svg           |   0
 {ui => gcr-gtk3}/icons/src/gcr-key-and-keypair.svg |   0
 {ui => gcr-gtk3}/icons/src/gcr-password.svg        |   0
 {ui => gcr-gtk3}/icons/src/gcr-smart-card.svg      |   0
 ui/libgcr-ui.map => gcr-gtk3/libgcr-gtk3.map       |   0
 {ui => gcr-gtk3}/meson.build                       |  99 ++++++++++-----------
 meson.build                                        |   2 +-
 po/POTFILES.in                                     |  40 ++++-----
 141 files changed, 130 insertions(+), 131 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab1e24f..bcaed16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ pages:
     - mv _build/meson-logs/coveragereport public/coverage
     - mv _build/docs/gck/gck-1 public/gck-4
     - mv _build/docs/gcr/gcr-3 public/gcr-4
-    - mv _build/docs/ui/gcr-ui-3 public/gcr-gtk-4
+    - mv _build/docs/gcr-gtk3/gcr-gtk3-3 public/gcr-gtk-4
   artifacts:
     when: on_success
     paths:
diff --git a/docs/ui/gcr-ui.toml.in b/docs/gcr-gtk3/gcr-gtk3.toml.in
similarity index 100%
rename from docs/ui/gcr-ui.toml.in
rename to docs/gcr-gtk3/gcr-gtk3.toml.in
diff --git a/docs/ui/images/certificate-widget.png b/docs/gcr-gtk3/images/certificate-widget.png
similarity index 100%
rename from docs/ui/images/certificate-widget.png
rename to docs/gcr-gtk3/images/certificate-widget.png
diff --git a/docs/ui/images/combo-selector.png b/docs/gcr-gtk3/images/combo-selector.png
similarity index 100%
rename from docs/ui/images/combo-selector.png
rename to docs/gcr-gtk3/images/combo-selector.png
diff --git a/docs/ui/images/import-button.png b/docs/gcr-gtk3/images/import-button.png
similarity index 100%
rename from docs/ui/images/import-button.png
rename to docs/gcr-gtk3/images/import-button.png
diff --git a/docs/ui/images/key-widget.png b/docs/gcr-gtk3/images/key-widget.png
similarity index 100%
rename from docs/ui/images/key-widget.png
rename to docs/gcr-gtk3/images/key-widget.png
diff --git a/docs/ui/images/list-selector.png b/docs/gcr-gtk3/images/list-selector.png
similarity index 100%
rename from docs/ui/images/list-selector.png
rename to docs/gcr-gtk3/images/list-selector.png
diff --git a/docs/ui/images/tree-selector.png b/docs/gcr-gtk3/images/tree-selector.png
similarity index 100%
rename from docs/ui/images/tree-selector.png
rename to docs/gcr-gtk3/images/tree-selector.png
diff --git a/docs/ui/images/viewer-widget.png b/docs/gcr-gtk3/images/viewer-widget.png
similarity index 100%
rename from docs/ui/images/viewer-widget.png
rename to docs/gcr-gtk3/images/viewer-widget.png
diff --git a/docs/ui/meson.build b/docs/gcr-gtk3/meson.build
similarity index 66%
rename from docs/ui/meson.build
rename to docs/gcr-gtk3/meson.build
index 49ea4ca..8c4d8f6 100644
--- a/docs/ui/meson.build
+++ b/docs/gcr-gtk3/meson.build
@@ -1,9 +1,9 @@
-gcr_ui_content_files = [
+gcr_gtk3_content_files = [
   'widget-gallery.md',
 ]
 
-gcr_ui_toml = configure_file(
-  input: 'gcr-ui.toml.in',
+gcr_gtk3_toml = configure_file(
+  input: 'gcr-gtk3.toml.in',
   output: '@BASENAME@',
   configuration: {
     'GCR_VERSION': gcr_major_version,
@@ -11,9 +11,9 @@ gcr_ui_toml = configure_file(
   },
 )
 
-gcr_ui_docs = custom_target('gcr-ui-docs',
-  input: gcr_ui_gir[0],
-  output: 'gcr-ui-@0@'.format(gcr_major_version),
+gcr_gtk3_docs = custom_target('gcr-gtk3-docs',
+  input: gcr_gtk3_gir[0],
+  output: 'gcr-gtk3-@0@'.format(gcr_major_version),
   command: [
     gi_docgen,
     'generate',
@@ -21,13 +21,13 @@ gcr_ui_docs = custom_target('gcr-ui-docs',
     '--fatal-warnings',
     '--add-include-path=@0@'.format(build_root / 'gck'),
     '--add-include-path=@0@'.format(build_root / 'gcr'),
-    '--config', gcr_ui_toml,
+    '--config', gcr_gtk3_toml,
     '--output-dir=@OUTPUT@',
     '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '@INPUT@',
   ],
-  depend_files: [ gcr_ui_toml, gcr_ui_content_files ],
+  depend_files: [ gcr_gtk3_toml, gcr_gtk3_content_files ],
   depends: [ gck_gir[0], gcr_gir[0] ],
   build_by_default: true,
   install: true,
diff --git a/docs/ui/widget-gallery.md b/docs/gcr-gtk3/widget-gallery.md
similarity index 100%
rename from docs/ui/widget-gallery.md
rename to docs/gcr-gtk3/widget-gallery.md
diff --git a/docs/meson.build b/docs/meson.build
index 9cdebc3..aa1b11b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -2,11 +2,11 @@ gi_docgen = find_program('gi-docgen')
 
 subdir('gck')
 subdir('gcr')
-subdir('ui')
+subdir('gcr-gtk3')
 
 # Create a pseudo target that build all docs at once
 alias_target('docs',
   gck_docs,
   gcr_docs,
-  gcr_ui_docs,
+  gcr_gtk3_docs,
 )
diff --git a/ui/GcrUi-3.metadata b/gcr-gtk3/GcrUi-3.metadata
similarity index 100%
rename from ui/GcrUi-3.metadata
rename to gcr-gtk3/GcrUi-3.metadata
diff --git a/ui/eggimagemenuitem.c b/gcr-gtk3/eggimagemenuitem.c
similarity index 100%
rename from ui/eggimagemenuitem.c
rename to gcr-gtk3/eggimagemenuitem.c
diff --git a/ui/eggimagemenuitem.h b/gcr-gtk3/eggimagemenuitem.h
similarity index 100%
rename from ui/eggimagemenuitem.h
rename to gcr-gtk3/eggimagemenuitem.h
diff --git a/ui/fixtures/ca-certificates.crt b/gcr-gtk3/fixtures/ca-certificates.crt
similarity index 100%
rename from ui/fixtures/ca-certificates.crt
rename to gcr-gtk3/fixtures/ca-certificates.crt
diff --git a/ui/fixtures/der-certificate.crt b/gcr-gtk3/fixtures/der-certificate.crt
similarity index 100%
rename from ui/fixtures/der-certificate.crt
rename to gcr-gtk3/fixtures/der-certificate.crt
diff --git a/ui/fixtures/der-rsa-2048.p10 b/gcr-gtk3/fixtures/der-rsa-2048.p10
similarity index 100%
rename from ui/fixtures/der-rsa-2048.p10
rename to gcr-gtk3/fixtures/der-rsa-2048.p10
diff --git a/ui/fixtures/email.p12 b/gcr-gtk3/fixtures/email.p12
similarity index 100%
rename from ui/fixtures/email.p12
rename to gcr-gtk3/fixtures/email.p12
diff --git a/ui/fixtures/pem-dsa-1024.key b/gcr-gtk3/fixtures/pem-dsa-1024.key
similarity index 100%
rename from ui/fixtures/pem-dsa-1024.key
rename to gcr-gtk3/fixtures/pem-dsa-1024.key
diff --git a/ui/frob-certificate.c b/gcr-gtk3/frob-certificate.c
similarity index 96%
rename from ui/frob-certificate.c
rename to gcr-gtk3/frob-certificate.c
index f476ea5..41a5c0b 100644
--- a/ui/frob-certificate.c
+++ b/gcr-gtk3/frob-certificate.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include "egg/egg-hex.h"
 
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
        if (argc > 1)
                test_certificate (argv[1]);
        else
-               test_certificate (SRCDIR "/ui/fixtures/der-certificate.crt");
+               test_certificate (SRCDIR "/gcr-gtk3/fixtures/der-certificate.crt");
 
        return 0;
 }
diff --git a/ui/frob-combo-selector.c b/gcr-gtk3/frob-combo-selector.c
similarity index 95%
rename from ui/frob-combo-selector.c
rename to gcr-gtk3/frob-combo-selector.c
index 8a467f6..3ec9a3e 100644
--- a/ui/frob-combo-selector.c
+++ b/gcr-gtk3/frob-combo-selector.c
@@ -2,7 +2,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include <gtk/gtk.h>
 
@@ -71,7 +71,7 @@ main (int argc, char *argv[])
        g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_parsed), collection);
 
        if (argc == 1) {
-               add_to_selector (parser, SRCDIR "/ui/fixtures/ca-certificates.crt");
+               add_to_selector (parser, SRCDIR "/gcr-gtk3/fixtures/ca-certificates.crt");
        } else {
                for (i = 1; i < argc; ++i)
                        add_to_selector (parser, argv[i]);
diff --git a/ui/frob-gnupg-selector.c b/gcr-gtk3/frob-gnupg-selector.c
similarity index 96%
rename from ui/frob-gnupg-selector.c
rename to gcr-gtk3/frob-gnupg-selector.c
index 41b1977..7af6e30 100644
--- a/ui/frob-gnupg-selector.c
+++ b/gcr-gtk3/frob-gnupg-selector.c
@@ -25,8 +25,8 @@
 #include "gcr/gcr-gnupg-collection.h"
 #include "gcr/gcr-gnupg-key.h"
 
-#include "ui/gcr-live-search.h"
-#include "ui/gcr-list-selector-private.h"
+#include "gcr-gtk3/gcr-live-search.h"
+#include "gcr-gtk3/gcr-list-selector-private.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/frob-import-button.c b/gcr-gtk3/frob-import-button.c
similarity index 98%
rename from ui/frob-import-button.c
rename to gcr-gtk3/frob-import-button.c
index d876d81..8b4d4c6 100644
--- a/ui/frob-import-button.c
+++ b/gcr-gtk3/frob-import-button.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include "gcr/gcr-importer.h"
 
@@ -234,7 +234,7 @@ main (int argc, char *argv[])
        g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_parsed), button);
 
        if (argc == 1) {
-               parse_file (parser, SRCDIR "/ui/fixtures/ca-certificates.crt");
+               parse_file (parser, SRCDIR "/gcr-gtk3/fixtures/ca-certificates.crt");
        } else {
                for (i = 1; i < argc; ++i)
                        parse_file (parser, argv[i]);
diff --git a/ui/frob-key.c b/gcr-gtk3/frob-key.c
similarity index 96%
rename from ui/frob-key.c
rename to gcr-gtk3/frob-key.c
index 2d8079a..ae0a106 100644
--- a/ui/frob-key.c
+++ b/gcr-gtk3/frob-key.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include <gtk/gtk.h>
 
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
        if (argc > 1)
                test_key (argv[1]);
        else
-               test_key (SRCDIR "/ui/fixtures/pem-dsa-1024.key");
+               test_key (SRCDIR "/gcr-gtk3/fixtures/pem-dsa-1024.key");
 
        return 0;
 }
diff --git a/ui/frob-prompt.c b/gcr-gtk3/frob-prompt.c
similarity index 99%
rename from ui/frob-prompt.c
rename to gcr-gtk3/frob-prompt.c
index bf8c509..8ac11c7 100644
--- a/ui/frob-prompt.c
+++ b/gcr-gtk3/frob-prompt.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
diff --git a/ui/frob-request.c b/gcr-gtk3/frob-request.c
similarity index 95%
rename from ui/frob-request.c
rename to gcr-gtk3/frob-request.c
index 1d2f946..0c7e857 100644
--- a/ui/frob-request.c
+++ b/gcr-gtk3/frob-request.c
@@ -23,7 +23,7 @@
 
 #include "gcr/gcr.h"
 
-#include "ui/gcr-certificate-request-renderer.h"
+#include "gcr-gtk3/gcr-certificate-request-renderer.h"
 
 #include <gtk/gtk.h>
 
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
        if (argc > 1)
                test_request (argv[1]);
        else
-               test_request (SRCDIR "/ui/fixtures/der-rsa-2048.p10");
+               test_request (SRCDIR "/gcr-gtk3/fixtures/der-rsa-2048.p10");
 
        return 0;
 }
diff --git a/ui/frob-system-prompt.c b/gcr-gtk3/frob-system-prompt.c
similarity index 100%
rename from ui/frob-system-prompt.c
rename to gcr-gtk3/frob-system-prompt.c
diff --git a/ui/frob-tree-selector.c b/gcr-gtk3/frob-tree-selector.c
similarity index 98%
rename from ui/frob-tree-selector.c
rename to gcr-gtk3/frob-tree-selector.c
index a7df398..e2567b7 100644
--- a/ui/frob-tree-selector.c
+++ b/gcr-gtk3/frob-tree-selector.c
@@ -2,7 +2,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include <gtk/gtk.h>
 
@@ -185,7 +185,7 @@ main (int argc, char *argv[])
        g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_parsed), collection);
 
        if (argc == 1) {
-               add_to_selector (parser, SRCDIR "/ui/fixtures/ca-certificates.crt");
+               add_to_selector (parser, SRCDIR "/gcr-gtk3/fixtures/ca-certificates.crt");
        } else {
                for (i = 1; i < argc; ++i)
                        add_to_selector (parser, argv[i]);
diff --git a/ui/frob-unlock-options.c b/gcr-gtk3/frob-unlock-options.c
similarity index 98%
rename from ui/frob-unlock-options.c
rename to gcr-gtk3/frob-unlock-options.c
index d5bc7d5..23455cc 100644
--- a/ui/frob-unlock-options.c
+++ b/gcr-gtk3/frob-unlock-options.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/frob-unlock.c b/gcr-gtk3/frob-unlock.c
similarity index 95%
rename from ui/frob-unlock.c
rename to gcr-gtk3/frob-unlock.c
index 4919765..d7ca298 100644
--- a/ui/frob-unlock.c
+++ b/gcr-gtk3/frob-unlock.c
@@ -23,8 +23,8 @@
 
 #include "gcr/gcr.h"
 
-#include "ui/gcr-unlock-renderer.h"
-#include "ui/gcr-viewer-window.h"
+#include "gcr-gtk3/gcr-unlock-renderer.h"
+#include "gcr-gtk3/gcr-viewer-window.h"
 
 #include <gtk/gtk.h>
 
@@ -116,7 +116,7 @@ main(int argc, char *argv[])
        if (argc > 1) {
                test_key (argv[1]);
        } else {
-               test_key (SRCDIR "/ui/fixtures/email.p12");
+               test_key (SRCDIR "/gcr-gtk3/fixtures/email.p12");
        }
 
        return 0;
diff --git a/ui/gcr-certificate-basics-widget.c b/gcr-gtk3/gcr-certificate-basics-widget.c
similarity index 100%
rename from ui/gcr-certificate-basics-widget.c
rename to gcr-gtk3/gcr-certificate-basics-widget.c
diff --git a/ui/gcr-certificate-basics-widget.h b/gcr-gtk3/gcr-certificate-basics-widget.h
similarity index 100%
rename from ui/gcr-certificate-basics-widget.h
rename to gcr-gtk3/gcr-certificate-basics-widget.h
diff --git a/ui/gcr-certificate-details-widget.c b/gcr-gtk3/gcr-certificate-details-widget.c
similarity index 100%
rename from ui/gcr-certificate-details-widget.c
rename to gcr-gtk3/gcr-certificate-details-widget.c
diff --git a/ui/gcr-certificate-details-widget.h b/gcr-gtk3/gcr-certificate-details-widget.h
similarity index 100%
rename from ui/gcr-certificate-details-widget.h
rename to gcr-gtk3/gcr-certificate-details-widget.h
diff --git a/ui/gcr-certificate-exporter.c b/gcr-gtk3/gcr-certificate-exporter.c
similarity index 100%
rename from ui/gcr-certificate-exporter.c
rename to gcr-gtk3/gcr-certificate-exporter.c
diff --git a/ui/gcr-certificate-exporter.h b/gcr-gtk3/gcr-certificate-exporter.h
similarity index 100%
rename from ui/gcr-certificate-exporter.h
rename to gcr-gtk3/gcr-certificate-exporter.h
diff --git a/ui/gcr-certificate-renderer-private.h b/gcr-gtk3/gcr-certificate-renderer-private.h
similarity index 100%
rename from ui/gcr-certificate-renderer-private.h
rename to gcr-gtk3/gcr-certificate-renderer-private.h
diff --git a/ui/gcr-certificate-renderer.c b/gcr-gtk3/gcr-certificate-renderer.c
similarity index 100%
rename from ui/gcr-certificate-renderer.c
rename to gcr-gtk3/gcr-certificate-renderer.c
diff --git a/ui/gcr-certificate-renderer.h b/gcr-gtk3/gcr-certificate-renderer.h
similarity index 100%
rename from ui/gcr-certificate-renderer.h
rename to gcr-gtk3/gcr-certificate-renderer.h
diff --git a/ui/gcr-certificate-request-renderer.c b/gcr-gtk3/gcr-certificate-request-renderer.c
similarity index 100%
rename from ui/gcr-certificate-request-renderer.c
rename to gcr-gtk3/gcr-certificate-request-renderer.c
diff --git a/ui/gcr-certificate-request-renderer.h b/gcr-gtk3/gcr-certificate-request-renderer.h
similarity index 100%
rename from ui/gcr-certificate-request-renderer.h
rename to gcr-gtk3/gcr-certificate-request-renderer.h
diff --git a/ui/gcr-certificate-widget.c b/gcr-gtk3/gcr-certificate-widget.c
similarity index 100%
rename from ui/gcr-certificate-widget.c
rename to gcr-gtk3/gcr-certificate-widget.c
diff --git a/ui/gcr-certificate-widget.h b/gcr-gtk3/gcr-certificate-widget.h
similarity index 100%
rename from ui/gcr-certificate-widget.h
rename to gcr-gtk3/gcr-certificate-widget.h
diff --git a/ui/gcr-collection-model.c b/gcr-gtk3/gcr-collection-model.c
similarity index 99%
rename from ui/gcr-collection-model.c
rename to gcr-gtk3/gcr-collection-model.c
index f2d0736..29be449 100644
--- a/ui/gcr-collection-model.c
+++ b/gcr-gtk3/gcr-collection-model.c
@@ -24,7 +24,7 @@
 
 #include "gcr-collection-model.h"
 
-#include "ui/gcr-enum-types.h"
+#include "gcr-gtk3/gcr-enum-types.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/gcr-collection-model.h b/gcr-gtk3/gcr-collection-model.h
similarity index 100%
rename from ui/gcr-collection-model.h
rename to gcr-gtk3/gcr-collection-model.h
diff --git a/ui/gcr-combo-selector.c b/gcr-gtk3/gcr-combo-selector.c
similarity index 100%
rename from ui/gcr-combo-selector.c
rename to gcr-gtk3/gcr-combo-selector.c
diff --git a/ui/gcr-combo-selector.h b/gcr-gtk3/gcr-combo-selector.h
similarity index 100%
rename from ui/gcr-combo-selector.h
rename to gcr-gtk3/gcr-combo-selector.h
diff --git a/ui/gcr-crypto-types.xml b/gcr-gtk3/gcr-crypto-types.xml
similarity index 100%
rename from ui/gcr-crypto-types.xml
rename to gcr-gtk3/gcr-crypto-types.xml
diff --git a/ui/gcr-deprecated.h b/gcr-gtk3/gcr-deprecated.h
similarity index 100%
rename from ui/gcr-deprecated.h
rename to gcr-gtk3/gcr-deprecated.h
diff --git a/ui/gcr-dialog-util.c b/gcr-gtk3/gcr-dialog-util.c
similarity index 100%
rename from ui/gcr-dialog-util.c
rename to gcr-gtk3/gcr-dialog-util.c
diff --git a/ui/gcr-dialog-util.h b/gcr-gtk3/gcr-dialog-util.h
similarity index 100%
rename from ui/gcr-dialog-util.h
rename to gcr-gtk3/gcr-dialog-util.h
diff --git a/ui/gcr-display-scrolled.c b/gcr-gtk3/gcr-display-scrolled.c
similarity index 100%
rename from ui/gcr-display-scrolled.c
rename to gcr-gtk3/gcr-display-scrolled.c
diff --git a/ui/gcr-display-scrolled.h b/gcr-gtk3/gcr-display-scrolled.h
similarity index 100%
rename from ui/gcr-display-scrolled.h
rename to gcr-gtk3/gcr-display-scrolled.h
diff --git a/ui/gcr-display-view.c b/gcr-gtk3/gcr-display-view.c
similarity index 100%
rename from ui/gcr-display-view.c
rename to gcr-gtk3/gcr-display-view.c
diff --git a/ui/gcr-display-view.h b/gcr-gtk3/gcr-display-view.h
similarity index 100%
rename from ui/gcr-display-view.h
rename to gcr-gtk3/gcr-display-view.h
diff --git a/ui/gcr-failure-renderer.c b/gcr-gtk3/gcr-failure-renderer.c
similarity index 100%
rename from ui/gcr-failure-renderer.c
rename to gcr-gtk3/gcr-failure-renderer.c
diff --git a/ui/gcr-failure-renderer.h b/gcr-gtk3/gcr-failure-renderer.h
similarity index 100%
rename from ui/gcr-failure-renderer.h
rename to gcr-gtk3/gcr-failure-renderer.h
diff --git a/ui/gcr-gnupg-renderer.c b/gcr-gtk3/gcr-gnupg-renderer.c
similarity index 100%
rename from ui/gcr-gnupg-renderer.c
rename to gcr-gtk3/gcr-gnupg-renderer.c
diff --git a/ui/gcr-gnupg-renderer.h b/gcr-gtk3/gcr-gnupg-renderer.h
similarity index 100%
rename from ui/gcr-gnupg-renderer.h
rename to gcr-gtk3/gcr-gnupg-renderer.h
diff --git a/ui/gcr-ui.h b/gcr-gtk3/gcr-gtk3.h
similarity index 52%
rename from ui/gcr-ui.h
rename to gcr-gtk3/gcr-gtk3.h
index 2d0c1f7..8320bbd 100644
--- a/ui/gcr-ui.h
+++ b/gcr-gtk3/gcr-gtk3.h
@@ -23,8 +23,8 @@
 #error "This API has not yet reached stability."
 #endif
 
-#ifndef __GCR_UI_H__
-#define __GCR_UI_H__
+#ifndef __GCR_GTK3_H__
+#define __GCR_GTK3_H__
 
 #include <glib.h>
 
@@ -32,27 +32,27 @@
 
 #define __GCR_INSIDE_HEADER__
 
-#include <ui/gcr-certificate-renderer.h>
-#include <ui/gcr-certificate-widget.h>
-#include <ui/gcr-collection-model.h>
-#include <ui/gcr-combo-selector.h>
-#include <ui/gcr-deprecated.h>
-#include <ui/gcr-enum-types.h>
-#include <ui/gcr-key-renderer.h>
-#include <ui/gcr-key-widget.h>
-#include <ui/gcr-failure-renderer.h>
-#include <ui/gcr-key-renderer.h>
-#include <ui/gcr-key-widget.h>
-#include <ui/gcr-import-button.h>
-#include <ui/gcr-list-selector.h>
-#include <ui/gcr-prompt-dialog.h>
-#include <ui/gcr-renderer.h>
-#include <ui/gcr-secure-entry-buffer.h>
-#include <ui/gcr-tree-selector.h>
-#include <ui/gcr-unlock-options-widget.h>
-#include <ui/gcr-viewer.h>
-#include <ui/gcr-viewer-widget.h>
+#include <gcr-gtk3/gcr-certificate-renderer.h>
+#include <gcr-gtk3/gcr-certificate-widget.h>
+#include <gcr-gtk3/gcr-collection-model.h>
+#include <gcr-gtk3/gcr-combo-selector.h>
+#include <gcr-gtk3/gcr-deprecated.h>
+#include <gcr-gtk3/gcr-enum-types.h>
+#include <gcr-gtk3/gcr-key-renderer.h>
+#include <gcr-gtk3/gcr-key-widget.h>
+#include <gcr-gtk3/gcr-failure-renderer.h>
+#include <gcr-gtk3/gcr-key-renderer.h>
+#include <gcr-gtk3/gcr-key-widget.h>
+#include <gcr-gtk3/gcr-import-button.h>
+#include <gcr-gtk3/gcr-list-selector.h>
+#include <gcr-gtk3/gcr-prompt-dialog.h>
+#include <gcr-gtk3/gcr-renderer.h>
+#include <gcr-gtk3/gcr-secure-entry-buffer.h>
+#include <gcr-gtk3/gcr-tree-selector.h>
+#include <gcr-gtk3/gcr-unlock-options-widget.h>
+#include <gcr-gtk3/gcr-viewer.h>
+#include <gcr-gtk3/gcr-viewer-widget.h>
 
 #undef __GCR_INSIDE_HEADER__
 
-#endif /* __GCR_UI_H__ */
+#endif /* __GCR_GTK3_H__ */
diff --git a/ui/gcr-ui.pc.in b/gcr-gtk3/gcr-gtk3.pc.in
similarity index 100%
rename from ui/gcr-ui.pc.in
rename to gcr-gtk3/gcr-gtk3.pc.in
diff --git a/ui/gcr-ui.symbols b/gcr-gtk3/gcr-gtk3.symbols
similarity index 100%
rename from ui/gcr-ui.symbols
rename to gcr-gtk3/gcr-gtk3.symbols
diff --git a/ui/gcr-import-button.c b/gcr-gtk3/gcr-import-button.c
similarity index 100%
rename from ui/gcr-import-button.c
rename to gcr-gtk3/gcr-import-button.c
diff --git a/ui/gcr-import-button.h b/gcr-gtk3/gcr-import-button.h
similarity index 100%
rename from ui/gcr-import-button.h
rename to gcr-gtk3/gcr-import-button.h
diff --git a/ui/gcr-key-renderer.c b/gcr-gtk3/gcr-key-renderer.c
similarity index 100%
rename from ui/gcr-key-renderer.c
rename to gcr-gtk3/gcr-key-renderer.c
diff --git a/ui/gcr-key-renderer.h b/gcr-gtk3/gcr-key-renderer.h
similarity index 100%
rename from ui/gcr-key-renderer.h
rename to gcr-gtk3/gcr-key-renderer.h
diff --git a/ui/gcr-key-widget.c b/gcr-gtk3/gcr-key-widget.c
similarity index 100%
rename from ui/gcr-key-widget.c
rename to gcr-gtk3/gcr-key-widget.c
diff --git a/ui/gcr-key-widget.h b/gcr-gtk3/gcr-key-widget.h
similarity index 100%
rename from ui/gcr-key-widget.h
rename to gcr-gtk3/gcr-key-widget.h
diff --git a/ui/gcr-list-selector-private.h b/gcr-gtk3/gcr-list-selector-private.h
similarity index 100%
rename from ui/gcr-list-selector-private.h
rename to gcr-gtk3/gcr-list-selector-private.h
diff --git a/ui/gcr-list-selector.c b/gcr-gtk3/gcr-list-selector.c
similarity index 100%
rename from ui/gcr-list-selector.c
rename to gcr-gtk3/gcr-list-selector.c
diff --git a/ui/gcr-list-selector.h b/gcr-gtk3/gcr-list-selector.h
similarity index 100%
rename from ui/gcr-list-selector.h
rename to gcr-gtk3/gcr-list-selector.h
diff --git a/ui/gcr-live-search.c b/gcr-gtk3/gcr-live-search.c
similarity index 100%
rename from ui/gcr-live-search.c
rename to gcr-gtk3/gcr-live-search.c
diff --git a/ui/gcr-live-search.h b/gcr-gtk3/gcr-live-search.h
similarity index 100%
rename from ui/gcr-live-search.h
rename to gcr-gtk3/gcr-live-search.h
diff --git a/ui/gcr-pkcs11-import-dialog.c b/gcr-gtk3/gcr-pkcs11-import-dialog.c
similarity index 99%
rename from ui/gcr-pkcs11-import-dialog.c
rename to gcr-gtk3/gcr-pkcs11-import-dialog.c
index 746b946..01272b8 100644
--- a/ui/gcr-pkcs11-import-dialog.c
+++ b/gcr-gtk3/gcr-pkcs11-import-dialog.c
@@ -71,7 +71,7 @@ _gcr_pkcs11_import_dialog_constructed (GObject *obj)
 
        G_OBJECT_CLASS (_gcr_pkcs11_import_dialog_parent_class)->constructed (obj);
 
-       if (!gtk_builder_add_from_resource (self->builder, "/org/gnome/gcr/ui/gcr-pkcs11-import-dialog.ui", 
&error)) {
+       if (!gtk_builder_add_from_resource (self->builder, 
"/org/gnome/gcr/gcr-gtk3/gcr-pkcs11-import-dialog.ui", &error)) {
                g_warning ("couldn't load ui builder file: %s", error->message);
                return;
        }
diff --git a/ui/gcr-pkcs11-import-dialog.h b/gcr-gtk3/gcr-pkcs11-import-dialog.h
similarity index 100%
rename from ui/gcr-pkcs11-import-dialog.h
rename to gcr-gtk3/gcr-pkcs11-import-dialog.h
diff --git a/ui/gcr-pkcs11-import-dialog.ui b/gcr-gtk3/gcr-pkcs11-import-dialog.ui
similarity index 100%
rename from ui/gcr-pkcs11-import-dialog.ui
rename to gcr-gtk3/gcr-pkcs11-import-dialog.ui
diff --git a/ui/gcr-pkcs11-import-interaction.c b/gcr-gtk3/gcr-pkcs11-import-interaction.c
similarity index 100%
rename from ui/gcr-pkcs11-import-interaction.c
rename to gcr-gtk3/gcr-pkcs11-import-interaction.c
diff --git a/ui/gcr-pkcs11-import-interaction.h b/gcr-gtk3/gcr-pkcs11-import-interaction.h
similarity index 100%
rename from ui/gcr-pkcs11-import-interaction.h
rename to gcr-gtk3/gcr-pkcs11-import-interaction.h
diff --git a/ui/gcr-prompt-dialog.c b/gcr-gtk3/gcr-prompt-dialog.c
similarity index 100%
rename from ui/gcr-prompt-dialog.c
rename to gcr-gtk3/gcr-prompt-dialog.c
diff --git a/ui/gcr-prompt-dialog.h b/gcr-gtk3/gcr-prompt-dialog.h
similarity index 100%
rename from ui/gcr-prompt-dialog.h
rename to gcr-gtk3/gcr-prompt-dialog.h
diff --git a/ui/gcr-prompter-tool.c b/gcr-gtk3/gcr-prompter-tool.c
similarity index 99%
rename from ui/gcr-prompter-tool.c
rename to gcr-gtk3/gcr-prompter-tool.c
index 238e423..b6392ac 100644
--- a/ui/gcr-prompter-tool.c
+++ b/gcr-gtk3/gcr-prompter-tool.c
@@ -24,7 +24,7 @@
 
 #include "gcr/gcr.h"
 #include "gcr/gcr-dbus-constants.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/ui/gcr-prompter.desktop.in.in b/gcr-gtk3/gcr-prompter.desktop.in.in
similarity index 100%
rename from ui/gcr-prompter.desktop.in.in
rename to gcr-gtk3/gcr-prompter.desktop.in.in
diff --git a/ui/gcr-renderer.c b/gcr-gtk3/gcr-renderer.c
similarity index 100%
rename from ui/gcr-renderer.c
rename to gcr-gtk3/gcr-renderer.c
diff --git a/ui/gcr-renderer.h b/gcr-gtk3/gcr-renderer.h
similarity index 100%
rename from ui/gcr-renderer.h
rename to gcr-gtk3/gcr-renderer.h
diff --git a/ui/gcr-secure-entry-buffer.c b/gcr-gtk3/gcr-secure-entry-buffer.c
similarity index 100%
rename from ui/gcr-secure-entry-buffer.c
rename to gcr-gtk3/gcr-secure-entry-buffer.c
diff --git a/ui/gcr-secure-entry-buffer.h b/gcr-gtk3/gcr-secure-entry-buffer.h
similarity index 100%
rename from ui/gcr-secure-entry-buffer.h
rename to gcr-gtk3/gcr-secure-entry-buffer.h
diff --git a/ui/gcr-tree-selector.c b/gcr-gtk3/gcr-tree-selector.c
similarity index 100%
rename from ui/gcr-tree-selector.c
rename to gcr-gtk3/gcr-tree-selector.c
diff --git a/ui/gcr-tree-selector.h b/gcr-gtk3/gcr-tree-selector.h
similarity index 100%
rename from ui/gcr-tree-selector.h
rename to gcr-gtk3/gcr-tree-selector.h
diff --git a/ui/gcr-unlock-options-widget.c b/gcr-gtk3/gcr-unlock-options-widget.c
similarity index 99%
rename from ui/gcr-unlock-options-widget.c
rename to gcr-gtk3/gcr-unlock-options-widget.c
index 7db3257..23d318d 100644
--- a/ui/gcr-unlock-options-widget.c
+++ b/gcr-gtk3/gcr-unlock-options-widget.c
@@ -170,7 +170,7 @@ gcr_unlock_options_widget_constructor (GType type, guint n_props, GObjectConstru
        if (obj) {
                self = GCR_UNLOCK_OPTIONS_WIDGET (obj);
 
-               if (!gtk_builder_add_from_resource (self->pv->builder, 
"/org/gnome/gcr/ui/gcr-unlock-options-widget.ui", NULL))
+               if (!gtk_builder_add_from_resource (self->pv->builder, 
"/org/gnome/gcr/gcr-gtk3/gcr-unlock-options-widget.ui", NULL))
                        g_return_val_if_reached (obj);
 
                widget = GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "unlock-options-widget"));
diff --git a/ui/gcr-unlock-options-widget.h b/gcr-gtk3/gcr-unlock-options-widget.h
similarity index 100%
rename from ui/gcr-unlock-options-widget.h
rename to gcr-gtk3/gcr-unlock-options-widget.h
diff --git a/ui/gcr-unlock-options-widget.ui b/gcr-gtk3/gcr-unlock-options-widget.ui
similarity index 100%
rename from ui/gcr-unlock-options-widget.ui
rename to gcr-gtk3/gcr-unlock-options-widget.ui
diff --git a/ui/gcr-unlock-renderer.c b/gcr-gtk3/gcr-unlock-renderer.c
similarity index 100%
rename from ui/gcr-unlock-renderer.c
rename to gcr-gtk3/gcr-unlock-renderer.c
diff --git a/ui/gcr-unlock-renderer.h b/gcr-gtk3/gcr-unlock-renderer.h
similarity index 100%
rename from ui/gcr-unlock-renderer.h
rename to gcr-gtk3/gcr-unlock-renderer.h
diff --git a/ui/gcr-viewer-tool.c b/gcr-gtk3/gcr-viewer-tool.c
similarity index 100%
rename from ui/gcr-viewer-tool.c
rename to gcr-gtk3/gcr-viewer-tool.c
diff --git a/ui/gcr-viewer-widget.c b/gcr-gtk3/gcr-viewer-widget.c
similarity index 100%
rename from ui/gcr-viewer-widget.c
rename to gcr-gtk3/gcr-viewer-widget.c
diff --git a/ui/gcr-viewer-widget.h b/gcr-gtk3/gcr-viewer-widget.h
similarity index 100%
rename from ui/gcr-viewer-widget.h
rename to gcr-gtk3/gcr-viewer-widget.h
diff --git a/ui/gcr-viewer-window.c b/gcr-gtk3/gcr-viewer-window.c
similarity index 100%
rename from ui/gcr-viewer-window.c
rename to gcr-gtk3/gcr-viewer-window.c
diff --git a/ui/gcr-viewer-window.h b/gcr-gtk3/gcr-viewer-window.h
similarity index 98%
rename from ui/gcr-viewer-window.h
rename to gcr-gtk3/gcr-viewer-window.h
index ea60ab0..6af2e30 100644
--- a/ui/gcr-viewer-window.h
+++ b/gcr-gtk3/gcr-viewer-window.h
@@ -28,7 +28,7 @@
 #ifndef GCR_DISABLE_DEPRECATED
 
 #include "gcr/gcr.h"
-#include "ui/gcr-ui.h"
+#include "gcr-gtk3/gcr-gtk3.h"
 
 #define GCR_TYPE_VIEWER_WINDOW               (gcr_viewer_window_get_type ())
 #define GCR_VIEWER_WINDOW(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_VIEWER_WINDOW, 
GcrViewerWindow))
diff --git a/ui/gcr-viewer.c b/gcr-gtk3/gcr-viewer.c
similarity index 100%
rename from ui/gcr-viewer.c
rename to gcr-gtk3/gcr-viewer.c
diff --git a/ui/gcr-viewer.desktop.in.in b/gcr-gtk3/gcr-viewer.desktop.in.in
similarity index 100%
rename from ui/gcr-viewer.desktop.in.in
rename to gcr-gtk3/gcr-viewer.desktop.in.in
diff --git a/ui/gcr-viewer.h b/gcr-gtk3/gcr-viewer.h
similarity index 100%
rename from ui/gcr-viewer.h
rename to gcr-gtk3/gcr-viewer.h
diff --git a/ui/gcr.gresource.xml b/gcr-gtk3/gcr.gresource.xml
similarity index 100%
rename from ui/gcr.gresource.xml
rename to gcr-gtk3/gcr.gresource.xml
diff --git a/ui/icons/16x16/gcr-gnupg.png b/gcr-gtk3/icons/16x16/gcr-gnupg.png
similarity index 100%
rename from ui/icons/16x16/gcr-gnupg.png
rename to gcr-gtk3/icons/16x16/gcr-gnupg.png
diff --git a/ui/icons/16x16/gcr-key-pair.png b/gcr-gtk3/icons/16x16/gcr-key-pair.png
similarity index 100%
rename from ui/icons/16x16/gcr-key-pair.png
rename to gcr-gtk3/icons/16x16/gcr-key-pair.png
diff --git a/ui/icons/16x16/gcr-key.png b/gcr-gtk3/icons/16x16/gcr-key.png
similarity index 100%
rename from ui/icons/16x16/gcr-key.png
rename to gcr-gtk3/icons/16x16/gcr-key.png
diff --git a/ui/icons/16x16/gcr-password.png b/gcr-gtk3/icons/16x16/gcr-password.png
similarity index 100%
rename from ui/icons/16x16/gcr-password.png
rename to gcr-gtk3/icons/16x16/gcr-password.png
diff --git a/ui/icons/16x16/gcr-smart-card.png b/gcr-gtk3/icons/16x16/gcr-smart-card.png
similarity index 100%
rename from ui/icons/16x16/gcr-smart-card.png
rename to gcr-gtk3/icons/16x16/gcr-smart-card.png
diff --git a/ui/icons/22x22/gcr-gnupg.png b/gcr-gtk3/icons/22x22/gcr-gnupg.png
similarity index 100%
rename from ui/icons/22x22/gcr-gnupg.png
rename to gcr-gtk3/icons/22x22/gcr-gnupg.png
diff --git a/ui/icons/22x22/gcr-key-pair.png b/gcr-gtk3/icons/22x22/gcr-key-pair.png
similarity index 100%
rename from ui/icons/22x22/gcr-key-pair.png
rename to gcr-gtk3/icons/22x22/gcr-key-pair.png
diff --git a/ui/icons/22x22/gcr-key.png b/gcr-gtk3/icons/22x22/gcr-key.png
similarity index 100%
rename from ui/icons/22x22/gcr-key.png
rename to gcr-gtk3/icons/22x22/gcr-key.png
diff --git a/ui/icons/22x22/gcr-password.png b/gcr-gtk3/icons/22x22/gcr-password.png
similarity index 100%
rename from ui/icons/22x22/gcr-password.png
rename to gcr-gtk3/icons/22x22/gcr-password.png
diff --git a/ui/icons/22x22/gcr-smart-card.png b/gcr-gtk3/icons/22x22/gcr-smart-card.png
similarity index 100%
rename from ui/icons/22x22/gcr-smart-card.png
rename to gcr-gtk3/icons/22x22/gcr-smart-card.png
diff --git a/ui/icons/24x24/gcr-gnupg.png b/gcr-gtk3/icons/24x24/gcr-gnupg.png
similarity index 100%
rename from ui/icons/24x24/gcr-gnupg.png
rename to gcr-gtk3/icons/24x24/gcr-gnupg.png
diff --git a/ui/icons/24x24/gcr-key-pair.png b/gcr-gtk3/icons/24x24/gcr-key-pair.png
similarity index 100%
rename from ui/icons/24x24/gcr-key-pair.png
rename to gcr-gtk3/icons/24x24/gcr-key-pair.png
diff --git a/ui/icons/24x24/gcr-key.png b/gcr-gtk3/icons/24x24/gcr-key.png
similarity index 100%
rename from ui/icons/24x24/gcr-key.png
rename to gcr-gtk3/icons/24x24/gcr-key.png
diff --git a/ui/icons/24x24/gcr-password.png b/gcr-gtk3/icons/24x24/gcr-password.png
similarity index 100%
rename from ui/icons/24x24/gcr-password.png
rename to gcr-gtk3/icons/24x24/gcr-password.png
diff --git a/ui/icons/24x24/gcr-smart-card.png b/gcr-gtk3/icons/24x24/gcr-smart-card.png
similarity index 100%
rename from ui/icons/24x24/gcr-smart-card.png
rename to gcr-gtk3/icons/24x24/gcr-smart-card.png
diff --git a/ui/icons/256x256/gcr-gnupg.png b/gcr-gtk3/icons/256x256/gcr-gnupg.png
similarity index 100%
rename from ui/icons/256x256/gcr-gnupg.png
rename to gcr-gtk3/icons/256x256/gcr-gnupg.png
diff --git a/ui/icons/256x256/gcr-password.png b/gcr-gtk3/icons/256x256/gcr-password.png
similarity index 100%
rename from ui/icons/256x256/gcr-password.png
rename to gcr-gtk3/icons/256x256/gcr-password.png
diff --git a/ui/icons/256x256/gcr-smart-card.png b/gcr-gtk3/icons/256x256/gcr-smart-card.png
similarity index 100%
rename from ui/icons/256x256/gcr-smart-card.png
rename to gcr-gtk3/icons/256x256/gcr-smart-card.png
diff --git a/ui/icons/32x32/gcr-gnupg.png b/gcr-gtk3/icons/32x32/gcr-gnupg.png
similarity index 100%
rename from ui/icons/32x32/gcr-gnupg.png
rename to gcr-gtk3/icons/32x32/gcr-gnupg.png
diff --git a/ui/icons/32x32/gcr-key-pair.png b/gcr-gtk3/icons/32x32/gcr-key-pair.png
similarity index 100%
rename from ui/icons/32x32/gcr-key-pair.png
rename to gcr-gtk3/icons/32x32/gcr-key-pair.png
diff --git a/ui/icons/32x32/gcr-key.png b/gcr-gtk3/icons/32x32/gcr-key.png
similarity index 100%
rename from ui/icons/32x32/gcr-key.png
rename to gcr-gtk3/icons/32x32/gcr-key.png
diff --git a/ui/icons/32x32/gcr-password.png b/gcr-gtk3/icons/32x32/gcr-password.png
similarity index 100%
rename from ui/icons/32x32/gcr-password.png
rename to gcr-gtk3/icons/32x32/gcr-password.png
diff --git a/ui/icons/32x32/gcr-smart-card.png b/gcr-gtk3/icons/32x32/gcr-smart-card.png
similarity index 100%
rename from ui/icons/32x32/gcr-smart-card.png
rename to gcr-gtk3/icons/32x32/gcr-smart-card.png
diff --git a/ui/icons/48x48/gcr-gnupg.png b/gcr-gtk3/icons/48x48/gcr-gnupg.png
similarity index 100%
rename from ui/icons/48x48/gcr-gnupg.png
rename to gcr-gtk3/icons/48x48/gcr-gnupg.png
diff --git a/ui/icons/48x48/gcr-key-pair.png b/gcr-gtk3/icons/48x48/gcr-key-pair.png
similarity index 100%
rename from ui/icons/48x48/gcr-key-pair.png
rename to gcr-gtk3/icons/48x48/gcr-key-pair.png
diff --git a/ui/icons/48x48/gcr-key.png b/gcr-gtk3/icons/48x48/gcr-key.png
similarity index 100%
rename from ui/icons/48x48/gcr-key.png
rename to gcr-gtk3/icons/48x48/gcr-key.png
diff --git a/ui/icons/48x48/gcr-password.png b/gcr-gtk3/icons/48x48/gcr-password.png
similarity index 100%
rename from ui/icons/48x48/gcr-password.png
rename to gcr-gtk3/icons/48x48/gcr-password.png
diff --git a/ui/icons/48x48/gcr-smart-card.png b/gcr-gtk3/icons/48x48/gcr-smart-card.png
similarity index 100%
rename from ui/icons/48x48/gcr-smart-card.png
rename to gcr-gtk3/icons/48x48/gcr-smart-card.png
diff --git a/ui/icons/meson.build b/gcr-gtk3/icons/meson.build
similarity index 100%
rename from ui/icons/meson.build
rename to gcr-gtk3/icons/meson.build
diff --git a/ui/icons/render-icons.py b/gcr-gtk3/icons/render-icons.py
similarity index 99%
rename from ui/icons/render-icons.py
rename to gcr-gtk3/icons/render-icons.py
index cc5be3a..650d1a6 100755
--- a/ui/icons/render-icons.py
+++ b/gcr-gtk3/icons/render-icons.py
@@ -12,8 +12,8 @@ import subprocess
 
 INKSCAPE = '/usr/bin/inkscape'
 OPTIPNG = '/usr/bin/optipng'
-SRC = 'ui/icons/src'
-OUT = 'ui/icons'
+SRC = 'gcr-gtk3/icons/src'
+OUT = 'gcr-gtk3/icons'
 
 inkscape_process = None
 
diff --git a/ui/icons/src/gcr-gnupg.svg b/gcr-gtk3/icons/src/gcr-gnupg.svg
similarity index 100%
rename from ui/icons/src/gcr-gnupg.svg
rename to gcr-gtk3/icons/src/gcr-gnupg.svg
diff --git a/ui/icons/src/gcr-key-and-keypair.svg b/gcr-gtk3/icons/src/gcr-key-and-keypair.svg
similarity index 100%
rename from ui/icons/src/gcr-key-and-keypair.svg
rename to gcr-gtk3/icons/src/gcr-key-and-keypair.svg
diff --git a/ui/icons/src/gcr-password.svg b/gcr-gtk3/icons/src/gcr-password.svg
similarity index 100%
rename from ui/icons/src/gcr-password.svg
rename to gcr-gtk3/icons/src/gcr-password.svg
diff --git a/ui/icons/src/gcr-smart-card.svg b/gcr-gtk3/icons/src/gcr-smart-card.svg
similarity index 100%
rename from ui/icons/src/gcr-smart-card.svg
rename to gcr-gtk3/icons/src/gcr-smart-card.svg
diff --git a/ui/libgcr-ui.map b/gcr-gtk3/libgcr-gtk3.map
similarity index 100%
rename from ui/libgcr-ui.map
rename to gcr-gtk3/libgcr-gtk3.map
diff --git a/ui/meson.build b/gcr-gtk3/meson.build
similarity index 67%
rename from ui/meson.build
rename to gcr-gtk3/meson.build
index 66be5f0..49ebffe 100644
--- a/ui/meson.build
+++ b/gcr-gtk3/meson.build
@@ -1,8 +1,8 @@
 subdir('icons')
 
-gcr_ui_headers_install_dir = 'gcr-@0@'.format(gcr_major_version) / 'ui'
+gcr_gtk3_headers_install_dir = 'gcr-@0@'.format(gcr_major_version) / 'gcr-gtk3'
 
-gcr_ui_public_sources = files(
+gcr_gtk3_public_sources = files(
   'gcr-certificate-renderer.c',
   'gcr-certificate-widget.c',
   'gcr-collection-model.c',
@@ -21,7 +21,7 @@ gcr_ui_public_sources = files(
   'gcr-viewer-widget.c',
 )
 
-gcr_ui_private_sources = files(
+gcr_gtk3_private_sources = files(
   'eggimagemenuitem.c',
   'gcr-certificate-basics-widget.c',
   'gcr-certificate-details-widget.c',
@@ -38,8 +38,8 @@ gcr_ui_private_sources = files(
   'gcr-viewer-window.c',
 )
 
-gcr_ui_headers = files(
-  'gcr-ui.h',
+gcr_gtk3_headers = files(
+  'gcr-gtk3.h',
   'gcr-certificate-renderer.h',
   'gcr-certificate-widget.h',
   'gcr-collection-model.h',
@@ -59,25 +59,25 @@ gcr_ui_headers = files(
   'gcr-viewer-widget.h',
 )
 
-gcr_ui_deprecated_headers = files(
+gcr_gtk3_deprecated_headers = files(
   'gcr-certificate-basics-widget.h',
   'gcr-certificate-details-widget.h',
 )
 
 # Generated sources
-gcr_ui_enums_gen = gnome.mkenums_simple('gcr-enum-types',
-  sources: gcr_ui_headers,
+gcr_gtk3_enums_gen = gnome.mkenums_simple('gcr-enum-types',
+  sources: gcr_gtk3_headers,
   install_header: true,
-  install_dir: get_option('includedir') / gcr_ui_headers_install_dir,
+  install_dir: get_option('includedir') / gcr_gtk3_headers_install_dir,
 )
 
-gcr_ui_sources = [
-  gcr_ui_private_sources,
-  gcr_ui_public_sources,
-  gcr_ui_enums_gen,
+gcr_gtk3_sources = [
+  gcr_gtk3_private_sources,
+  gcr_gtk3_public_sources,
+  gcr_gtk3_enums_gen,
 ]
 
-gcr_ui_deps = [
+gcr_gtk3_deps = [
   glib_deps,
   p11kit_dep,
   libegg_dep,
@@ -86,7 +86,7 @@ gcr_ui_deps = [
   gtk_dep,
 ]
 
-gcr_ui_cflags = [
+gcr_gtk3_cflags = [
  '-DG_LOG_DOMAIN="Gcr"',
  '-DGCR_COMPILATION',
  '-DGCR_API_SUBJECT_TO_CHANGE',
@@ -94,27 +94,26 @@ gcr_ui_cflags = [
  '-DP11_KIT_API_SUBJECT_TO_CHANGE',
 ]
 
-gcr_ui_symbolmap = meson.current_source_dir() / 'libgcr-ui.map'
-gcr_ui_linkflags = cc.get_supported_link_arguments(
-  '-Wl,--version-script,@0@'.format(gcr_ui_symbolmap),
+gcr_gtk3_symbolmap = meson.current_source_dir() / 'libgcr-gtk3.map'
+gcr_gtk3_linkflags = cc.get_supported_link_arguments(
+  '-Wl,--version-script,@0@'.format(gcr_gtk3_symbolmap),
 )
 
-# gcr-XX is just the same as gcr-ui-XX
-gcr_ui_basename = 'gcr-ui-@0@'.format(gcr_major_version)
-gcr_basename = 'gcr-@0@'.format(gcr_major_version)
+# gcr-XX is just the same as gcr-gtk3-XX
+gcr_gtk3_basename = 'gcr-gtk3-@0@'.format(gcr_major_version)
 
-gcr_ui_lib = shared_library(gcr_ui_basename,
-  gcr_ui_sources,
-  dependencies: gcr_ui_deps,
-  c_args: gcr_ui_cflags,
-  link_args: gcr_ui_linkflags,
-  link_depends: gcr_ui_symbolmap,
+gcr_gtk3_lib = shared_library(gcr_gtk3_basename,
+  gcr_gtk3_sources,
+  dependencies: gcr_gtk3_deps,
+  c_args: gcr_gtk3_cflags,
+  link_args: gcr_gtk3_linkflags,
+  link_depends: gcr_gtk3_symbolmap,
   include_directories: config_h_dir,
   version: gcr_soversion,
   install: true,
 )
 
-gcr_ui_pkgconf_deps = [
+gcr_gtk3_pkgconf_deps = [
   glib_dep,
   gio_dep,
   gobject_dep,
@@ -122,27 +121,27 @@ gcr_ui_pkgconf_deps = [
   'gcr-@0@'.format(gcr_major_version),
   gtk_dep,
 ]
-pkgconfig.generate(gcr_ui_lib,
+pkgconfig.generate(gcr_gtk3_lib,
   subdirs: 'gcr-@0@'.format(gcr_major_version),
-  requires: gcr_ui_pkgconf_deps,
+  requires: gcr_gtk3_pkgconf_deps,
   description: 'GObject and GUI library for high level crypto parsing and display',
 )
 
-install_headers([gcr_ui_headers, gcr_ui_deprecated_headers ],
-  subdir: gcr_ui_headers_install_dir,
+install_headers([gcr_gtk3_headers, gcr_gtk3_deprecated_headers ],
+  subdir: gcr_gtk3_headers_install_dir,
 )
 
-gcr_ui_dep = declare_dependency(
-  link_with: gcr_ui_lib,
-  sources: gcr_ui_enums_gen[1], # Make sure gcr-enum-types.h can be included
+gcr_gtk3_dep = declare_dependency(
+  link_with: gcr_gtk3_lib,
+  sources: gcr_gtk3_enums_gen[1], # Make sure gcr-enum-types.h can be included
 )
 
 if get_option('introspection')
-  gcr_ui_gir = gnome.generate_gir(gcr_ui_lib,
-    sources: [ gcr_ui_headers, gcr_ui_public_sources ],
+  gcr_gtk3_gir = gnome.generate_gir(gcr_gtk3_lib,
+    sources: [ gcr_gtk3_headers, gcr_gtk3_public_sources ],
     namespace: 'GcrUi',
     nsversion: '@0@'.format(gcr_major_version),
-    export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+    export_packages: 'gcr-gtk3-@0@'.format(gcr_major_version),
     identifier_prefix: 'Gcr',
     symbol_prefix: 'gcr',
     includes: [
@@ -152,7 +151,7 @@ if get_option('introspection')
       gck_gir[0],
       gcr_gir[0],
     ],
-    header: 'ui/gcr-ui.h',
+    header: 'gcr-gtk3/gcr-gtk3.h',
     extra_args: [
       '-DGCR_COMPILATION',
       '-DGCR_API_SUBJECT_TO_CHANGE',
@@ -160,8 +159,8 @@ if get_option('introspection')
     install: true,
   )
 
-  gcr_ui_vapi = gnome.generate_vapi('gcr-ui-@0@'.format(gcr_major_version),
-    sources: gcr_ui_gir[0],
+  gcr_gtk3_vapi = gnome.generate_vapi('gcr-gtk3-@0@'.format(gcr_major_version),
+    sources: gcr_gtk3_gir[0],
     packages: [
       'glib-2.0',
       'gio-2.0',
@@ -185,8 +184,8 @@ endif
 # gcr-viewer
 gcr_viewer = executable('gcr-viewer',
   'gcr-viewer-tool.c',
-  dependencies: [ gcr_ui_dep, gcr_ui_deps ],
-  c_args: gcr_ui_cflags,
+  dependencies: [ gcr_gtk3_dep, gcr_gtk3_deps ],
+  c_args: gcr_gtk3_cflags,
   include_directories: config_h_dir,
   install: true,
 )
@@ -207,8 +206,8 @@ i18n.merge_file(
 # gcr-prompter
 gcr_prompter = executable('gcr-prompter',
   'gcr-prompter-tool.c',
-  dependencies: [ gcr_ui_dep, gcr_ui_deps ],
-  c_args: gcr_ui_cflags,
+  dependencies: [ gcr_gtk3_dep, gcr_gtk3_deps ],
+  c_args: gcr_gtk3_cflags,
   include_directories: config_h_dir,
   install: true,
   install_dir: get_option('libexecdir'),
@@ -233,7 +232,7 @@ install_data('gcr-crypto-types.xml',
 )
 
 # Manual UI testing programs
-gcr_ui_manual_tests = [
+gcr_gtk3_manual_tests = [
   'frob-certificate',
   'frob-combo-selector',
   'frob-gnupg-selector',
@@ -247,15 +246,15 @@ gcr_ui_manual_tests = [
   'frob-unlock-options',
 ]
 
-gcr_ui_test_cflags = [
+gcr_gtk3_test_cflags = [
   '-DSRCDIR="@0@"'.format(source_root),
 ]
 
-foreach _test : gcr_ui_manual_tests
+foreach _test : gcr_gtk3_manual_tests
   test_bin = executable('test-'+_test,
     '@0@.c'.format(_test),
-    dependencies: [ gcr_ui_deps, gcr_ui_dep ],
-    c_args: [ gcr_ui_cflags, gcr_ui_test_cflags ],
+    dependencies: [ gcr_gtk3_deps, gcr_gtk3_dep ],
+    c_args: [ gcr_gtk3_cflags, gcr_gtk3_test_cflags ],
     include_directories: config_h_dir,
   )
 endforeach
diff --git a/meson.build b/meson.build
index 6afbe4a..1ab3f70 100644
--- a/meson.build
+++ b/meson.build
@@ -98,7 +98,7 @@ subdir('gck')
 subdir('gcr')
 subdir('schema')
 if get_option('gtk')
-  subdir('ui')
+  subdir('gcr-gtk3')
 endif
 if get_option('gtk_doc')
   if not get_option('introspection')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1062ddb..6e8a8e6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,23 +22,23 @@ gcr/gcr-ssh-askpass.c
 gcr/gcr-subject-public-key.c
 gcr/gcr-system-prompt.c
 gcr/gcr-trust.c
-ui/gcr-certificate-renderer.c
-ui/gcr-certificate-request-renderer.c
-ui/gcr-certificate-widget.c
-ui/gcr-display-view.c
-ui/gcr-failure-renderer.c
-ui/gcr-gnupg-renderer.c
-ui/gcr-import-button.c
-ui/gcr-key-renderer.c
-ui/gcr-pkcs11-import-dialog.c
-ui/gcr-pkcs11-import-dialog.ui
-ui/gcr-pkcs11-import-interaction.c
-ui/gcr-prompt-dialog.c
-ui/gcr-prompter.desktop.in.in
-ui/gcr-certificate-exporter.c
-ui/gcr-unlock-options-widget.ui
-ui/gcr-unlock-renderer.c
-ui/gcr-viewer.desktop.in.in
-ui/gcr-viewer-tool.c
-ui/gcr-viewer-widget.c
-ui/gcr-viewer-window.c
+gcr-gtk3/gcr-certificate-renderer.c
+gcr-gtk3/gcr-certificate-request-renderer.c
+gcr-gtk3/gcr-certificate-widget.c
+gcr-gtk3/gcr-display-view.c
+gcr-gtk3/gcr-failure-renderer.c
+gcr-gtk3/gcr-gnupg-renderer.c
+gcr-gtk3/gcr-import-button.c
+gcr-gtk3/gcr-key-renderer.c
+gcr-gtk3/gcr-pkcs11-import-dialog.c
+gcr-gtk3/gcr-pkcs11-import-dialog.ui
+gcr-gtk3/gcr-pkcs11-import-interaction.c
+gcr-gtk3/gcr-prompt-dialog.c
+gcr-gtk3/gcr-prompter.desktop.in.in
+gcr-gtk3/gcr-certificate-exporter.c
+gcr-gtk3/gcr-unlock-options-widget.ui
+gcr-gtk3/gcr-unlock-renderer.c
+gcr-gtk3/gcr-viewer.desktop.in.in
+gcr-gtk3/gcr-viewer-tool.c
+gcr-gtk3/gcr-viewer-widget.c
+gcr-gtk3/gcr-viewer-window.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]