[seahorse] Move stuff in the common/ subdirectory into libseahorse/

From: Stefan Walter <stefw src gnome org>
To: commits-list gnome org
Cc:
Subject: [seahorse] Move stuff in the common/ subdirectory into libseahorse/
Date: Sat, 20 Aug 2011 13:53:29 +0000 (UTC)
commit f916a9493ea3b0bcdb64877f9b7e06ef7a7840d1
Author: Stef Walter <stefw collabora co uk>
Date:   Sat Aug 20 15:49:45 2011 +0200

    Move stuff in the common/ subdirectory into libseahorse/
    
     * There wasn't really that much of a difference between the code.
       In theory it was supposed to be usable without depending on
       other bits of seahorse, but this was an arbitrary distinction.

 Makefile.am                                      |    1 -
 common/.gitignore                                |    3 ---
 common/Makefile.am                               |   15 ---------------
 configure.ac                                     |    1 -
 gkr/Makefile.am                                  |    3 +--
 gkr/seahorse-gkr-add-item.c                      |    3 +--
 gkr/seahorse-gkr-item-commands.c                 |    3 +--
 gkr/seahorse-gkr-item-properties.c               |    5 ++---
 gkr/seahorse-gkr-keyring-commands.c              |    3 +--
 gkr/seahorse-gkr-keyring-properties.c            |    3 +--
 gkr/seahorse-gkr-source.c                        |    7 +++----
 libseahorse/Makefile.am                          |   10 ++++++----
 {common => libseahorse}/seahorse-bind.c          |    0
 {common => libseahorse}/seahorse-bind.h          |    0
 {common => libseahorse}/seahorse-cleanup.c       |    0
 {common => libseahorse}/seahorse-cleanup.h       |    0
 libseahorse/seahorse-context.c                   |    5 ++---
 {common => libseahorse}/seahorse-object-list.c   |    0
 {common => libseahorse}/seahorse-object-list.h   |    0
 libseahorse/seahorse-object-model.c              |    3 +--
 libseahorse/seahorse-passphrase.c                |    7 +++----
 libseahorse/seahorse-passphrase.h                |    2 ++
 libseahorse/seahorse-prefs.c                     |    3 +--
 {common => libseahorse}/seahorse-registry.c      |    0
 {common => libseahorse}/seahorse-registry.h      |    0
 {common => libseahorse}/seahorse-secure-buffer.c |    0
 {common => libseahorse}/seahorse-secure-buffer.h |    0
 libseahorse/seahorse-servers.c                   |    3 +--
 libseahorse/seahorse-source.c                    |    3 +--
 libseahorse/seahorse-unknown-source.c            |    3 +--
 pgp/Makefile.am                                  |    3 +--
 pgp/seahorse-gpgme-generate.c                    |   10 ++++------
 pgp/seahorse-gpgme-key-op.c                      |    3 +--
 pgp/seahorse-gpgme-key.c                         |    3 +--
 pgp/seahorse-gpgme-source.c                      |    3 +--
 pgp/seahorse-gpgme-uid.c                         |    2 +-
 pgp/seahorse-hkp-source.c                        |    5 ++---
 pgp/seahorse-ldap-source.c                       |    5 ++---
 pgp/seahorse-pgp-commands.c                      |    3 +--
 pgp/seahorse-pgp-key-properties.c                |    3 +--
 pgp/seahorse-pgp-key.c                           |    5 ++---
 pgp/seahorse-pgp-uid.c                           |    2 +-
 pgp/seahorse-server-source.c                     |    8 ++++----
 pkcs11/seahorse-pkcs11-commands.c                |    3 +--
 pkcs11/seahorse-pkcs11-operations.c              |    2 +-
 pkcs11/seahorse-pkcs11-source.c                  |    2 +-
 src/Makefile.am                                  |    1 -
 src/seahorse-generate-select.c                   |    4 ++--
 src/seahorse-main.c                              |    7 +++----
 src/seahorse-viewer.c                            |    4 ++--
 ssh/seahorse-ssh-commands.c                      |    3 +--
 ssh/seahorse-ssh-generate.c                      |    8 ++++----
 ssh/seahorse-ssh-key-properties.c                |    3 +--
 ssh/seahorse-ssh-source.c                        |    3 +--
 54 files changed, 67 insertions(+), 114 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4467b78..84dc0ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ PGP_DIR =
 endif
 
 SUBDIRS = libegg \
