camel-imap4 r4 - trunk/imap4

[fejj svn gnome org]

Author: fejj
Date: Sun May 11 16:35:22 2008
New Revision: 4
URL: http://svn.gnome.org/viewvc/camel-imap4?rev=4&view=rev

Log:
2008-05-11  Jeffrey Stedfast  <fejj novell com>

	* camel-imap4-store.c: Define some symbols that might not exist in
	the version of camel we are linking against.



Modified:
   trunk/imap4/ChangeLog
   trunk/imap4/camel-imap4-store-summary.c
   trunk/imap4/camel-imap4-store.c

Modified: trunk/imap4/camel-imap4-store-summary.c
==============================================================================
--- trunk/imap4/camel-imap4-store-summary.c	(original)
+++ trunk/imap4/camel-imap4-store-summary.c	Sun May 11 16:35:22 2008
@@ -38,6 +38,10 @@
 #include "camel-imap4-store-summary.h"
 #include "camel-imap4-utils.h"
 
+#ifndef HAVE_CAMEL_FOLDER_INFO_NEW
+#define camel_folder_info_new() g_slice_new (CamelFolderInfo)
+#endif
+
 #define CAMEL_IMAP4_STORE_SUMMARY_VERSION_0 (0)
 #define CAMEL_IMAP4_STORE_SUMMARY_VERSION (0)
 

Modified: trunk/imap4/camel-imap4-store.c
==============================================================================
--- trunk/imap4/camel-imap4-store.c	(original)
+++ trunk/imap4/camel-imap4-store.c	Sun May 11 16:35:22 2008
@@ -50,6 +50,25 @@
 #include "camel-imap4-summary.h"
 #include "camel-imap4-utils.h"
 
+#ifndef HAVE_CAMEL_FOLDER_INFO_NEW
+#define camel_folder_info_new() g_slice_new (CamelFolderInfo)
+
+static void
+imap4_folder_info_free (CamelFolderInfo *fi)
+{
+	if (fi) {
+		imap4_folder_info_free (fi->next);
+		imap4_folder_info_free (fi->child);
+		g_free (fi->name);
+		g_free (fi->full_name);
+		g_free (fi->uri);
+		g_slice_free (CamelFolderInfo, fi);
+	}
+}
+
+#define camel_folder_info_free(fi) imap4_folder_info_free (fi)
+#endif /* ! HAVE_CAMEL_FODLER_INFO_NEW */
+
 #define d(x) x
 
 static void camel_imap4_store_class_init (CamelIMAP4StoreClass *klass);
@@ -72,6 +91,7 @@
 static void imap4_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex);
 static void imap4_rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);
 static CamelFolderInfo *imap4_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);
+static void imap4_free_folder_info (CamelStore *store, CamelFolderInfo *fi);
 static void imap4_subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);
 static void imap4_unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);
 static gboolean imap4_folder_subscribed (CamelStore *store, const char *folder_name);
@@ -144,6 +164,7 @@
 	store_class->delete_folder = imap4_delete_folder;
 	store_class->rename_folder = imap4_rename_folder;
 	store_class->get_folder_info = imap4_get_folder_info;
+	store_class->free_folder_info = imap4_free_folder_info;
 	store_class->subscribe_folder = imap4_subscribe_folder;
 	store_class->unsubscribe_folder = imap4_unsubscribe_folder;
 	store_class->folder_subscribed = imap4_folder_subscribed;
@@ -438,6 +459,14 @@
 	return 0;
 }
 
+#ifndef HAVE_CAMEL_SESSION_BUILD_PASSWORD_PROMPT
+static char *
+camel_session_build_password_prompt (const char *proto, const char *user, const char *host)
+{
+	return g_strdup_printf (_("Please enter the %s password for %s on host %s."), proto, user, host);
+}
+#endif
+
 static int
 imap4_try_authenticate (CamelIMAP4Engine *engine, gboolean reprompt, const char *errmsg, CamelException *ex)
 {
@@ -1597,6 +1626,12 @@
 	return fi;
 }
 
+static void
+imap4_free_folder_info (CamelStore *store, CamelFolderInfo *fi)
+{
+	camel_folder_info_free (fi);
+}
+
 static gboolean
 imap4_folder_subscribed (CamelStore *store, const char *folder_name)
 {