[seahorse: 1/3] Remove key sharing from seahorse into its own project.
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse: 1/3] Remove key sharing from seahorse into its own project.
- Date: Sun, 3 Oct 2010 19:04:58 +0000 (UTC)
commit f55f0e3b2194e23da28090e46a8a334cf0b58263
Author: Stef Walter <stef memberwebs com>
Date: Mon Aug 30 21:59:38 2010 +0000
Remove key sharing from seahorse into its own project.
daemon/Makefile.am | 10 +-
daemon/seahorse-daemon.1 | 3 +-
daemon/seahorse-daemon.c | 15 -
daemon/seahorse-daemon.h | 29 -
daemon/seahorse-hkp-server.c | 668 ------------------
daemon/seahorse-sharing.c | 348 ----------
libseahorse/seahorse-gconf.h | 2 -
libseahorse/seahorse-gtkstock.c | 1 -
libseahorse/seahorse-gtkstock.h | 1 -
libseahorse/seahorse-prefs.c | 26 -
libseahorse/seahorse-prefs.xml | 71 +--
pixmaps/22x22/Makefile.am | 2 -
pixmaps/22x22/seahorse-share-keys.png | Bin 1127 -> 0 bytes
pixmaps/22x22/seahorse-share-keys.svg | 1091 ------------------------------
pixmaps/48x48/Makefile.am | 1 -
pixmaps/48x48/seahorse-share-keys.png | Bin 2966 -> 0 bytes
pixmaps/scalable/Makefile.am | 1 -
pixmaps/scalable/seahorse-share-keys.svg | 528 ---------------
18 files changed, 4 insertions(+), 2793 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 670b64f..664859e 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -21,12 +21,6 @@ BUILT_SOURCES = \
seahorse-service-keyset-bindings.h \
seahorse-service-crypto-bindings.h
-if WITH_SHARING
-SHARING_SRCS = seahorse-hkp-server.c seahorse-sharing.c
-else
-SHARING_SRCS =
-endif
-
if WITH_PGP
PGP_LDADD = $(top_builddir)/pgp/libseahorse-pgp.la
PGP_SRCS = seahorse-service-crypto.c
@@ -45,9 +39,7 @@ 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) \
- $(SHARING_SRCS)
-
+ $(PGP_SRCS)
seahorse_daemon_LDADD = \
$(top_builddir)/libseahorse/libseahorse.la \
diff --git a/daemon/seahorse-daemon.1 b/daemon/seahorse-daemon.1
index 11966ef..cfa8d05 100644
--- a/daemon/seahorse-daemon.1
+++ b/daemon/seahorse-daemon.1
@@ -16,8 +16,7 @@ seahorse\-daemon \- seahorse pass phrase caching agent
.PP
Seahorse is a GNOME application for managing encryption keys.
.PP
-This is the daemon program which provides services to other parts of Seahorse,
-and shares your keys over the network if so desired.
+This is the daemon program which provides services to other parts of Seahorse.
.SH "OPTIONS"
diff --git a/daemon/seahorse-daemon.c b/daemon/seahorse-daemon.c
index 4ae06b4..0244a61 100644
--- a/daemon/seahorse-daemon.c
+++ b/daemon/seahorse-daemon.c
@@ -59,11 +59,6 @@ static gboolean daemon_no_daemonize = FALSE;
static gboolean daemon_running = FALSE;
static gboolean daemon_quit = FALSE;
-static const gchar *daemon_icons[] = {
- SEAHORSE_ICON_SHARING,
- NULL
-};
-
static const GOptionEntry options[] = {
{ "no-daemonize", 'd', 0, G_OPTION_ARG_NONE, &daemon_no_daemonize,
N_("Do not run seahorse-daemon as a daemon"), NULL },
@@ -281,7 +276,6 @@ int main(int argc, char* argv[])
/* Insert Icons into Stock */
seahorse_gtkstock_init ();
- seahorse_gtkstock_add_icons (daemon_icons);
/* Make the default SeahorseContext */
seahorse_context_new (SEAHORSE_CONTEXT_APP | SEAHORSE_CONTEXT_DAEMON);
@@ -299,10 +293,6 @@ int main(int argc, char* argv[])
/* Initialize the various daemon components */
seahorse_dbus_server_init ();
-#ifdef WITH_SHARING
- seahorse_sharing_init ();
-#endif
-
/* Sometimes we've already gotten a quit signal */
if(!daemon_quit) {
daemon_running = TRUE;
@@ -310,11 +300,6 @@ int main(int argc, char* argv[])
g_message ("left gtk_main\n");
}
- /* And now clean them all up */
-#ifdef WITH_SHARING
- seahorse_sharing_cleanup ();
-#endif
-
seahorse_dbus_server_cleanup ();
g_option_context_free (octx);
diff --git a/daemon/seahorse-daemon.h b/daemon/seahorse-daemon.h
index 1eb71c5..2487320 100644
--- a/daemon/seahorse-daemon.h
+++ b/daemon/seahorse-daemon.h
@@ -25,35 +25,6 @@
#include "config.h"
#include <dbus/dbus-glib-bindings.h>
-#define SEAHORSE_ICON_SHARING "seahorse-share-keys"
-
-/* seahorse-sharing.c ------------------------------------------------------- */
-
-#ifdef WITH_SHARING
-
-void seahorse_sharing_init();
-
-void seahorse_sharing_cleanup();
-
-#endif
-
-/* seahorse-hkp-server.c ---------------------------------------------------- */
-
-#ifdef WITH_HKP
-
-gboolean seahorse_hkp_server_start (GError **err);
-
-void seahorse_hkp_server_stop ();
-
-guint seahorse_hkp_server_get_port ();
-
-gboolean seahorse_hkp_server_is_running ();
-
-#define HKP_SERVER_ERROR (seahorse_hkp_server_error_domain ())
-GQuark seahorse_hkp_server_error_domain ();
-
-#endif
-
/* seahorse-dbus-server.c --------------------------------------------------- */
diff --git a/libseahorse/seahorse-gconf.h b/libseahorse/seahorse-gconf.h
index 1302f0c..516cf92 100644
--- a/libseahorse/seahorse-gconf.h
+++ b/libseahorse/seahorse-gconf.h
@@ -42,8 +42,6 @@
#define SEAHORSE_SCHEMAS "/apps/seahorse"
-#define KEYSHARING_KEY SEAHORSE_SCHEMAS "/sharing/sharing_enabled"
-
#define WINDOW_SIZE SEAHORSE_SCHEMAS "/windows/"
void seahorse_gconf_disconnect ();
diff --git a/libseahorse/seahorse-gtkstock.c b/libseahorse/seahorse-gtkstock.c
index 564537a..1b5f0bc 100644
--- a/libseahorse/seahorse-gtkstock.c
+++ b/libseahorse/seahorse-gtkstock.c
@@ -38,7 +38,6 @@ static const gchar *seahorse_icons[] = {
SEAHORSE_STOCK_SIGN_OK,
SEAHORSE_STOCK_SIGN_BAD,
SEAHORSE_STOCK_SIGN_UNKNOWN,
- SEAHORSE_STOCK_SHARING,
NULL
};
diff --git a/libseahorse/seahorse-gtkstock.h b/libseahorse/seahorse-gtkstock.h
index 5613f57..1a422de 100644
--- a/libseahorse/seahorse-gtkstock.h
+++ b/libseahorse/seahorse-gtkstock.h
@@ -37,7 +37,6 @@
#define SEAHORSE_STOCK_SIGN_OK "seahorse-sign-ok"
#define SEAHORSE_STOCK_SIGN_BAD "seahorse-sign-bad"
#define SEAHORSE_STOCK_SIGN_UNKNOWN "seahorse-sign-unknown"
-#define SEAHORSE_STOCK_SHARING "seahorse-share-keys"
#define SEAHORSE_THEMED_WEBBROWSER "web-browser"
#define SEAHORSE_THEMED_FOLDER "folder"
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index 644003d..11a8ff9 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -436,24 +436,6 @@ setup_keyservers (SeahorseWidget *swidget)
#endif /* WITH_KEYSERVER */
-#ifdef WITH_SHARING
-
-/* Key Sharing Prefs -------------------------------------------------------- */
-
-static void
-setup_sharing (SeahorseWidget *swidget)
-{
- GtkWidget *widget = seahorse_widget_get_widget (swidget, "enable-sharing");
- g_return_if_fail (widget != NULL);
- seahorse_check_button_gconf_attach (GTK_CHECK_BUTTON (widget), KEYSHARING_KEY);
-
- widget = seahorse_widget_get_widget (swidget, "key-sharing-image");
- g_return_if_fail (widget != NULL);
- gtk_image_set_from_stock (GTK_IMAGE (widget), SEAHORSE_STOCK_SHARING, GTK_ICON_SIZE_DIALOG);
-}
-
-#endif /* WITH_SHARING */
-
/* -------------------------------------------------------------------------- */
/**
@@ -485,14 +467,6 @@ seahorse_prefs_new (GtkWindow *parent)
seahorse_prefs_remove_tab (swidget, widget);
#endif
-#ifdef WITH_SHARING
- setup_sharing (swidget);
-#else
- widget = GTK_WIDGET (seahorse_widget_get_widget (swidget, "sharing-tab"));
- g_return_val_if_fail (GTK_IS_WIDGET (widget), swidget);
- seahorse_prefs_remove_tab (swidget, widget);
-#endif
-
seahorse_widget_show (swidget);
} else {
swidget = seahorse_widget_find ("prefs");
diff --git a/libseahorse/seahorse-prefs.xml b/libseahorse/seahorse-prefs.xml
index 1ffa81a..7294905 100644
--- a/libseahorse/seahorse-prefs.xml
+++ b/libseahorse/seahorse-prefs.xml
@@ -181,77 +181,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="sharing-tab">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="enable-sharing">
- <property name="label" translatable="yes">_Share my keys with others on my network</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="key-sharing-image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- <property name="icon_name">seahorse-share-keys</property>
- <property name="icon-size">6</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sharing your keys allows other people on your network to use the keys you've collected. This means they can automatically encrypt things for you or those you know, without you having to send them your key.
-
-<b>Note:</b> Your personal keys will not be compromised.</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Key Sharing</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
diff --git a/pixmaps/22x22/Makefile.am b/pixmaps/22x22/Makefile.am
index 4d191d4..60922ce 100644
--- a/pixmaps/22x22/Makefile.am
+++ b/pixmaps/22x22/Makefile.am
@@ -4,7 +4,6 @@ icon22_DATA = seahorse-key.png \
seahorse-key-personal.png \
seahorse-key-ssh.png \
seahorse-person.png \
- seahorse-share-keys.png \
seahorse-sign.png \
seahorse-sign-ok.png \
seahorse-sign-bad.png
@@ -13,7 +12,6 @@ iconsrc = seahorse-key.svg \
seahorse-key-personal.svg \
seahorse-key-ssh.svg \
seahorse-person.svg \
- seahorse-share-keys.svg \
seahorse-sign.svg \
seahorse-sign-ok.svg \
seahorse-sign-bad.svg
diff --git a/pixmaps/48x48/Makefile.am b/pixmaps/48x48/Makefile.am
index 2b67c40..a91f86f 100644
--- a/pixmaps/48x48/Makefile.am
+++ b/pixmaps/48x48/Makefile.am
@@ -4,7 +4,6 @@ icon48_DATA = seahorse-key.png \
seahorse-key-personal.png \
seahorse-key-ssh.png \
seahorse-person.png \
- seahorse-share-keys.png \
seahorse-sign.png \
seahorse-sign-bad.png \
seahorse-sign-ok.png \
diff --git a/pixmaps/scalable/Makefile.am b/pixmaps/scalable/Makefile.am
index 86577ec..e43463b 100644
--- a/pixmaps/scalable/Makefile.am
+++ b/pixmaps/scalable/Makefile.am
@@ -3,7 +3,6 @@ iconsvg_DATA = seahorse-key.svg \
seahorse-key-personal.svg \
seahorse-key-ssh.svg \
seahorse-person.svg \
- seahorse-share-keys.svg \
seahorse-sign.svg \
seahorse-sign-bad.svg \
seahorse-sign-ok.svg \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