-	common \
 	libseahorse \
 	gkr \
 	$(PKCS11_DIR) \
diff --git a/configure.ac b/configure.ac
index e9387b0..12c20a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -524,7 +524,6 @@ dnl ****************************************************************************
 
 AC_OUTPUT([
 Makefile
-common/Makefile
 gkr/Makefile
 libegg/Makefile
 libseahorse/Makefile
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 73599b7..42ba1d5 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -31,8 +31,7 @@ libseahorse_gkr_la_SOURCES = \
 	seahorse-gkr-source.c seahorse-gkr-source.h
 	
 libseahorse_gkr_la_LIBADD = \
-	$(top_builddir)/libseahorse/libseahorse.la \
-	$(top_builddir)/common/libseahorse-common.la
+	$(top_builddir)/libseahorse/libseahorse.la
 
 ui_DATA = \
 	seahorse-add-keyring.xml \
diff --git a/gkr/seahorse-gkr-add-item.c b/gkr/seahorse-gkr-add-item.c
index 9fa8bc8..9c4cdff 100644
--- a/gkr/seahorse-gkr-add-item.c
+++ b/gkr/seahorse-gkr-add-item.c
@@ -24,11 +24,10 @@
 #include "seahorse-gkr-keyring.h"
 #include "seahorse-gkr-source.h"
 
+#include "seahorse-secure-buffer.h"
 #include "seahorse-widget.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-secure-buffer.h"
-
 #include <glib/gi18n.h>
 
 static void
diff --git a/gkr/seahorse-gkr-item-commands.c b/gkr/seahorse-gkr-item-commands.c
index 077f94e..7304db7 100644
--- a/gkr/seahorse-gkr-item-commands.c
+++ b/gkr/seahorse-gkr-item-commands.c
@@ -29,9 +29,8 @@
 #include "seahorse-gkr-dialogs.h"
 #include "seahorse-gkr-operation.h"
 
-#include "common/seahorse-registry.h"
-
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-source.h"
 #include "seahorse-util.h"
 
diff --git a/gkr/seahorse-gkr-item-properties.c b/gkr/seahorse-gkr-item-properties.c
index c776f52..8376768 100644
--- a/gkr/seahorse-gkr-item-properties.c
+++ b/gkr/seahorse-gkr-item-properties.c
@@ -27,17 +27,16 @@
 #include "seahorse-gkr-source.h"
 #include "seahorse-gkr-operation.h"
 
+#include "seahorse-bind.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-object.h"
 #include "seahorse-object-widget.h"
 #include "seahorse-progress.h"
+#include "seahorse-secure-buffer.h"
 #include "seahorse-secure-memory.h"
 #include "seahorse-util.h"
 #include "seahorse-widget.h"
 
-#include "common/seahorse-bind.h"
-#include "common/seahorse-secure-buffer.h"
-
 GType
 boxed_access_control_type (void)
 {
diff --git a/gkr/seahorse-gkr-keyring-commands.c b/gkr/seahorse-gkr-keyring-commands.c
index 469910f..ff08778 100644
--- a/gkr/seahorse-gkr-keyring-commands.c
+++ b/gkr/seahorse-gkr-keyring-commands.c
@@ -30,9 +30,8 @@
 #include "seahorse-gkr-operation.h"
 #include "seahorse-gkr-source.h"
 
-#include "common/seahorse-registry.h"
-
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-source.h"
 #include "seahorse-util.h"
 
diff --git a/gkr/seahorse-gkr-keyring-properties.c b/gkr/seahorse-gkr-keyring-properties.c
index a960148..93aae12 100644
--- a/gkr/seahorse-gkr-keyring-properties.c
+++ b/gkr/seahorse-gkr-keyring-properties.c
@@ -25,13 +25,12 @@
 
 #include <glib/gi18n.h>
 
+#include "seahorse-bind.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-object.h"
 #include "seahorse-object-widget.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-bind.h"
-
 /* -----------------------------------------------------------------------------
  * MAIN TAB 
  */
diff --git a/gkr/seahorse-gkr-source.c b/gkr/seahorse-gkr-source.c
index fa4c9fb..1f93d3b 100644
--- a/gkr/seahorse-gkr-source.c
+++ b/gkr/seahorse-gkr-source.c
@@ -28,18 +28,17 @@
 
 #include <glib/gi18n.h>
 
-#include "seahorse-util.h"
-#include "seahorse-secure-memory.h"
 #include "seahorse-passphrase.h"
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
+#include "seahorse-secure-memory.h"
+#include "seahorse-util.h"
 
 #include "seahorse-gkr-item.h"
 #include "seahorse-gkr-keyring.h"
 #include "seahorse-gkr-operation.h"
 #include "seahorse-gkr-source.h"
 
-#include "common/seahorse-registry.h"
-
 #include <gnome-keyring.h>
 
 enum {
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index e6ea0a0..73346ea 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -28,6 +28,8 @@ KEYSERVER_SRCS =
 endif
 
 libseahorse_la_SOURCES = \
+	seahorse-bind.c seahorse-bind.h \
+	seahorse-cleanup.c seahorse-cleanup.h \
 	seahorse-combo-keys.c seahorse-combo-keys.h \
 	seahorse-commands.c seahorse-commands.h \
 	seahorse-context.c seahorse-context.h \
@@ -35,12 +37,15 @@ libseahorse_la_SOURCES = \
 	seahorse-dns-sd.c seahorse-dns-sd.h \
 	seahorse-gtkstock.c seahorse-gtkstock.h \
 	seahorse-object.c seahorse-object.h \
+	seahorse-object-list.c seahorse-object-list.h \
 	seahorse-object-model.c seahorse-object-model.h \
 	seahorse-object-widget.c seahorse-object-widget.h \
 	seahorse-passphrase.c seahorse-passphrase.h \
 	seahorse-prefs.c seahorse-prefs.h \
 	seahorse-progress.c seahorse-progress.h \
+	seahorse-registry.c seahorse-registry.h \
 	seahorse-secure-memory.c seahorse-secure-memory.h \
+	seahorse-secure-buffer.c seahorse-secure-buffer.h \
 	seahorse-servers.c seahorse-servers.h \
 	seahorse-set.c seahorse-set.h \
 	seahorse-set-model.c seahorse-set-model.h \
@@ -52,12 +57,9 @@ libseahorse_la_SOURCES = \
 	seahorse-util.c seahorse-util.h \
 	seahorse-validity.c seahorse-validity.h \
 	seahorse-view.c seahorse-view.h \
-	seahorse-widget.c seahorse-widget.h \
+	seahorse-widget.c seahorse-widget.h \	
 	$(MARSHAL_SRCS) \
 	$(KEYSERVER_SRCS)
-	
-libseahorse_la_LIBADD = \
-	$(top_builddir)/common/libseahorse-common.la
 
 seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
diff --git a/common/seahorse-bind.c b/libseahorse/seahorse-bind.c
similarity index 100%
rename from common/seahorse-bind.c
rename to libseahorse/seahorse-bind.c
diff --git a/common/seahorse-bind.h b/libseahorse/seahorse-bind.h
similarity index 100%
rename from common/seahorse-bind.h
rename to libseahorse/seahorse-bind.h
diff --git a/common/seahorse-cleanup.c b/libseahorse/seahorse-cleanup.c
similarity index 100%
rename from common/seahorse-cleanup.c
rename to libseahorse/seahorse-cleanup.c
diff --git a/common/seahorse-cleanup.h b/libseahorse/seahorse-cleanup.h
similarity index 100%
rename from common/seahorse-cleanup.h
rename to libseahorse/seahorse-cleanup.h
diff --git a/libseahorse/seahorse-context.c b/libseahorse/seahorse-context.c
index 9b96dd6..ec08389 100644
--- a/libseahorse/seahorse-context.c
+++ b/libseahorse/seahorse-context.c
@@ -27,19 +27,18 @@
 #include <string.h>
 #include <libintl.h>
 
+#include "seahorse-bind.h"
 #include "seahorse-context.h"
 #include "seahorse-dns-sd.h"
 #include "seahorse-marshal.h"
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-servers.h"
 #include "seahorse-transfer.h"
 #include "seahorse-unknown.h"
 #include "seahorse-unknown-source.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-bind.h"
-#include "common/seahorse-registry.h"
-
 #ifdef WITH_PGP
 #include "pgp/seahorse-server-source.h"
 #endif
diff --git a/common/seahorse-object-list.c b/libseahorse/seahorse-object-list.c
similarity index 100%
rename from common/seahorse-object-list.c
rename to libseahorse/seahorse-object-list.c
diff --git a/common/seahorse-object-list.h b/libseahorse/seahorse-object-list.h
similarity index 100%
rename from common/seahorse-object-list.h
rename to libseahorse/seahorse-object-list.h
diff --git a/libseahorse/seahorse-object-model.c b/libseahorse/seahorse-object-model.c
index b9a0a23..f2a55c5 100644
--- a/libseahorse/seahorse-object-model.c
+++ b/libseahorse/seahorse-object-model.c
@@ -23,11 +23,10 @@
 
 #include <string.h>
 
+#include "seahorse-bind.h"
 #include "seahorse-object-model.h"
 #include "seahorse-marshal.h"
 
-#include "common/seahorse-bind.h"
-
 enum {
     PROP_0,
     PROP_DATA_COLUMN,
diff --git a/libseahorse/seahorse-passphrase.c b/libseahorse/seahorse-passphrase.c
index b40e24e..33a0b04 100644
--- a/libseahorse/seahorse-passphrase.c
+++ b/libseahorse/seahorse-passphrase.c
@@ -46,11 +46,10 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkkeysyms-compat.h>
 
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
 #include "seahorse-passphrase.h"
-
-#include "common/seahorse-secure-buffer.h"
+#include "seahorse-secure-buffer.h"
+#include "seahorse-util.h"
+#include "seahorse-widget.h"
 
 #define HIG_SMALL      6        /* gnome hig small space in pixels */
 #define HIG_LARGE     12        /* gnome hig large space in pixels */
diff --git a/libseahorse/seahorse-passphrase.h b/libseahorse/seahorse-passphrase.h
index eb68eb3..e394a77 100644
--- a/libseahorse/seahorse-passphrase.h
+++ b/libseahorse/seahorse-passphrase.h
@@ -22,6 +22,8 @@
 #ifndef __SEAHORSE_PASSPHRASE__
 #define __SEAHORSE_PASSPHRASE__
 
+#include <gtk/gtk.h>
+
 #define SEAHORSE_PASS_BAD    0x00000001
 #define SEAHORSE_PASS_NEW    0x01000000
 
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index 04c9b24..02e4c36 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -26,12 +26,11 @@
 #include "seahorse-gtkstock.h"
 #include "seahorse-keyserver-control.h"
 #include "seahorse-prefs.h"
+#include "seahorse-registry.h"
 #include "seahorse-servers.h"
 #include "seahorse-util.h"
 #include "seahorse-widget.h"
 
-#include "common/seahorse-registry.h"
-
 /* From seahorse-prefs-cache.c */
 void seahorse_prefs_cache (SeahorseWidget *widget);
 
diff --git a/common/seahorse-registry.c b/libseahorse/seahorse-registry.c
similarity index 100%
rename from common/seahorse-registry.c
rename to libseahorse/seahorse-registry.c
diff --git a/common/seahorse-registry.h b/libseahorse/seahorse-registry.h
similarity index 100%
rename from common/seahorse-registry.h
rename to libseahorse/seahorse-registry.h
diff --git a/common/seahorse-secure-buffer.c b/libseahorse/seahorse-secure-buffer.c
similarity index 100%
rename from common/seahorse-secure-buffer.c
rename to libseahorse/seahorse-secure-buffer.c
diff --git a/common/seahorse-secure-buffer.h b/libseahorse/seahorse-secure-buffer.h
similarity index 100%
rename from common/seahorse-secure-buffer.h
rename to libseahorse/seahorse-secure-buffer.h
diff --git a/libseahorse/seahorse-servers.c b/libseahorse/seahorse-servers.c
index c8a8e78..667b6d4 100644
--- a/libseahorse/seahorse-servers.c
+++ b/libseahorse/seahorse-servers.c
@@ -19,11 +19,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "seahorse-cleanup.h"
 #include "seahorse-context.h"
 #include "seahorse-servers.h"
 
-#include "common/seahorse-cleanup.h"
-
 #include <string.h>
 
 typedef struct _ServerInfo {
diff --git a/libseahorse/seahorse-source.c b/libseahorse/seahorse-source.c
index 1633fe2..c86632b 100644
--- a/libseahorse/seahorse-source.c
+++ b/libseahorse/seahorse-source.c
@@ -25,11 +25,10 @@
 #include "seahorse-context.h"
 #include "seahorse-marshal.h"
 #include "seahorse-object.h"
+#include "seahorse-registry.h"
 #include "seahorse-source.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-registry.h"
-
 /**
  * SECTION:seahorse-source
  * @short_description: This class stores and handles key sources
diff --git a/libseahorse/seahorse-unknown-source.c b/libseahorse/seahorse-unknown-source.c
index b3ce804..d3595d8 100644
--- a/libseahorse/seahorse-unknown-source.c
+++ b/libseahorse/seahorse-unknown-source.c
@@ -27,10 +27,9 @@
 #include "seahorse-unknown-source.h"
 
 #include "seahorse-context.h"
+#include "seahorse-registry.h"
 #include "seahorse-unknown.h"
 
-#include "common/seahorse-registry.h"
-
 enum {
     PROP_0,
     PROP_SOURCE_TAG,
diff --git a/pgp/Makefile.am b/pgp/Makefile.am
index dcdfd2b..2fc8a81 100644
--- a/pgp/Makefile.am
+++ b/pgp/Makefile.am
@@ -71,8 +71,7 @@ libseahorse_pgp_la_SOURCES = \
 	$(HKP_SRCS)
 
 libseahorse_pgp_la_LIBADD = \
-	$(top_builddir)/libseahorse/libseahorse.la \
-	$(top_builddir)/common/libseahorse-common.la
+	$(top_builddir)/libseahorse/libseahorse.la
 
 seahorselibexecbin_PROGRAMS = xloadimage
 
diff --git a/pgp/seahorse-gpgme-generate.c b/pgp/seahorse-gpgme-generate.c
index 70ef43e..4cae2ae 100644
--- a/pgp/seahorse-gpgme-generate.c
+++ b/pgp/seahorse-gpgme-generate.c
@@ -29,12 +29,12 @@
  
 #include "egg-datetime.h"
 
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
-#include "seahorse-progress.h"
 #include "seahorse-gtkstock.h"
+#include "seahorse-registry.h"
 #include "seahorse-passphrase.h"
-#include "seahorse-gtkstock.h"
+#include "seahorse-progress.h"
+#include "seahorse-util.h"
+#include "seahorse-widget.h"
 
 #include "seahorse-pgp.h"
 #include "seahorse-gpgme.h"
@@ -43,8 +43,6 @@
 #include "seahorse-gpgme-key-op.h"
 #include "seahorse-gpgme-source.h"
 
-#include "common/seahorse-registry.h"
-
 /**
  * SECTION:seahorse-gpgme-generate
  * @short_description: This file contains creation dialogs for pgp key creation.
diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c
index b006b3d..735a978 100644
--- a/pgp/seahorse-gpgme-key-op.c
+++ b/pgp/seahorse-gpgme-key-op.c
@@ -32,11 +32,10 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
+#include "seahorse-object-list.h"
 #include "seahorse-progress.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-object-list.h"
-
 #include "pgp/seahorse-gpgme.h"
 #include "pgp/seahorse-gpgme-data.h"
 #include "pgp/seahorse-gpg-op.h"
diff --git a/pgp/seahorse-gpgme-key.c b/pgp/seahorse-gpgme-key.c
index 729d6e3..dc4a06e 100644
--- a/pgp/seahorse-gpgme-key.c
+++ b/pgp/seahorse-gpgme-key.c
@@ -26,12 +26,11 @@
 #include <glib/gi18n.h>
 
 #include "seahorse-context.h"
+#include "seahorse-object-list.h"
 #include "seahorse-source.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-object-list.h"
-
 #include "pgp/seahorse-pgp-key.h"
 #include "pgp/seahorse-gpgme.h"
 #include "pgp/seahorse-gpgme-key-op.h"
diff --git a/pgp/seahorse-gpgme-source.c b/pgp/seahorse-gpgme-source.c
index 2c69a07..5ec9b76 100644
--- a/pgp/seahorse-gpgme-source.c
+++ b/pgp/seahorse-gpgme-source.c
@@ -33,11 +33,10 @@
 #include "seahorse-pgp-key.h"
 
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 #include "seahorse-passphrase.h"
 
-#include "common/seahorse-registry.h"
-
 #include <gio/gio.h>
 
 #include <stdlib.h>
diff --git a/pgp/seahorse-gpgme-uid.c b/pgp/seahorse-gpgme-uid.c
index 3dd9b47..c5e3b54 100644
--- a/pgp/seahorse-gpgme-uid.c
+++ b/pgp/seahorse-gpgme-uid.c
@@ -27,7 +27,7 @@
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-signature.h"
 
-#include "common/seahorse-object-list.h"
+#include "seahorse-object-list.h"
 
 #include <string.h>
 
diff --git a/pgp/seahorse-hkp-source.c b/pgp/seahorse-hkp-source.c
index a7e61b3..0a2f0a0 100644
--- a/pgp/seahorse-hkp-source.c
+++ b/pgp/seahorse-hkp-source.c
@@ -34,12 +34,11 @@
 #include "seahorse-pgp-uid.h"
 #include "seahorse-servers.h"
 
+#include "seahorse-object-list.h"
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-registry.h"
-#include "common/seahorse-object-list.h"
-
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_HKP
diff --git a/pgp/seahorse-ldap-source.c b/pgp/seahorse-ldap-source.c
index d837eb0..24a18b3 100644
--- a/pgp/seahorse-ldap-source.c
+++ b/pgp/seahorse-ldap-source.c
@@ -34,13 +34,12 @@
 #include "seahorse-pgp-subkey.h"
 #include "seahorse-pgp-uid.h"
 
+#include "seahorse-object-list.h"
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-servers.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-registry.h"
-#include "common/seahorse-object-list.h"
-
 #include <ldap.h>
 
 #ifdef WITH_SOUP
diff --git a/pgp/seahorse-pgp-commands.c b/pgp/seahorse-pgp-commands.c
index c0d5b0a..64b33b3 100644
--- a/pgp/seahorse-pgp-commands.c
+++ b/pgp/seahorse-pgp-commands.c
@@ -32,9 +32,8 @@
 #include "seahorse-pgp-commands.h"
 #include "seahorse-pgp-dialogs.h"
 
-#include "common/seahorse-registry.h"
-
 #include "seahorse-object.h"
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 
 enum {
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index 5e0ed39..1e63b03 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -30,6 +30,7 @@
   
 #include <glib/gi18n.h>
 
+#include "seahorse-bind.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-object.h"
 #include "seahorse-object-model.h"
@@ -46,8 +47,6 @@
 #include "seahorse-pgp-signature.h"
 #include "seahorse-pgp-subkey.h"
 
-#include "common/seahorse-bind.h"
-
 #define DEBUG_FLAG SEAHORSE_DEBUG_KEYS
 #include "seahorse-debug.h"
 
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 12be42e..1771dcf 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -24,12 +24,11 @@
 
 #include <glib/gi18n.h>
 
-#include "seahorse-source.h"
 #include "seahorse-gtkstock.h"
+#include "seahorse-object-list.h"
+#include "seahorse-source.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-object-list.h"
-
 #include "pgp/seahorse-pgp.h"
 #include "pgp/seahorse-pgp-key.h"
 #include "pgp/seahorse-pgp-uid.h"
diff --git a/pgp/seahorse-pgp-uid.c b/pgp/seahorse-pgp-uid.c
index 6752f73..dbf6871 100644
--- a/pgp/seahorse-pgp-uid.c
+++ b/pgp/seahorse-pgp-uid.c
@@ -26,7 +26,7 @@
 #include "seahorse-pgp-uid.h"
 #include "seahorse-pgp-signature.h"
 
-#include "common/seahorse-object-list.h"
+#include "seahorse-object-list.h"
 
 #include <string.h>
 
diff --git a/pgp/seahorse-server-source.c b/pgp/seahorse-server-source.c
index 9bb1009..8dd57b7 100644
--- a/pgp/seahorse-server-source.c
+++ b/pgp/seahorse-server-source.c
@@ -27,13 +27,13 @@
 
 #include <glib/gi18n.h>
 
-#include "seahorse-ldap-source.h"
 #include "seahorse-hkp-source.h"
-#include "seahorse-server-source.h"
-#include "seahorse-util.h"
+#include "seahorse-ldap-source.h"
 #include "seahorse-pgp-key.h"
+#include "seahorse-server-source.h"
 
-#include "common/seahorse-registry.h"
+#include "seahorse-registry.h"
+#include "seahorse-util.h"
 
 /**
  * SECTION:seahorse-server-source
diff --git a/pkcs11/seahorse-pkcs11-commands.c b/pkcs11/seahorse-pkcs11-commands.c
index b256830..be3f905 100644
--- a/pkcs11/seahorse-pkcs11-commands.c
+++ b/pkcs11/seahorse-pkcs11-commands.c
@@ -30,10 +30,9 @@
 #include "seahorse-pkcs11-operations.h"
 
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-registry.h"
-
 enum {
 	PROP_0
 };
diff --git a/pkcs11/seahorse-pkcs11-operations.c b/pkcs11/seahorse-pkcs11-operations.c
index 3ae32b6..97fec38 100644
--- a/pkcs11/seahorse-pkcs11-operations.c
+++ b/pkcs11/seahorse-pkcs11-operations.c
@@ -26,8 +26,8 @@
 #include "seahorse-pkcs11-operations.h"
 #include "seahorse-pkcs11-source.h"
 
+#include "seahorse-object-list.h"
 #include "seahorse-progress.h"
-#include "common/seahorse-object-list.h"
 
 #include <gck/gck.h>
 #include <gck/pkcs11.h>
diff --git a/pkcs11/seahorse-pkcs11-source.c b/pkcs11/seahorse-pkcs11-source.c
index 1fa8fe9..4eac5d5 100644
--- a/pkcs11/seahorse-pkcs11-source.c
+++ b/pkcs11/seahorse-pkcs11-source.c
@@ -38,7 +38,7 @@
 #include "seahorse-pkcs11-operations.h"
 #include "seahorse-pkcs11-source.h"
 
-#include "common/seahorse-registry.h"
+#include "seahorse-registry.h"
 
 enum {
     PROP_0,
diff --git a/src/Makefile.am b/src/Makefile.am
index 948436a..4d1e3ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,7 +58,6 @@ seahorse_LDADD = \
 	$(SSH_LDADD) \
 	$(PKCS11_LDADD) \
 	$(top_builddir)/gkr/libseahorse-gkr.la \
-	$(top_builddir)/common/libseahorse-common.la \
 	$(top_builddir)/libegg/libeggdatetime.la \
 	$(SEAHORSE_LIBS)
 
diff --git a/src/seahorse-generate-select.c b/src/seahorse-generate-select.c
index 23479fc..f673507 100644
--- a/src/seahorse-generate-select.c
+++ b/src/seahorse-generate-select.c
@@ -23,8 +23,8 @@
 
 #include "seahorse-generate-select.h"
 
-#include "common/seahorse-object-list.h"
-#include "common/seahorse-registry.h"
+#include "seahorse-object-list.h"
+#include "seahorse-registry.h"
 
 typedef enum  {
 	COLUMN_ICON,
diff --git a/src/seahorse-main.c b/src/seahorse-main.c
index 1e2a759..f1ce25c 100644
--- a/src/seahorse-main.c
+++ b/src/seahorse-main.c
@@ -22,16 +22,15 @@
 
 #include "config.h"
 
+#include "seahorse-cleanup.h"
 #include "seahorse-context.h"
-#include "seahorse-util.h"
 #include "seahorse-gtkstock.h"
+#include "seahorse-registry.h"
 #include "seahorse-secure-memory.h"
+#include "seahorse-util.h"
 
 #include "seahorse-key-manager.h"
 
-#include "common/seahorse-cleanup.h"
-#include "common/seahorse-registry.h"
-
 #ifdef WITH_PGP
 #include "pgp/seahorse-pgp-module.h"
 #endif
diff --git a/src/seahorse-viewer.c b/src/seahorse-viewer.c
index 0a33022..074f365 100644
--- a/src/seahorse-viewer.c
+++ b/src/seahorse-viewer.c
@@ -24,14 +24,14 @@
 
 #include "seahorse-commands.h"
 #include "seahorse-object.h"
+#include "seahorse-object-list.h"
 #include "seahorse-preferences.h"
 #include "seahorse-progress.h"
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 #include "seahorse-view.h"
 #include "seahorse-viewer.h"
 
-#include "common/seahorse-object-list.h"
-#include "common/seahorse-registry.h"
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
diff --git a/ssh/seahorse-ssh-commands.c b/ssh/seahorse-ssh-commands.c
index 44aafae..ca055a3 100644
--- a/ssh/seahorse-ssh-commands.c
+++ b/ssh/seahorse-ssh-commands.c
@@ -29,9 +29,8 @@
 #include "seahorse-ssh-dialogs.h"
 #include "seahorse-ssh-operation.h"
 
-#include "common/seahorse-registry.h"
-
 #include "seahorse-object.h"
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 
 enum {
diff --git a/ssh/seahorse-ssh-generate.c b/ssh/seahorse-ssh-generate.c
index 6608582..5b9e215 100644
--- a/ssh/seahorse-ssh-generate.c
+++ b/ssh/seahorse-ssh-generate.c
@@ -32,12 +32,12 @@
 #include "seahorse-ssh.h"
 #include "seahorse-ssh-operation.h"
 
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
-#include "seahorse-progress.h"
 #include "seahorse-gtkstock.h"
+#include "seahorse-progress.h"
+#include "seahorse-registry.h"
+#include "seahorse-util.h"
+#include "seahorse-widget.h"
 
-#include "common/seahorse-registry.h"
 
 /* --------------------------------------------------------------------------
  * ACTIONS
diff --git a/ssh/seahorse-ssh-key-properties.c b/ssh/seahorse-ssh-key-properties.c
index 9b13f2c..1e4ff5d 100644
--- a/ssh/seahorse-ssh-key-properties.c
+++ b/ssh/seahorse-ssh-key-properties.c
@@ -21,14 +21,13 @@
  */
 #include "config.h"
 
+#include "seahorse-bind.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-object.h"
 #include "seahorse-object-widget.h"
 #include "seahorse-util.h"
 #include "seahorse-validity.h"
 
-#include "common/seahorse-bind.h"
-
 #include "ssh/seahorse-ssh-key.h"
 #include "ssh/seahorse-ssh-operation.h"
 
diff --git a/ssh/seahorse-ssh-source.c b/ssh/seahorse-ssh-source.c
index fe4f520..0f44520 100644
--- a/ssh/seahorse-ssh-source.c
+++ b/ssh/seahorse-ssh-source.c
@@ -28,10 +28,9 @@
 #include "seahorse-ssh-key.h"
 #include "seahorse-ssh-operation.h"
 
+#include "seahorse-registry.h"
 #include "seahorse-util.h"
 
-#include "common/seahorse-registry.h"
-
 #include <glib/gstdio.h>
 
 #include <string.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]