epiphany r7990 - in trunk: . data/glade embed embed/mozilla embed/xulrunner/embed po src
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: epiphany r7990 - in trunk: . data/glade embed embed/mozilla embed/xulrunner/embed po src
- Date: Tue, 26 Feb 2008 20:13:24 +0000 (GMT)
Author: chpe
Date: Tue Feb 26 20:13:24 2008
New Revision: 7990
URL: http://svn.gnome.org/viewvc/epiphany?rev=7990&view=rev
Log:
Remove cruft
Removed:
trunk/data/glade/certs-manager.glade
trunk/embed/ephy-certificate-manager.c
trunk/embed/ephy-certificate-manager.h
trunk/embed/ephy-x509-cert.c
trunk/embed/ephy-x509-cert.h
trunk/embed/mozilla/mozilla-x509-cert.cpp
trunk/embed/mozilla/mozilla-x509-cert.h
trunk/embed/xulrunner/embed/mozilla-x509-cert.cpp
trunk/embed/xulrunner/embed/mozilla-x509-cert.h
trunk/src/ephy-cert-manager-dialog.c
trunk/src/ephy-cert-manager-dialog.h
Modified:
trunk/configure.ac
trunk/data/glade/Makefile.am
trunk/embed/Makefile.am
trunk/embed/mozilla/Makefile.am
trunk/embed/mozilla/mozilla-embed-single.cpp
trunk/embed/xulrunner/embed/Makefile.am
trunk/po/POTFILES.skip
trunk/src/Makefile.am
trunk/src/ephy-window.c
trunk/src/window-commands.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Feb 26 20:13:24 2008
@@ -583,26 +583,6 @@
AM_CONDITIONAL([ENABLE_ZEROCONF],[test "$enable_zeroconf" = "yes"])
-# Certificates manager
-
-if test "$enable_psm" = "yes"; then
-
-AC_MSG_CHECKING([whether to build the certificates manager])
-AC_ARG_ENABLE([certificate-manager],
- AS_HELP_STRING([--enable-certificate-manager],[Whether to enable the certificate manager (experimental; default:disabled)]),
- [],[enable_certificate_manager=no])
-AC_MSG_RESULT([$enable_certificate_manager])
-
-fi
-
-if test "$enable_certificate_manager" = "yes"; then
- AC_DEFINE([ENABLE_CERTIFICATE_MANAGER],[1],[Define to enable the certificate manager build])
-else
- enable_certificate_manager=no
-fi
-
-AM_CONDITIONAL([ENABLE_CERTIFICATE_MANAGER],[test "$enable_certificate_manager" = "yes"])
-
# NetworkManager
AC_MSG_CHECKING([whether to enable NetworkManager support])
@@ -722,6 +702,27 @@
# uninstalled share dir to search data
AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir])
+# ****************
+# Distributor name
+# ****************
+
+AC_ARG_WITH([distributor-name],
+ AS_HELP_STRING([--with-distributor-name=name],[Set the distributor name]),
+ [LSB_DISTRIBUTOR="$withval"])
+
+if test -z "$LSB_DISTRIBUTOR" = ""; then
+ AC_CHECK_PROGS([LSB_RELEASE], [lsb_release],)
+ if test -n "$LSB_RELEASE"; then
+ # Fallback on lsb_release if available
+ LSB_DISTRIBUTOR=$($LSB_RELEASE -i -s)
+ else
+ # Fallback on the product name
+ LSB_DISTRIBUTOR="Epiphany"
+ fi
+fi
+
+AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name])
+
# *****************
# API Documentation
# *****************
@@ -774,57 +775,6 @@
[],
[EPIPHANY_API_VERSION=$EPIPHANY_API_VERSION])
-# new gecko embedding
-
-PKG_CHECK_MODULES([GTK],[gtk+-2.0 >= $GTK_REQUIRED])
-PKG_CHECK_MODULES([GTKPRINT],[gtk+-unix-print-2.0 >= $GTK_REQUIRED])
-PKG_CHECK_MODULES([GCONF],[gconf-2.0])
-PKG_CHECK_MODULES([GLADE],[libglade-2.0 >= $LIBGLADE_REQUIRED])
-PKG_CHECK_MODULES([GNOME],[libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED])
-
-# Distributor name
-
-AC_ARG_WITH(distributor-name,
-[ --with-distributor-name=name Distributor name.],LSB_DISTRIBUTOR="$withval",)
-
-if test "x$LSB_DISTRIBUTOR" = "x"; then
- AC_CHECK_PROGS([LSB_RELEASE], [lsb_release],)
- if test -n "$LSB_RELEASE"; then
- # Fallback on lsb_release if available
- LSB_DISTRIBUTOR=$($LSB_RELEASE -i -s)
- else
- # Fallback on the product name
- LSB_DISTRIBUTOR="Epiphany"
- fi
-fi
-
-AC_DEFINE_UNQUOTED(LSB_DISTRIBUTOR, "$LSB_DISTRIBUTOR", [Distributor name.])
-
-# compat cruft
-GGE_VERSION=0
-AC_SUBST([GGE_VERSION])
-
-GGE_API_VERSION=0
-AC_SUBST([GGE_API_VERSION])
-
-AC_CONFIG_FILES([
-embed/xulrunner/Makefile
-embed/xulrunner/bindings/Makefile
-embed/xulrunner/bindings/python/Makefile
-embed/xulrunner/components/Makefile
-embed/xulrunner/data/Makefile
-embed/xulrunner/embed/Makefile
-embed/xulrunner/src/Makefile
-embed/xulrunner/tests/Makefile
-embed/xulrunner/utils/Makefile
-xulapp/Makefile
-xulapp/application.ini
-])
-
-AC_CONFIG_FILES([
-embed/xulrunner/data/gnome-gecko-embed-${GGE_API_VERSION}.pc:embed/xulrunner/data/gnome-gecko-embed.pc.in
-],[],[GGE_API_VERSION=$GGE_API_VERSION])
-
AC_OUTPUT
# *************************************
@@ -850,6 +800,5 @@
if test "$with_engine" = "mozilla"; then
echo " Gecko backend : $gecko_cv_gecko version $gecko_cv_gecko_version
PSM support : $enable_psm
- Certificate manager : $enable_certificate_manager (experimental)
"
fi
Modified: trunk/data/glade/Makefile.am
==============================================================================
--- trunk/data/glade/Makefile.am (original)
+++ trunk/data/glade/Makefile.am Tue Feb 26 20:13:24 2008
@@ -6,9 +6,4 @@
prefs-dialog.glade \
print.glade
-if ENABLE_CERTIFICATE_MANAGER
-glade_DATA += \
- certs-manager.glade
-endif
-
-EXTRA_DIST = $(glade_DATA) certs-manager.glade
+EXTRA_DIST = $(glade_DATA)
Modified: trunk/embed/Makefile.am
==============================================================================
--- trunk/embed/Makefile.am (original)
+++ trunk/embed/Makefile.am Tue Feb 26 20:13:24 2008
@@ -69,16 +69,6 @@
$(INST_H_FILES) \
$(NOINST_H_FILES)
-if ENABLE_CERTIFICATE_MANAGER
-INST_H_FILES += \
- ephy-certificate-manager.h \
- ephy-x509-cert.h
-
-libephyembed_la_SOURCES += \
- ephy-certificate-manager.c \
- ephy-x509-cert.c
-endif
-
nodist_libephyembed_la_SOURCES = \
$(BUILT_SOURCES)
Modified: trunk/embed/mozilla/Makefile.am
==============================================================================
--- trunk/embed/mozilla/Makefile.am (original)
+++ trunk/embed/mozilla/Makefile.am Tue Feb 26 20:13:24 2008
@@ -91,12 +91,6 @@
GtkNSSSecurityWarningDialogs.h
endif
-if ENABLE_CERTIFICATE_MANAGER
-libephymozillaembed_la_SOURCES += \
- mozilla-x509-cert.cpp \
- mozilla-x509-cert.h
-endif
-
if ENABLE_SPELLCHECKER
libephymozillaembed_la_SOURCES += \
GeckoSpellCheckEngine.cpp \
Modified: trunk/embed/mozilla/mozilla-embed-single.cpp
==============================================================================
--- trunk/embed/mozilla/mozilla-embed-single.cpp (original)
+++ trunk/embed/mozilla/mozilla-embed-single.cpp Tue Feb 26 20:13:24 2008
@@ -54,11 +54,6 @@
#include <nsMemory.h>
#include <nsServiceManagerUtils.h>
-#ifdef HAVE_MOZILLA_PSM
-#include <nsIX509Cert.h>
-#include <nsIX509CertDB.h>
-#endif
-
#ifdef ALLOW_PRIVATE_API
#include <nsICacheService.h>
#include <nsIFontEnumerator.h>
@@ -74,7 +69,6 @@
#include "ephy-file-helpers.h"
#include "eel-gconf-extensions.h"
-#include "ephy-certificate-manager.h"
#include "ephy-cookie-manager.h"
#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
@@ -85,7 +79,6 @@
#include "ephy-string.h"
#include "mozilla-embed.h"
#include "mozilla-notifiers.h"
-#include "mozilla-x509-cert.h"
#include "EphyBrowser.h"
#include "EphyDirectoryProvider.h"
@@ -131,26 +124,6 @@
static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface);
static void mozilla_embed_single_init (MozillaEmbedSingle *ges);
-#ifdef ENABLE_CERTIFICATE_MANAGER
-static void ephy_certificate_manager_iface_init (EphyCertificateManagerIface *iface);
-#endif
-
-/* Some compilers (like gcc 2.95) don't support preprocessor directives inside macros,
- so we have to duplicate the whole thing */
-
-#ifdef ENABLE_CERTIFICATE_MANAGER
-G_DEFINE_TYPE_WITH_CODE (MozillaEmbedSingle, mozilla_embed_single, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE,
- ephy_embed_single_iface_init)
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_COOKIE_MANAGER,
- ephy_cookie_manager_iface_init)
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER,
- ephy_password_manager_iface_init)
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_CERTIFICATE_MANAGER,
- ephy_certificate_manager_iface_init)
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER,
- ephy_permission_manager_iface_init))
-#else
G_DEFINE_TYPE_WITH_CODE (MozillaEmbedSingle, mozilla_embed_single, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE,
ephy_embed_single_iface_init)
@@ -160,7 +133,6 @@
ephy_password_manager_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER,
ephy_permission_manager_iface_init))
-#endif
static gboolean
mozilla_set_default_prefs (MozillaEmbedSingle *mes)
@@ -1188,124 +1160,6 @@
return EphyUtils::FindEmbed (newWindow);
}
-#ifdef ENABLE_CERTIFICATE_MANAGER
-
-static gboolean
-impl_remove_certificate (EphyCertificateManager *manager,
- EphyX509Cert *cert)
-{
- nsresult rv;
-
- nsCOMPtr<nsIX509CertDB> certDB;
- certDB = do_GetService (NS_X509CERTDB_CONTRACTID);
- if (!certDB) return FALSE;
-
- nsCOMPtr<nsIX509Cert> mozCert;
- rv = mozilla_x509_cert_get_mozilla_cert (MOZILLA_X509_CERT (cert),
- getter_AddRefs (mozCert));
- if (NS_FAILED (rv)) return FALSE;
-
- rv = certDB->DeleteCertificate (mozCert);
- if (NS_FAILED (rv)) return FALSE;
-
- return TRUE;
-}
-
-#define NICK_DELIMITER PRUnichar('\001')
-
-static GList *
-retrieveCerts (PRUint32 type)
-{
- nsresult rv;
-
- nsCOMPtr<nsIX509CertDB> certDB;
- certDB = do_GetService (NS_X509CERTDB_CONTRACTID);
- if (!certDB) return NULL;
-
- PRUint32 count;
- PRUnichar **certNameList = NULL;
-
- rv = certDB->FindCertNicknames (NULL, type, &count, &certNameList);
- if (NS_FAILED (rv)) return NULL;
-
- LOG("Certificates found: %i", count);
-
- GList *list = NULL;
- for (PRUint32 i = 0; i < count; i++)
- {
- /* HACK HACK, this is EVIL, the string for each cert is:
- <DELIMITER>nicknameOrEmailAddress<DELIMITER>dbKey
- So we need to chop off the dbKey to look it up in the database.
-
- https://bugzilla.mozilla.org/show_bug.cgi?id=214742
- */
- nsCString full_string;
- NS_UTF16ToCString (nsString(certNameList[i]),
- NS_CSTRING_ENCODING_UTF8, full_string);
-
- const char *key = full_string.get();
- char *pos = strrchr (key, NICK_DELIMITER);
- if (!pos) continue;
-
- nsCOMPtr<nsIX509Cert> mozilla_cert;
- rv = certDB->FindCertByDBKey (pos, NULL, getter_AddRefs (mozilla_cert));
- if (NS_FAILED (rv)) continue;
-
- MozillaX509Cert *cert = mozilla_x509_cert_new (mozilla_cert);
- list = g_list_prepend (list, cert);
- }
-
- NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY (count, certNameList);
- return list;
-}
-
-static GList *
-impl_get_certificates (EphyCertificateManager *manager,
- EphyX509CertType type)
-{
- int moz_type = nsIX509Cert::USER_CERT;
- switch (type)
- {
- case PERSONAL_CERTIFICATE:
- moz_type = nsIX509Cert::USER_CERT;
- break;
- case SERVER_CERTIFICATE:
- moz_type = nsIX509Cert::SERVER_CERT;
- break;
- case CA_CERTIFICATE:
- moz_type = nsIX509Cert::CA_CERT;
- break;
- }
- return retrieveCerts (moz_type);
-}
-
-static gboolean
-impl_import (EphyCertificateManager *manager,
- const gchar *file)
-{
- nsresult rv;
- nsCOMPtr<nsIX509CertDB> certDB;
- certDB = do_GetService (NS_X509CERTDB_CONTRACTID);
- if (!certDB) return FALSE;
-
- nsCOMPtr<nsILocalFile> localFile;
- localFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
-
- // TODO Is this correct ?
- nsString path;
- NS_CStringToUTF16 (nsCString(file),
- NS_CSTRING_ENCODING_UTF8, path);
-
-
- localFile->InitWithPath (path);
- rv = certDB->ImportPKCS12File(NULL, localFile);
- if (NS_FAILED (rv)) return FALSE;
-
- return TRUE;
-}
-
-#endif /* ENABLE_CERTIFICATE_MANAGER */
-
static void
mozilla_embed_single_get_property (GObject *object,
guint prop_id,
@@ -1391,15 +1245,3 @@
iface->test = impl_permission_manager_test;
iface->list = impl_permission_manager_list;
}
-
-#ifdef ENABLE_CERTIFICATE_MANAGER
-
-static void
-ephy_certificate_manager_iface_init (EphyCertificateManagerIface *iface)
-{
- iface->get_certificates = impl_get_certificates;
- iface->remove_certificate = impl_remove_certificate;
- iface->import = impl_import;
-}
-
-#endif /* ENABLE_CERTIFICATE_MANAGER */
Modified: trunk/embed/xulrunner/embed/Makefile.am
==============================================================================
--- trunk/embed/xulrunner/embed/Makefile.am (original)
+++ trunk/embed/xulrunner/embed/Makefile.am Tue Feb 26 20:13:24 2008
@@ -28,12 +28,6 @@
mozilla-notifiers.cpp \
mozilla-notifiers.h
-# if ENABLE_CERTIFICATE_MANAGER
-# libephyxulrunnerembed_la_SOURCES += \
-# mozilla-x509-cert.cpp \
-# mozilla-x509-cert.h
-# endif
-
libephyxulrunnerembed_la_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/embed \
Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip (original)
+++ trunk/po/POTFILES.skip Tue Feb 26 20:13:24 2008
@@ -1,5 +1,3 @@
-data/glade/certs-manager.glade
-src/ephy-cert-manager-dialog.c
data/bme.desktop.in
data/epiphany.desktop.in
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Feb 26 20:13:24 2008
@@ -97,14 +97,6 @@
nodist_libephymain_la_SOURCES = \
$(TYPES_SOURCE)
-if ENABLE_CERTIFICATE_MANAGER
-NOINST_H_FILES += \
- ephy-cert-manager-dialog.h
-
-libephymain_la_SOURCES += \
- ephy-cert-manager-dialog.c
-endif
-
libephymain_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_builddir)/lib/egg \
Modified: trunk/src/ephy-window.c
==============================================================================
--- trunk/src/ephy-window.c (original)
+++ trunk/src/ephy-window.c Tue Feb 26 20:13:24 2008
@@ -187,7 +187,7 @@
{ "EditPersonalData", NULL, N_("P_ersonal Data"), NULL,
N_("View and remove cookies and passwords"),
G_CALLBACK (window_cmd_edit_personal_data) },
-#ifdef ENABLE_CERTIFICATE_MANAGER
+#if 0
{ "EditCertificates", NULL, N_("Certificate_s"), NULL,
N_("Manage Certificates"),
G_CALLBACK (window_cmd_edit_certificates) },
Modified: trunk/src/window-commands.c
==============================================================================
--- trunk/src/window-commands.c (original)
+++ trunk/src/window-commands.c Tue Feb 26 20:13:24 2008
@@ -726,22 +726,13 @@
g_free (host);
}
-#ifdef ENABLE_CERTIFICATE_MANAGER
-
-#include "ephy-cert-manager-dialog.h"
-
+#if 0
void
window_cmd_edit_certificates (GtkAction *action,
EphyWindow *window)
{
- EphyDialog *dialog;
-
- dialog = certs_manager_dialog_new ();
-
- ephy_dialog_show (dialog);
}
-
-#endif /* ENABLE_CERTIFICATE_MANAGER */
+#endif
void
window_cmd_edit_prefs (GtkAction *action,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]