GNOME.org
 

[seahorse-plugins] Split out seahorse-nautilus from seahorse-plugins

commit b7a82eeabe554bcc78eeb61058f08504a15f78d5
Author: Stef Walter <stef memberwebs com>
Date:   Fri Oct 7 12:00:50 2011 +0200

    Split out seahorse-nautilus from seahorse-plugins

 configure.in                                       |    5 -
 libseahorse/Makefile.am                            |   11 +-
 libseahorse/seahorse-algo.c                        |  591 -------------
 libseahorse/seahorse-algo.h                        |   97 --
 libseahorse/seahorse-gpg-options.c                 |  551 ------------
 libseahorse/seahorse-gpg-options.h                 |   45 -
 libseahorse/seahorse-operation.c                   |  664 --------------
 libseahorse/seahorse-operation.h                   |  317 -------
 libseahorse/seahorse-passphrase.c                  |  393 --------
 libseahorse/seahorse-passphrase.h                  |   46 -
 libseahorse/seahorse-pgp-operation.c               |  463 ----------
 libseahorse/seahorse-pgp-operation.h               |   93 --
 libseahorse/seahorse-prefs.c                       |    1 -
 libseahorse/seahorse-progress.c                    |  332 -------
 libseahorse/seahorse-progress.h                    |   48 -
 libseahorse/seahorse-progress.xml                  |  127 ---
 libseahorse/seahorse-secure-buffer.c               |  196 ----
 libseahorse/seahorse-secure-buffer.h               |   57 --
 libseahorse/seahorse-unix-signal.c                 |  145 ---
 libseahorse/seahorse-unix-signal.h                 |   35 -
 libseahorse/seahorse-util.c                        |   84 --
 libseahorse/seahorse-util.h                        |    7 -
 plugins/Makefile.am                                |    8 +-
 plugins/nautilus-ext/.gitignore                    |    4 -
 plugins/nautilus-ext/Makefile.am                   |   17 -
 plugins/nautilus-ext/seahorse-nautilus-module.c    |   58 --
 plugins/nautilus-ext/seahorse-nautilus.c           |  221 -----
 plugins/nautilus-ext/seahorse-nautilus.h           |   52 --
 plugins/nautilus/Makefile.am                       |   57 +-
 .../nautilus/seahorse-pgp-encrypted.desktop.in.in  |   12 -
 plugins/nautilus/seahorse-pgp-keys.desktop.in.in   |   12 -
 .../nautilus/seahorse-pgp-signature.desktop.in.in  |   12 -
 plugins/nautilus/seahorse-tool-files.c             |  933 --------------------
 plugins/nautilus/seahorse-tool-progress.c          |  290 ------
 plugins/nautilus/seahorse-tool.1                   |  108 ---
 plugins/nautilus/seahorse-tool.c                   |  781 ----------------
 plugins/nautilus/seahorse-tool.h                   |   77 --
 plugins/nautilus/seahorse.xml                      |   54 --
 38 files changed, 9 insertions(+), 6995 deletions(-)
---
diff --git a/configure.in b/configure.in
index 31d7bfe..0612947 100644
--- a/configure.in
+++ b/configure.in
@@ -608,10 +608,6 @@ plugins/epiphany/Makefile
 plugins/epiphany/mozilla/Makefile
 plugins/gedit/Makefile
 plugins/nautilus/Makefile
-plugins/nautilus/seahorse-pgp-encrypted.desktop.in
-plugins/nautilus/seahorse-pgp-keys.desktop.in
-plugins/nautilus/seahorse-pgp-signature.desktop.in
-plugins/nautilus-ext/Makefile
 ])
 
 dnl ****************************************************************************
@@ -626,6 +622,5 @@ Plugins:
   Epiphany:              $with_epiphany_plugin    
   GEdit (v >= 2.14):     $with_gedit_plugin
   Panel Applet:          $with_panel_applet
-  Nautilus:              $with_nautilus_ext
 Notification Support:    $enable_libnotify
 "
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index 6007703..5e21d37 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -21,25 +21,17 @@ BUILT_SOURCES = \
 	seahorse-marshal.c seahorse-marshal.h
 
 libseahorse_a_SOURCES = \
-	seahorse-pgp-operation.c seahorse-pgp-operation.h \
 	seahorse-widget.c seahorse-widget.h \
 	seahorse-util.c seahorse-util.h \
 	seahorse-check-button-control.c seahorse-check-button-control.h \
-	seahorse-gpg-options.c seahorse-gpg-options.h \
-	seahorse-passphrase.c seahorse-passphrase.h \
 	seahorse-libdialogs.h \
