* shutdown libcitadel and xdgmime properly

diff --git a/libcitadel/debian/libcitadel1.substvars b/libcitadel/debian/libcitadel1.substvars
index d8fed07b50f367a47699bc7c3eba237b765767bc..5ba89964b12f281dc69488b594b4366d99a0def3 100644 (file)
--- a/libcitadel/debian/libcitadel1.substvars
+++ b/libcitadel/debian/libcitadel1.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.7-1), zlib1g (>= 1:1.1.4)
+shlibs:Depends=libc6 (>= 2.3), zlib1g (>= 1:1.1.4)

diff --git a/libcitadel/lib/libcitadel.c b/libcitadel/lib/libcitadel.c
index 0a6c9f179fbb09d15e8daa186caacef6bbcdd5d6..38d811d2d59d44eb14b2393a44150804beeecbd8 100644 (file)
--- a/libcitadel/lib/libcitadel.c
+++ b/libcitadel/lib/libcitadel.c
@@ -13,6 +13,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include "libcitadel.h"
+#include "xdgmime/xdgmime.h"
+#include "libcitadellocal.h"
 
 char *libcitadel_version_string(void) {
        return "$Id$";
@@ -21,3 +23,10 @@ char *libcitadel_version_string(void) {
 int libcitadel_version_number(void) {
        return LIBCITADEL_VERSION_NUMBER;
 }
+
+void ShutDownLibCitadel(void)
+{
+       ShutDownLibCitadelMime();
+
+       xdg_mime_shutdown();
+}

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 21be740e6e00e53d4b583b81a26ff52b5e08dacb..a633d0fb134387588b96629e403e00a2464c336a 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -71,7 +71,7 @@ enum LogLevel {
 
 char *libcitadel_version_string(void);
 int libcitadel_version_number(void);
-
+void ShutDownLibCitadel(void);
 
 /*
  * MIME parser declarations
@@ -308,8 +308,6 @@ int LoadIconDir(const char *DirName);
 /* Select the icon for a given MIME type */
 const char *GetIconFilename(char *MimeType, size_t len);
 
-void ShutDownLibCitadel(void);
-
 
 /* tools */
 

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 1505a492ac1a8000d24df8980d67c206b33d8213..026d0555009cd76d66865dd327b484274091f6c5 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -22,6 +22,7 @@
 
 #include "xdgmime/xdgmime.h"
 #include "libcitadel.h"
+#include "libcitadellocal.h"
 
 void extract_key(char *target, char *source, char *key)
 {
@@ -891,7 +892,7 @@ const char *GetIconFilename(char *MimeType, size_t len)
        return Icon->FileName;
 }
 
-void ShutDownLibCitadel(void)
+void ShutDownLibCitadelMime(void)
 {
        DeleteHash(&IconHash);
 }

diff --git a/libcitadel/lib/wildfire.c b/libcitadel/lib/wildfire.c
index 744634a8b50a62f1f407f5da161788c9fbadc633..babdd86f3d69a4f106afe88c670af78de2f80238 100644 (file)
--- a/libcitadel/lib/wildfire.c
+++ b/libcitadel/lib/wildfire.c
@@ -19,7 +19,7 @@
 #endif
 
 #include "libcitadel.h"
-
+#include "libcitadellocal.h"
 
 
 ConstStr WF_MsgStrs[] = {
@@ -194,6 +194,14 @@ static int ParseBacktrace(char *Line,
 long BaseFrames = 0;
 StrBuf *FullBinaryName = NULL;
 
+void WildFireShutdown(void)
+{
+       close(addr2line_write_pipe[0]);
+       close(addr2line_read_pipe[0]);
+
+       FreeStrBuf(&FullBinaryName);
+}
+
 void WildFireInitBacktrace(const char *argvNull, int AddBaseFrameSkip)
 {