[evolution-kolab/ek-wip-porting] KolabSettingsHandler: build fixes



commit 0d93a7ce7b533078dc2db39480d7977c04cb9d00
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Dec 8 14:40:55 2011 +0100

    KolabSettingsHandler: build fixes
    
    * removed inclusion of e-util.h, which no longer exists
    * commented out use of e_get_user_data_dir() to get
      the user data dir (use of new Camel API pending)
    * removed set-but-not-used variables

 src/libekolab/kolab-settings-handler.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index 95a3aba..1729cff 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -27,8 +27,6 @@
 
 #include <errno.h>
 
-#include <e-util/e-util.h>
-
 #include <libekolabutil/kolab-util-glib.h>
 
 #include "kolab-util-backend.h"
@@ -137,9 +135,15 @@ kolab_settings_handler_char_get_func_camel_data_dir (KolabSettingsHandler *self,
 	default:
 		g_assert_not_reached ();
 	}
+
+	/* FIXME implement getting of the user data dir */
+	g_error ("%s:  FIXME implement getting of the user data dir", __func__);
+#if 0
 	data_dir = g_build_filename (e_get_user_data_dir (),
 	                             backend_dir,
 	                             NULL);
+#endif
+
 	g_free (backend_dir);
 
 	if (g_mkdir_with_parents (data_dir, 0700) != 0) {
@@ -274,11 +278,11 @@ kolab_settings_handler_init (KolabSettingsHandler *object)
 static void
 kolab_settings_handler_dispose (GObject *object)
 {
-	KolabSettingsHandler *self = NULL;
-	KolabSettingsHandlerPrivate *priv = NULL;
+	/* KolabSettingsHandler *self = NULL; */
+	/* KolabSettingsHandlerPrivate *priv = NULL; */
 
-	self = KOLAB_SETTINGS_HANDLER (object);
-	priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self);
+	/* self = KOLAB_SETTINGS_HANDLER (object); */
+	/* priv = KOLAB_SETTINGS_HANDLER_PRIVATE (self); */
 
 	/* TODO: Add dispose code here */
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]