-        seahorse-notification.c \
+	seahorse-notification.c \
 	seahorse-vfs-data.c seahorse-vfs-data.h \
 	seahorse-gpgmex.h seahorse-gpgmex-op.c seahorse-gpgmex-util.c \
 	seahorse-prefs.c seahorse-prefs.h \
-	seahorse-operation.c seahorse-operation.h \
-	seahorse-progress.c seahorse-progress.h \
 	seahorse-gconf.c seahorse-gconf.h \
 	seahorse-gtkstock.c seahorse-gtkstock.h \
 	seahorse-secure-memory.c seahorse-secure-memory.h \
-	seahorse-secure-buffer.c seahorse-secure-buffer.h \
-	seahorse-algo.c seahorse-algo.h \
-	seahorse-unix-signal.c seahorse-unix-signal.h \
 	$(BUILT_SOURCES)
 
 seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
@@ -52,7 +44,6 @@ seahorse-marshal.c: seahorse-marshal.list $(GLIB_GENMARSHAL)
 ui_DATA = \
 	seahorse-notify.xml \
 	seahorse-prefs.xml \
-	seahorse-progress.xml \
 	seahorse-multi-encrypt.xml
 
 EXTRA_DIST = $(ui_DATA) \
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index e6acaab..768b920 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -32,7 +32,6 @@
 #include "seahorse-check-button-control.h"
 #include "seahorse-gconf.h"
 #include "seahorse-gtkstock.h"
-#include "seahorse-secure-buffer.h"
 #include "seahorse-widget.h"
 
 /* From sehorse-prefs-keyrings.c */
diff --git a/libseahorse/seahorse-util.c b/libseahorse/seahorse-util.c
index 4cb7e9a..b1f5ef2 100644
--- a/libseahorse/seahorse-util.c
+++ b/libseahorse/seahorse-util.c
@@ -830,90 +830,6 @@ seahorse_util_check_suffix (const gchar *path, SeahorseSuffix suffix)
                g_str_has_suffix (path, SEAHORSE_EXT_ASC);
 }
 
