[seahorse] pgp: remove seahorse-pgp.[ch]



commit 79ff07cd2a604cf1f6a4a9ed8d6aec610a83647a
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Oct 5 08:25:48 2018 +0200

    pgp: remove seahorse-pgp.[ch]
    
    The functionality can be found in in `seahorse-pgp-backend.[ch]` anyway.
    This also prevented us from generating a header with Vala with the same
    name.

 pgp/meson.build               |  1 -
 pgp/seahorse-gpgme-generate.c |  1 -
 pgp/seahorse-gpgme-subkey.c   |  1 -
 pgp/seahorse-gpgme-uid.c      |  1 -
 pgp/seahorse-pgp-backend.h    |  7 ++++++-
 pgp/seahorse-pgp-key.c        |  1 -
 pgp/seahorse-pgp-photo.c      |  1 -
 pgp/seahorse-pgp-subkey.c     |  1 -
 pgp/seahorse-pgp-uid.c        |  1 -
 pgp/seahorse-pgp.c            | 21 ---------------------
 pgp/seahorse-pgp.h            | 43 -------------------------------------------
 11 files changed, 6 insertions(+), 73 deletions(-)
---
diff --git a/pgp/meson.build b/pgp/meson.build
index c81ad465..5793e613 100644
--- a/pgp/meson.build
+++ b/pgp/meson.build
@@ -21,7 +21,6 @@ pgp_sources = [
   'seahorse-gpgme-uid.c',
   'seahorse-gpg-op.c',
   'seahorse-gpg-options.c',
-  'seahorse-pgp.c',
   'seahorse-pgp-actions.c',
   'seahorse-pgp-backend.c',
   'seahorse-pgp-key.c',
diff --git a/pgp/seahorse-gpgme-generate.c b/pgp/seahorse-gpgme-generate.c
index 39031109..466b2b9f 100644
--- a/pgp/seahorse-gpgme-generate.c
+++ b/pgp/seahorse-gpgme-generate.c
@@ -22,7 +22,6 @@
 
 #include "seahorse-gpgme-dialogs.h"
 
-#include "seahorse-pgp.h"
 #include "seahorse-pgp-backend.h"
 #include "seahorse-gpgme.h"
 #include "seahorse-gpgme-key.h"
diff --git a/pgp/seahorse-gpgme-subkey.c b/pgp/seahorse-gpgme-subkey.c
index 7d310da3..00f115ab 100644
--- a/pgp/seahorse-gpgme-subkey.c
+++ b/pgp/seahorse-gpgme-subkey.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "seahorse-pgp.h"
 #include "seahorse-gpgme.h"
 #include "seahorse-gpgme-subkey.h"
 #include "seahorse-gpgme-uid.h"
diff --git a/pgp/seahorse-gpgme-uid.c b/pgp/seahorse-gpgme-uid.c
index cec3856c..d34895e7 100644
--- a/pgp/seahorse-gpgme-uid.c
+++ b/pgp/seahorse-gpgme-uid.c
@@ -21,7 +21,6 @@
 
 #include "seahorse-gpgme.h"
 #include "seahorse-gpgme-uid.h"
-#include "seahorse-pgp.h"
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-signature.h"
 
diff --git a/pgp/seahorse-pgp-backend.h b/pgp/seahorse-pgp-backend.h
index 27648225..20ad89a0 100644
--- a/pgp/seahorse-pgp-backend.h
+++ b/pgp/seahorse-pgp-backend.h
@@ -28,7 +28,6 @@
 
 #include <gcr/gcr.h>
 
-#include "seahorse-pgp.h"
 #include "seahorse-discovery.h"
 #include "seahorse-gpgme-keyring.h"
 #include "seahorse-pgp-key.h"
@@ -36,6 +35,12 @@
 
 G_BEGIN_DECLS
 
+#define SEAHORSE_PGP_NAME "openpgp"
+#define SEAHORSE_PGP_TYPE_STR SEAHORSE_PGP_NAME
+#define SEAHORSE_PGP g_quark_from_string (SEAHORSE_PGP_NAME)
+
+void       seahorse_pgp_backend_initialize    (void);
+
 #define SEAHORSE_TYPE_PGP_BACKEND            (seahorse_pgp_backend_get_type ())
 #define SEAHORSE_PGP_BACKEND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_BACKEND, 
SeahorsePgpBackend))
 #define SEAHORSE_PGP_BACKEND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_BACKEND, 
SeahorsePgpBackendClass))
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 2b5b03f9..0f953c2b 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -18,7 +18,6 @@
  */
 #include "config.h"
 
-#include "seahorse-pgp.h"
 #include "seahorse-pgp-dialogs.h"
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-uid.h"
diff --git a/pgp/seahorse-pgp-photo.c b/pgp/seahorse-pgp-photo.c
index 15f257e8..924ecbce 100644
--- a/pgp/seahorse-pgp-photo.c
+++ b/pgp/seahorse-pgp-photo.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "seahorse-pgp.h"
 #include "seahorse-pgp-photo.h"
 
 #include <string.h>
diff --git a/pgp/seahorse-pgp-subkey.c b/pgp/seahorse-pgp-subkey.c
index 6fc916ce..e96ff5b0 100644
--- a/pgp/seahorse-pgp-subkey.c
+++ b/pgp/seahorse-pgp-subkey.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "seahorse-pgp.h"
 #include "seahorse-gpgme.h"
 #include "seahorse-pgp-subkey.h"
 #include "seahorse-pgp-uid.h"
diff --git a/pgp/seahorse-pgp-uid.c b/pgp/seahorse-pgp-uid.c
index 71663ab1..846c00ed 100644
--- a/pgp/seahorse-pgp-uid.c
+++ b/pgp/seahorse-pgp-uid.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "seahorse-pgp.h"
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-uid.h"
 #include "seahorse-pgp-signature.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]