Commit 4bb25dbe authored by Stef Walter's avatar Stef Walter Committed by nobody

Split libcryptui out from seahorse.

 * This includes seahorse-daemon
 * Part of making seahorse development more manageable and changing
   its focused back to key management.

https://bugzilla.gnome.org/show_bug.cgi?id=655118
parent 018d8c2c
Open bugs can be found under the 'seahorse' component at:
http://bugzilla.gnome.org/
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -2,76 +2,40 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
if WITH_PKCS11
PKCS11_DIR = pkcs11
else
PKCS11_DIR =
endif
if WITH_SSH
SSH_DIR = ssh
else
SSH_DIR =
endif
if WITH_PGP
PGP_DIR = pgp
else
PGP_DIR =
endif
SUBDIRS = libegg \
libcryptui \
common \
libseahorse \
gkr \
$(PKCS11_DIR) \
$(PGP_DIR) \
$(SSH_DIR) \
src \
po \
data \
help \
pixmaps \
daemon \
reference
EXTRA_DIST = \
AUTHORS \
COPYING \
COPYING-DOCS \
COPYING-LIBCRYPTUI \
ChangeLog \
ChangeLog.pre-auto \
ChangeLog.pre-1.0 \
ChangeLog.pre-0.6 \
HACKING \
INSTALL \
MAINTAINERS \
NEWS \
README \
THANKS \
TODO \
seahorse.spec \
seahorse.spec.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
gnome-doc-utils.make \
omf.make
AUTHORS \
COPYING \
COPYING-DOCS \
COPYING-LIBCRYPTUI \
ChangeLog \
HACKING \
INSTALL \
MAINTAINERS \
NEWS \
README \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
gnome-doc-utils.make
DISTCLEANFILES = \
gnome-doc-utils.make \
intltool-extract \
intltool-merge \
intltool-update
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
--disable-update-mime-database \
--enable-gtk-doc \
--disable-debug
CHANGELOG_START = \
d2f8367dc600080b6cf3edbe4e2fc204f929471e
......
Contributors:
Jose Carlos Garcia Sogo for bug fixes, spanish, translation,
overall assistance, and letting me manage seahorse(2)
Jean Schurger for rpms and the new icon
Erich Schubert for testing, bug fixes,
and initial german translation
Yanko Kaneti for bug fixes and a spec file
Adam Schreiber for contributions and patches
Albrecht Dreß the initial GPGME upgrade patch
Fernando Herrera for the Nautilus 2.10 support
Gnome translation & doc teams, especially Jordi Mallach
for package help
seahorse(1) authors:
Jose Carlos Garcia Sogo, Anthony Mulcahy, Steffen Zahn, Stef Walter
GnuPG, GPGME, and GPA teams, specifically Miguel Coca, Marcus Brinkmann,
and Werner Koch, for their assistance and hard work.
TODO (last updated 2006-09-09)
==============================
Seahorse TODO list. Also check bugzilla.gnome.org for more specific bugs & enhancements.
Items are listed under the stable release version goal.
For example, items under 1.0 will be implemented in the 0.9 series,
and items under 1.2 will be implemented in the 1.1 series.
A = assigned
X = finished
? = not necessarily required, maybe not possible or worth effort
Contact a maintainer on seahorse-devel@lists.sourceforge.net
if you'd like to be responsible for a task.
For 1.0 release
---------------
[ ] Transparent use of key servers
[ ] General simplification of concepts and UI
[ ] Usability review
[ ] Update help with new usage & more concepts
[ ] Accessability review
[ ] X.509 certificate support
......@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="seahorse"
PKG_NAME="libcryptui"
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
......@@ -19,7 +19,7 @@ which gnome-autogen.sh || {
(gtkdocize --flavour=no-tmpl) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have gtk-doc installed to compile seahorse."
echo "You must have gtk-doc installed to compile libcryptui."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
DIE=1
......
/.*
/Makefile
/Makefile.in
localedir = $(datadir)/locale
INCLUDES = -I$(top_builddir) \
-I$(top_srcdir) \
$(SEAHORSE_CFLAGS)
noinst_LTLIBRARIES = libseahorse-common.la
libseahorse_common_la_SOURCES = \
seahorse-bind.c seahorse-bind.h \
seahorse-cleanup.c seahorse-cleanup.h \
seahorse-object-list.c seahorse-object-list.h \
seahorse-registry.c seahorse-registry.h \
seahorse-secure-buffer.c seahorse-secure-buffer.h
\ No newline at end of file
This diff is collapsed.
/*
* Seahorse
*
* Copyright (C) 2008 Stefan Walter
*
* 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.
*/
#ifndef SEAHORSEBIND_H_
#define SEAHORSEBIND_H_
#include <glib-object.h>
typedef gboolean (*SeahorseTransform) (const GValue *src, GValue *dest);
gpointer seahorse_bind_property (const gchar *prop_src, gpointer obj_src,
const gchar *prop_dest, gpointer obj_dest);
gpointer seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
SeahorseTransform transform,
const gchar *prop_dest, ...) G_GNUC_NULL_TERMINATED;
typedef gboolean (*SeahorseTransfer) (GObject *src, GObject *dest);
gpointer seahorse_bind_objects (const gchar *property, gpointer obj_src,
SeahorseTransfer transfer, gpointer obj_dest);
void seahorse_bind_disconnect (gpointer binding);
#endif /* SEAHORSEBIND_H_ */
/*
* Seahorse
*
* Copyright (C) 2008 Stefan Walter
*
* 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.
*/
#include "seahorse-cleanup.h"
typedef struct _SeahorseCleanup {
GDestroyNotify notify;
gpointer user_data;
} SeahorseCleanup;
static GSList *registered_cleanups = NULL;
void
seahorse_cleanup_register (GDestroyNotify notify, gpointer user_data)
{
SeahorseCleanup *cleanup = g_new0 (SeahorseCleanup, 1);
g_assert (notify);
cleanup->notify = notify;
cleanup->user_data = user_data;
/* Note we're reversing the order, so calls happen that way */
registered_cleanups = g_slist_prepend (registered_cleanups, cleanup);
}
void
seahorse_cleanup_unregister (GDestroyNotify notify, gpointer user_data)
{
SeahorseCleanup *cleanup;
GSList *l;
for (l = registered_cleanups; l; l = g_slist_next (l)) {
cleanup = (SeahorseCleanup*)l->data;
if (cleanup->notify == notify && cleanup->user_data == user_data) {
registered_cleanups = g_slist_remove (registered_cleanups, cleanup);
break;
}
}
}
void
seahorse_cleanup_perform (void)
{
GSList *cleanups, *l;
SeahorseCleanup *cleanup;
while (registered_cleanups) {
/*
* While performing cleanups, more cleanups may be registered.
* So swap out the list, and keep going until empty.
*/
cleanups = registered_cleanups;
registered_cleanups = NULL;
for (l = cleanups; l; l = g_slist_next (l)) {
cleanup = (SeahorseCleanup*)l->data;
g_assert (cleanup->notify);
(cleanup->notify) (cleanup->user_data);
g_free (cleanup);
}
g_slist_free (cleanups);
}
}
/*
* Seahorse
*
* Copyright (C) 2008 Stefan Walter
*
* 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.
*/
#ifndef GKRCLEANUP_H_
#define GKRCLEANUP_H_
#include <glib.h>
void seahorse_cleanup_register (GDestroyNotify notify, gpointer user_data);
void seahorse_cleanup_unregister (GDestroyNotify notify, gpointer user_data);
void seahorse_cleanup_perform (void);
#endif /* GKRCLEANUP_H_ */
This diff is collapsed.
/*
* Seahorse
*
* Copyright (C) 2008 Stefan Walter
*
* 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.
*/
#ifndef SEAHORSEREGISTRY_H_
#define SEAHORSEREGISTRY_H_
#include <glib-object.h>
G_BEGIN_DECLS
#define SEAHORSE_TYPE_REGISTRY (seahorse_registry_get_type())
#define SEAHORSE_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SEAHORSE_TYPE_REGISTRY, SeahorseRegistry))
#define SEAHORSE_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SEAHORSE_TYPE_REGISTRY, GObject))
#define SEAHORSE_IS_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SEAHORSE_TYPE_REGISTRY))
#define SEAHORSE_IS_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SEAHORSE_TYPE_REGISTRY))
#define SEAHORSE_REGISTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), SEAHORSE_TYPE_REGISTRY, SeahorseRegistryClass))
typedef struct _SeahorseRegistry SeahorseRegistry;
typedef struct _SeahorseRegistryClass SeahorseRegistryClass;
struct _SeahorseRegistry {
GObject parent;
};
struct _SeahorseRegistryClass {
GObjectClass parent_class;
};
/* member functions */
GType seahorse_registry_get_type (void) G_GNUC_CONST;
SeahorseRegistry* seahorse_registry_get (void);
void seahorse_registry_register_type (SeahorseRegistry *registry,
GType type, const gchar *category,
...) G_GNUC_NULL_TERMINATED;
void seahorse_registry_register_object (SeahorseRegistry *registry,
GObject *object, const gchar *category,
...) G_GNUC_NULL_TERMINATED;
void seahorse_registry_register_function (SeahorseRegistry *registry,
gpointer func, const gchar *category,
...) G_GNUC_NULL_TERMINATED;
GType seahorse_registry_object_type (SeahorseRegistry *registry,
const gchar *category,
...) G_GNUC_NULL_TERMINATED;
GList* seahorse_registry_object_types (SeahorseRegistry *registry,
const gchar *category,
...) G_GNUC_NULL_TERMINATED;
GObject* seahorse_registry_object_instance (SeahorseRegistry *registry,
const gchar *category,
...) G_GNUC_NULL_TERMINATED;
GList* seahorse_registry_object_instances (SeahorseRegistry *registry,
const gchar *category,
...) G_GNUC_NULL_TERMINATED;
gpointer seahorse_registry_lookup_function (SeahorseRegistry *registry,
const gchar *category,
...) G_GNUC_NULL_TERMINATED;
G_END_DECLS
#endif /*SEAHORSEREGISTRY_H_*/
This diff is collapsed.
localedir = $(datadir)/locale
pixmapsdir = $(datadir)/pixmaps/
uidir = $(datadir)/seahorse/ui/
INCLUDES = -I$(top_builddir) \
-I$(top_srcdir) \
......@@ -12,40 +13,68 @@ INCLUDES = -I$(top_builddir) \
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\"
-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-DSEAHORSE_UIDIR=\""$(uidir)"\"
bin_PROGRAMS = seahorse-daemon
MARSHAL_SRCS = \
seahorse-marshal.c seahorse-marshal.h
BUILT_SOURCES = \
seahorse-service-bindings.h \
seahorse-service-keyset-bindings.h \
seahorse-service-crypto-bindings.h
if WITH_PGP
PGP_LDADD = $(top_builddir)/pgp/libseahorse-pgp.la
PGP_SRCS = seahorse-service-crypto.c
else
PGP_LDADD =
PGP_SRCS =
endif
if WITH_SSH
SSH_LDADD = $(top_builddir)/ssh/libseahorse-ssh.la
else
SSH_LDADD =
endif
seahorse-service-crypto-bindings.h \
$(MARSHAL_SRCS)
seahorse_daemon_SOURCES = \
seahorse-daemon.c seahorse-daemon.h \
seahorse-dbus-server.c seahorse-service.c seahorse-service.h \
seahorse-service-keyset.c \
$(PGP_SRCS)
seahorse-daemon.c seahorse-daemon.h \
seahorse-dbus-server.c \
seahorse-gpgme.c seahorse-gpgme.h \
seahorse-gpgme-data.c seahorse-gpgme-data.h \
seahorse-gpgme-generate.c seahorse-gpgme-generate.h \
seahorse-gpgme-key.c seahorse-gpgme-key.h \
seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \
seahorse-gpgme-operation.c seahorse-gpgme-operation.h \
seahorse-gpgme-source.c seahorse-gpgme-source.h \
seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \
seahorse-gpgme-uid.c seahorse-gpgme-uid.h \
seahorse-gpg-op.h seahorse-gpg-op.c \
seahorse-gpg-options.c seahorse-gpg-options.h \
seahorse-object-list.c seahorse-object-list.h \
seahorse-pgp.c seahorse-pgp.h \
seahorse-pgp-key.c seahorse-pgp-key.h \
seahorse-pgp-keysets.c seahorse-pgp-keysets.h \
seahorse-pgp-module.c seahorse-pgp-module.h \
seahorse-pgp-signature.c seahorse-pgp-signature.h \
seahorse-pgp-subkey.c seahorse-pgp-subkey.h \
seahorse-pgp-uid.c seahorse-pgp-uid.h \
seahorse-secure-buffer.c seahorse-secure-buffer.h \
seahorse-service.c seahorse-service.h \
seahorse-service-keyset.c seahorse-service-crypto.c \
seahorse-context.c seahorse-context.h \
seahorse-gconf.c seahorse-gconf.h \
seahorse-gtkstock.c seahorse-gtkstock.h \
seahorse-libdialogs.h \
seahorse-notification.c \
seahorse-object.c seahorse-object.h \
seahorse-operation.c seahorse-operation.h \
seahorse-passphrase.c seahorse-passphrase.h \
seahorse-progress.c seahorse-progress.h \
seahorse-secure-memory.c seahorse-secure-memory.h \
seahorse-set.c seahorse-set.h \
seahorse-source.c seahorse-source.h \
seahorse-transfer-operation.c seahorse-transfer-operation.h \
seahorse-types.c seahorse-types.h \
seahorse-unix-signal.c seahorse-unix-signal.h \
seahorse-unknown.c seahorse-unknown.h \
seahorse-unknown-source.c seahorse-unknown-source.h \
seahorse-util.c seahorse-util.h \
seahorse-validity.c seahorse-validity.h \
seahorse-widget.c seahorse-widget.h \
$(BUILT_SOURCES)
seahorse_daemon_LDADD = \
$(top_builddir)/libseahorse/libseahorse.la \
$(PGP_LDADD) \
$(SSH_LDADD) \
$(top_builddir)/common/libseahorse-common.la \
$(top_builddir)/libcryptui/libcryptui.la \
$(top_builddir)/libegg/libeggdatetime.la \
$(top_builddir)/libegg/libeggsmclient.la \
......@@ -54,14 +83,16 @@ seahorse_daemon_LDADD = \
man_MANS = seahorse-daemon.1
EXTRA_DIST = \
$(man_MANS) \
seahorse-service.xml \
seahorse-service-keyset.xml \
seahorse-service-crypto.xml \
seahorse-service-bindings.h \
seahorse-service-keyset-bindings.h \
seahorse-service-crypto-bindings.h \
org.gnome.seahorse.service.in
$(man_MANS) \
seahorse-service.xml \
seahorse-service-keyset.xml \
seahorse-service-crypto.xml \
seahorse-service-bindings.h \
seahorse-service-keyset-bindings.h \
seahorse-service-crypto-bindings.h \
org.gnome.seahorse.service.in \
$(ui_DATA) \
seahorse-marshal.list
CLEANFILES = *.bak \
org.gnome.seahorse.service
......@@ -82,3 +113,15 @@ service_DATA = $(service_in_files:.service.in=.service)
# Rule to make the service file with bindir expanded
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
seahorse-marshal.c: seahorse-marshal.list $(GLIB_GENMARSHAL)
echo "#include \"seahorse-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=seahorse_marshal >> $@
ui_DATA = \
seahorse-progress.xml \
seahorse-notify.xml \
seahorse-pgp-generate.xml
......@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include "seahorse-source.h"
#include "seahorse-dns-sd.h"
#define SEAHORSE_TYPE_CONTEXT (seahorse_context_get_type ())
#define SEAHORSE_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContext))
......@@ -120,9 +119,6 @@ void seahorse_context_add_source (SeahorseContext *sct
void seahorse_context_take_source (SeahorseContext *sctx,