-/**
- * seahorse_util_add_suffix:
- * @ctx: Gpgme Context
- * @path: Path of an existing file
- * @suffix: Suffix type
- * @prompt: Overwrite prompt text
- *
- * Constructs a new path for a file based on @path plus a suffix determined by
- * @suffix. If ASCII Armor is enabled, the suffix will be '.asc'. Otherwise the 
- * suffix will be '.pgp' if @suffix is %SEAHORSE_CRYPT_SUFFIX or '.sig' if 
- * @suffix is %SEAHORSE_SIG_SUFFIX.
- *
- * Returns: A new path with the suffix appended to @path. NULL if prompt cancelled
- **/
-gchar*
-seahorse_util_add_suffix (const gchar *path, SeahorseSuffix suffix, const gchar *prompt)
-{
-    GtkWidget *dialog;
-    const gchar *ext;
-    gchar *uri;
-    gchar *t;
-    
-    if (suffix == SEAHORSE_CRYPT_SUFFIX)
-        ext = SEAHORSE_EXT_PGP;
-    else
-        ext = SEAHORSE_EXT_SIG;
-    
-    uri = g_strdup_printf ("%s%s", path, ext);
-    
-    if (prompt && uri && seahorse_util_uri_exists (uri)) {
-            
-        t = g_strdup_printf (prompt, seahorse_util_uri_get_last (uri));
-        dialog = seahorse_util_chooser_save_new (t, NULL);
-        g_free (t);
-
-        seahorse_util_chooser_show_key_files (dialog);
-        gtk_file_chooser_select_uri (GTK_FILE_CHOOSER (dialog), uri);
-
-        g_free (uri);                
-        uri = NULL;
-            
-        uri = seahorse_util_chooser_save_prompt (dialog);
-    }
-
-    return uri;         
-}
-
-/**
- * seahorse_util_remove_suffix:
- * @path: Path with a suffix
- * @prompt:Overwrite prompt text
- *
- * Removes a suffix from @path. Does not check if @path actually has a suffix.
- *
- * Returns: @path without a suffix. NULL if prompt cancelled
- **/
-gchar*
-seahorse_util_remove_suffix (const gchar *path, const gchar *prompt)
-{
-    GtkWidget *dialog;
-    gchar *uri;
-    gchar *t;
-    
-    g_return_val_if_fail (path != NULL, NULL);
-    uri =  g_strndup (path, strlen (path) - 4);
-   
-    if (prompt && uri && seahorse_util_uri_exists (uri)) {
-            
-        t = g_strdup_printf (prompt, seahorse_util_uri_get_last (uri));
-        dialog = seahorse_util_chooser_save_new (t, NULL);
-        g_free (t);
-
-        seahorse_util_chooser_show_key_files (dialog);
-		gtk_file_chooser_select_uri (GTK_FILE_CHOOSER (dialog), uri);
-		
-        g_free (uri);                
-        uri = NULL;
-            
-        uri = seahorse_util_chooser_save_prompt (dialog);
-    }   
-    
-    return uri;
-}
-
 gchar**
 seahorse_util_strvec_dup (const gchar** vec)
 {
diff --git a/libseahorse/seahorse-util.h b/libseahorse/seahorse-util.h
index 6aed52a..1fe1724 100644
--- a/libseahorse/seahorse-util.h
+++ b/libseahorse/seahorse-util.h
@@ -117,13 +117,6 @@ gchar*      seahorse_util_chooser_save_prompt           (GtkWidget *dialog);
 gboolean	seahorse_util_check_suffix		(const gchar		*path,
                                              SeahorseSuffix     suffix);
 
-gchar*		seahorse_util_add_suffix		(const gchar        *path,
-                                             SeahorseSuffix     suffix,
-                                             const gchar        *prompt);
-
-gchar*      seahorse_util_remove_suffix     (const gchar        *path,
-                                             const gchar        *prompt);
-
 gchar**     seahorse_util_strvec_dup        (const gchar        **vec);
 
 guint       seahorse_util_strvec_length       (const gchar      **vec);
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 03051b7..2476ae2 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -10,16 +10,10 @@ else
 GEDIT_DIR = 
 endif
 
-if WITH_NAUTILUS_EXT
-NAUTILUS_EXT_DIR = nautilus-ext
-else
-NAUTILUS_EXT_DIR = 
-endif
-
 if WITH_APPLET
 APPLET_DIR = applet
 else
 APPLET_DIR =
 endif
 
-SUBDIRS = nautilus $(APPLET_DIR) $(EPIPHANY_DIR) $(GEDIT_DIR) $(NAUTILUS_EXT_DIR)
+SUBDIRS = nautilus $(APPLET_DIR) $(EPIPHANY_DIR) $(GEDIT_DIR)
diff --git a/plugins/nautilus/Makefile.am b/plugins/nautilus/Makefile.am
index 5175e4e..7f97dc2 100644
--- a/plugins/nautilus/Makefile.am
+++ b/plugins/nautilus/Makefile.am
@@ -7,66 +7,23 @@ INCLUDES = -I$(top_builddir) \
 	$(SEAHORSE_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATA_DIR=\""$(datadir)"\" \
-	-DSEAHORSE_UIDIR=\""$(uidir)"\" \
-	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
+	-DSEAHORSE_UIDIR=\""$(uidir)"\"
 
-bin_PROGRAMS = seahorse-preferences seahorse-tool
+bin_PROGRAMS = seahorse-preferences
 
 seahorse_preferences_SOURCES = seahorse-pgp-preferences.c 
 
 seahorse_preferences_LDADD = \
-    $(top_builddir)/libseahorse/libseahorse.a \
-    $(SEAHORSE_LIBS)
-    
-seahorse_tool_SOURCES = \
-    seahorse-tool.c \
-    seahorse-tool.h \
-    seahorse-tool-files.c \
-    seahorse-tool-progress.c
-
-seahorse_tool_LDADD = \
-    $(top_builddir)/libseahorse/libseahorse.a \
-    $(SEAHORSE_LIBS) $(LIBCRYPTUI_LIBS)
-
-# The new mime system
-mimedir = $(datadir)/mime/packages
-mime_DATA = seahorse.xml
-
-if UPDATE_MIME_DATABASE
-install-data-local:
-	mkdir -p $(mimedir)
-	update-mime-database $(datadir)/mime/
-
-uninstall-local:
-	update-mime-database $(datadir)/mime/
-else
-install-data-local:
-
-uninstall-local:
-endif
+	$(top_builddir)/libseahorse/libseahorse.a \
+	$(SEAHORSE_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = seahorse-pgp-preferences.desktop.in \
-	seahorse-pgp-encrypted.desktop.in \
-	seahorse-pgp-signature.desktop.in \
-	seahorse-pgp-keys.desktop.in 
+desktop_in_files = seahorse-pgp-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-man_MANS = seahorse-tool.1
-
 EXTRA_DIST = \
-    $(man_MANS) \
-    $(mime_DATA) \
-    $(mimeinfo_DATA) \
-    $(desktop_in_files) \
-    seahorse-pgp-encrypted.desktop.in.in \
-    seahorse-pgp-keys.desktop.in.in \
-    seahorse-pgp-signature.desktop.in.in 
+	$(desktop_in_files)
 
 CLEANFILES = *.bak \
-	$(desktop_DATA) \
-	seahorse-pgp-encrypted.desktop.in \
-	seahorse-pgp-keys.desktop.in \
-	seahorse-pgp-signature.desktop.in
-
+	$(desktop_DATA)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]