Don't export duplicate secmem symbols

 * Have the gcr library just use the symbol from gck

https://bugzilla.gnome.org/show_bug.cgi?id=687980

diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index e6b3a63..d7ae74b 100644 (file)
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -110,7 +110,6 @@ PRIVATE_FILES = \
        gcr-gnupg-util.c gcr-gnupg-util.h \
        gcr-internal.h \
        gcr-key-mechanisms.h gcr-key-mechanisms.c \
-       gcr-memory.c \
        gcr-memory-icon.c gcr-memory-icon.h \
        gcr-openpgp.c gcr-openpgp.h \
        gcr-openssh.c gcr-openssh.h \

diff --git a/gcr/gcr-base.symbols b/gcr/gcr-base.symbols
index 2520a42..ec27371 100644 (file)
--- a/gcr/gcr-base.symbols
+++ b/gcr/gcr-base.symbols
@@ -251,4 +251,3 @@ gcr_union_collection_new
 gcr_union_collection_remove
 gcr_union_collection_size
 gcr_union_collection_take
-SECMEM_pool_data_v1_0

diff --git a/gcr/gcr-memory.c b/gcr/gcr-memory.c
deleted file mode 100644 (file)
index 0e378a4..0000000
--- a/gcr/gcr-memory.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * gnome-keyring
- *
- * 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 "config.h"
-
-#include "egg/egg-secure-memory.h"
-
-#include <glib.h>
-
-EGG_SECURE_DEFINE_GLIB_GLOBALS ();