From 38a815f43a61704b2702c1f117d7f899d8ac085d Mon Sep 17 00:00:00 2001
From: polarfox <mikko@ruohola.org>
Date: Thu, 27 Oct 2011 12:36:56 +0300
Subject: [PATCH 1/1] build fixes

---
 src/common/pwstorage/backend_kwallet.c |    4 ++--
 src/imageio/storage/email.c            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/pwstorage/backend_kwallet.c b/src/common/pwstorage/backend_kwallet.c
index 7c39d8c..9895128 100644
--- a/src/common/pwstorage/backend_kwallet.c
+++ b/src/common/pwstorage/backend_kwallet.c
@@ -203,8 +203,8 @@ const backend_kwallet_context_t* dt_pwstorage_kwallet_new()

   // Initialize threading in dbus-glib - it should be fine for
   // dbus_g_thread_init to be called multiple times.
-  if (!g_thread_supported())
-    g_thread_init(NULL);
+//  if (!g_thread_supported())
+//    g_thread_init(NULL);
   dbus_g_thread_init();

   GError* error = NULL;
diff --git a/src/imageio/storage/email.c b/src/imageio/storage/email.c
index 9bdd2eb..629e48f 100644
--- a/src/imageio/storage/email.c
+++ b/src/imageio/storage/email.c
@@ -95,7 +95,7 @@ store (dt_imageio_module_data_t *sdata, const int imgid, dt_imageio_module_forma

   char dirname[4096];
   dt_image_full_path(imgid, dirname, 1024);
-  const gchar * filename = g_basename( dirname );
+  const gchar * filename = g_path_get_basename( dirname );
   gchar * end = g_strrstr( filename,".")+1;
   g_strlcpy( end, format->extension(fdata), sizeof(dirname)-(end-dirname));

@@ -196,7 +196,7 @@ proceed: ; // Let's build up uri / command
   {
     gchar exif[256]= {0};
     _email_attachment_t *attachment=( _email_attachment_t *)d->images->data;
-    const gchar *filename = g_basename( attachment->file );
+    const gchar *filename = g_path_get_basename( attachment->file );
     const dt_image_t *img = dt_image_cache_read_get(darktable.image_cache, attachment->imgid);
     dt_image_print_exif( img, exif, 256 );
     g_snprintf(body+strlen(body),4096-strlen(body), imageBodyFormat, filename, exif );
--
1.7.5.4