From a6afcdb6850629dacbe22cf80649acfe142c0ab6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Wed, 4 Mar 2009 18:54:51 +0000
Subject: [PATCH] * shutdown libcitadel and xdgmime properly

---
 libcitadel/debian/libcitadel1.substvars |  2 +-
 libcitadel/lib/libcitadel.c             |  9 +++++++++
 libcitadel/lib/libcitadel.h             |  4 +---
 libcitadel/lib/mime_parser.c            |  3 ++-
 libcitadel/lib/wildfire.c               | 10 +++++++++-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/libcitadel/debian/libcitadel1.substvars b/libcitadel/debian/libcitadel1.substvars
index d8fed07b5..5ba89964b 100644
--- 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 0a6c9f179..38d811d2d 100644
--- 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 21be740e6..a633d0fb1 100644
--- 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 1505a492a..026d05550 100644
--- 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 744634a8b..babdd86f3 100644
--- 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)
 {
 
-- 
2.30.2