GNOME.org
 

seahorse r2183 - in plugins/trunk: . agent libcryptui libseahorse plugins/applet plugins/epiphany plugins/gedit plugins/nautilus

Author: nnielsen
Date: Thu Apr 17 23:09:17 2008
New Revision: 2183
URL: http://svn.gnome.org/viewvc/seahorse?rev=2183&view=rev

Log:
    * Remove libcryptui from seahorse-plugins (it lives in seahorse)



Removed:
   plugins/trunk/COPYING-LIBCRYPTUI
   plugins/trunk/libcryptui/
   plugins/trunk/libseahorse/seahorse-validity.c
   plugins/trunk/libseahorse/seahorse-validity.h
Modified:
   plugins/trunk/ChangeLog
   plugins/trunk/Makefile.am
   plugins/trunk/agent/Makefile.am
   plugins/trunk/agent/seahorse-agent-cache.c
   plugins/trunk/agent/seahorse-agent-main.c
   plugins/trunk/configure.in
   plugins/trunk/libseahorse/Makefile.am
   plugins/trunk/libseahorse/seahorse-gconf.h
   plugins/trunk/plugins/applet/Makefile.am
   plugins/trunk/plugins/epiphany/Makefile.am
   plugins/trunk/plugins/gedit/Makefile.am
   plugins/trunk/plugins/nautilus/Makefile.am

Modified: plugins/trunk/Makefile.am
==============================================================================
--- plugins/trunk/Makefile.am	(original)
+++ plugins/trunk/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -8,8 +8,7 @@
 AGENT_DIR = 
 endif
 
-SUBDIRS = libcryptui \
-          libseahorse \
+SUBDIRS = libseahorse \
           po \
           data \
           help \
@@ -21,7 +20,6 @@
     AUTHORS \
     COPYING \
     COPYING-DOCS \
-    COPYING-LIBCRYPTUI \
     ChangeLog \
     HACKING \
     INSTALL \

Modified: plugins/trunk/agent/Makefile.am
==============================================================================
--- plugins/trunk/agent/Makefile.am	(original)
+++ plugins/trunk/agent/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -4,7 +4,6 @@
 
 INCLUDES = -I$(top_builddir) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libcryptui \
 	-I$(top_srcdir)/libseahorse \
 	$(SEAHORSE_CFLAGS) \
 	$(AGENT_CFLAGS) \
@@ -22,7 +21,6 @@
 
 seahorse_agent_LDADD = \
     $(top_builddir)/libseahorse/libseahorse.a \
-    $(top_builddir)/libcryptui/libcryptui.la \
     $(SEAHORSE_LIBS)
 
 glade_DATA = \

Modified: plugins/trunk/agent/seahorse-agent-cache.c
==============================================================================
--- plugins/trunk/agent/seahorse-agent-cache.c	(original)
+++ plugins/trunk/agent/seahorse-agent-cache.c	Thu Apr 17 23:09:17 2008
@@ -443,8 +443,6 @@
 static gchar*
 extract_key_name (gpgme_key_t key)
 {
-    gchar *ret;
-    
     g_return_val_if_fail (key && key->uids && key->uids->uid, g_strdup (""));
     
     /* If not utf8 valid, assume latin 1 */
@@ -461,7 +459,7 @@
     gpgme_key_t key;
     gchar *ret;
     
-    g_return_if_fail (g_gpgme_ctx);
+    g_return_val_if_fail (g_gpgme_ctx, g_strdup (""));
 	    
     gerr = gpgme_get_key (g_gpgme_ctx, id, &key, 1);
     if (!GPG_IS_OK (gerr)) {
@@ -538,7 +536,6 @@
         GnomeKeyringAttributeList *attributes = NULL;
         guint item_id;
         gchar *desc = NULL, *name;
-        GQuark keyid;
 
         name = build_key_name (id);
         desc = g_strdup_printf (_("PGP Key: %s"), name);

Modified: plugins/trunk/agent/seahorse-agent-main.c
==============================================================================
--- plugins/trunk/agent/seahorse-agent-main.c	(original)
+++ plugins/trunk/agent/seahorse-agent-main.c	Thu Apr 17 23:09:17 2008
@@ -33,7 +33,6 @@
 #include <gnome.h>
 
 #include "config.h"
-#include "seahorse-operation.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-gconf.h"
 #include "seahorse-agent.h"
@@ -207,7 +206,6 @@
 
 int main(int argc, char* argv[])
 {
-    SeahorseOperation *op;
     GnomeClient *client = NULL;
     GOptionContext *octx = NULL;
 

Modified: plugins/trunk/configure.in
==============================================================================
--- plugins/trunk/configure.in	(original)
+++ plugins/trunk/configure.in	Thu Apr 17 23:09:17 2008
@@ -8,17 +8,6 @@
 AC_INIT(seahorse-plugins, 2.23.0)
 
 dnl ****************************************************************************
-dnl LIBCRYPTUI libtool versioning
-dnl CURRENT : REVISION : AGE
-dnl   +1    :     0    : +1   == new interface that does not break old one.
-dnl   +1    :     0    :  0   == removed an interface. Breaks old apps.
-dnl    ?    :    +1    :  ?   == internal changes that doesn't break anything.
-
-LIBCRYPTUI_CURRENT=0
-LIBCRYPTUI_REVISION=0
-LIBCRYPTUI_AGE=0
-
-dnl ****************************************************************************
 
 AC_CONFIG_SRCDIR(libseahorse/seahorse-util.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -277,26 +266,18 @@
 dnl ****************************************************************************
 dnl LIBCRYPTUI
 dnl ****************************************************************************
-   
-if test "$enable_dbus" != "yes"; then
-    echo "disabling libcryptui: no dbus support"
-else
-    
-    LIBCRYPTUI_LT_RELEASE=$LIBCRYPTUI_CURRENT:$LIBCRYPTUI_REVISION:$LIBCRYPTUI_AGE
-    AC_SUBST(LIBCRYPTUI_LT_RELEASE)
 
-    LIBCRYPTUI_MAJOR=$LIBCRYPTUI_CURRENT.$LIBCRYPTUI_REVISION
-    AC_SUBST(LIBCRYPTUI_MAJOR)
-    
-    PKG_CHECK_MODULES(LIBCRYPTUI, gtk+-2.0 >= 2.10.0 gconf-2.0)
-
-    LIBCRYPTUI_CFLAGS="$LIBCRYPTUI_CFLAGS $DBUS_CFLAGS"
-    LIBCRYPTUI_LIBS="$LIBCRYPTUI_LIBS $DBUS_LIBS" 
-        
-    AC_SUBST(LIBCRYPTUI_CFLAGS)
-    AC_SUBST(LIBCRYPTUI_LIBS)
+PKG_CHECK_MODULES([LIBCRYPTUI], cryptui-0.0, [enable_cryptui=yes],[enable_cryptui=no])
+if test "$enable_cryptui" = "no"; then
+    AC_MSG_ERROR([libcryptui from seahorse not found.])
 fi
 
+AC_SUBST([LIBCRYPTUI_CFLAGS])
+AC_SUBST([LIBCRYPTUI_LIBS])
+
+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBCRYPTUI_CFLAGS"
+SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBCRYPTUI_LIBS"
+   
 dnl ****************************************************************************
 dnl EPIPHANY
 dnl ****************************************************************************
@@ -666,9 +647,6 @@
 
 AC_OUTPUT([
 Makefile
-libcryptui/cryptui.pc
-libcryptui/Makefile
-libcryptui/tests/Makefile
 libseahorse/Makefile
 po/Makefile.in
 help/Makefile

Modified: plugins/trunk/libseahorse/Makefile.am
==============================================================================
--- plugins/trunk/libseahorse/Makefile.am	(original)
+++ plugins/trunk/libseahorse/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -30,7 +30,6 @@
 	seahorse-pgp-operation.c seahorse-pgp-operation.h \
 	seahorse-widget.c seahorse-widget.h \
 	seahorse-util.c seahorse-util.h \
-	seahorse-validity.c seahorse-validity.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 \

Modified: plugins/trunk/libseahorse/seahorse-gconf.h
==============================================================================
--- plugins/trunk/libseahorse/seahorse-gconf.h	(original)
+++ plugins/trunk/libseahorse/seahorse-gconf.h	Thu Apr 17 23:09:17 2008
@@ -28,7 +28,12 @@
 #include <gconf/gconf-client.h>
 
 #include <gtk/gtk.h>
-#include "cryptui-defines.h"
+
+#define SEAHORSE_DESKTOP_KEYS           "/desktop/pgp"
+#define SEAHORSE_DEFAULT_KEY            SEAHORSE_DESKTOP_KEYS "/default_key"
+#define SEAHORSE_LASTSIGNER_KEY         SEAHORSE_DESKTOP_KEYS "/last_signer"
+#define SEAHORSE_ENCRYPTSELF_KEY        SEAHORSE_DESKTOP_KEYS "/encrypt_to_self"
+#define SEAHORSE_RECIPIENTS_SORT_KEY    SEAHORSE_DESKTOP_KEYS "/recipients/sort_by"
 
 #define ARMOR_KEY SEAHORSE_DESKTOP_KEYS "/ascii_armor"
 #define ENCRYPTSELF_KEY SEAHORSE_DESKTOP_KEYS "/encrypt_to_self"

Modified: plugins/trunk/plugins/applet/Makefile.am
==============================================================================
--- plugins/trunk/plugins/applet/Makefile.am	(original)
+++ plugins/trunk/plugins/applet/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -12,9 +12,7 @@
 	$(GNOME_APPLETS_CFLAGS)	\
 	-I$(includedir) \
 	-I$(top_srcdir)/libseahorse \
-	-I$(top_srcdir)/libcryptui \
 	$(SEAHORSE_CFLAGS) \
-	$(LIBCRYPTUI_CFLAGS) \
 	-DGNOMELOCALEDIR=\"$(localedir)\" \
 	-DUIDIR=\"$(uidir)\" \
 	-DDATADIR=\""$(datadir)"\" \
@@ -33,7 +31,6 @@
 seahorse_applet_LDADD = \
 	$(GNOME_APPLETS_LIBS) \
 	$(top_builddir)/libseahorse/libseahorse.a \
-	$(top_builddir)/libcryptui/libcryptui.la \
 	$(SEAHORSE_LIBS) \
 	$(LIBCRYPTUI_LIBS)
 

Modified: plugins/trunk/plugins/epiphany/Makefile.am
==============================================================================
--- plugins/trunk/plugins/epiphany/Makefile.am	(original)
+++ plugins/trunk/plugins/epiphany/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -16,7 +16,6 @@
 	-DSHARE_DIR=\"$(pkgdatadir)\"				\
     -DEPHY_EXTENSIONS_LOCALEDIR=\"$(datadir)/locale\"	\
 	$(AM_CPPFLAGS) \
-	-I$(top_srcdir)/libcryptui \
 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
 
 libseahorseextension_la_CFLAGS = \
@@ -26,7 +25,7 @@
 
 libseahorseextension_la_LIBADD =	\
 	mozilla/libsbmozilla.la	\
-	$(top_builddir)/libcryptui/libcryptui.la \
+	$(LIBCRYPTUI_LIBS) \
 	$(MOZILLA_COMPONENT_LIBS)
 
 libseahorseextension_la_LDFLAGS = \

Modified: plugins/trunk/plugins/gedit/Makefile.am
==============================================================================
--- plugins/trunk/plugins/gedit/Makefile.am	(original)
+++ plugins/trunk/plugins/gedit/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -8,10 +8,10 @@
 
 INCLUDES = \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libcryptui \
 	-DGEDIT_LOCALEDIR=\"$(localedir)\" \
 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
 	$(GEDIT_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(LIBCRYPTUI_CFLAGS)
 
 plugin_LTLIBRARIES = libseahorse-pgp.la
@@ -24,8 +24,7 @@
 
 libseahorse_pgp_la_SOURCES = seahorse-gedit.c seahorse-gedit.h $(PLUGIN_SRCS)
 libseahorse_pgp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libseahorse_pgp_la_LIBADD = $(GEDIT_LIBS) $(LIBCRYPTUI_LIBS) \
-    $(top_builddir)/libcryptui/libcryptui.la
+libseahorse_pgp_la_LIBADD = $(GEDIT_LIBS) $(DBUS_LIBS) $(LIBCRYPTUI_LIBS) 
 
 plugin_in_files = seahorse-pgp.gedit-plugin.desktop.in
 

Modified: plugins/trunk/plugins/nautilus/Makefile.am
==============================================================================
--- plugins/trunk/plugins/nautilus/Makefile.am	(original)
+++ plugins/trunk/plugins/nautilus/Makefile.am	Thu Apr 17 23:09:17 2008
@@ -3,7 +3,6 @@
 
 INCLUDES = -I$(top_builddir) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libcryptui \
 	-I$(top_srcdir)/libseahorse \
 	$(SEAHORSE_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
@@ -17,7 +16,6 @@
 
 seahorse_preferences_LDADD = \
     $(top_builddir)/libseahorse/libseahorse.a \
-    $(top_builddir)/libcryptui/libcryptui.la \
     $(SEAHORSE_LIBS)
     
 seahorse_tool_SOURCES = \
@@ -28,7 +26,6 @@
 
 seahorse_tool_LDADD = \
     $(top_builddir)/libseahorse/libseahorse.a \
-    $(top_builddir)/libcryptui/libcryptui.la \
     $(SEAHORSE_LIBS) $(LIBCRYPTUI_LIBS)
 
 # The new mime system
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]