camel-imap4 r14 - trunk/imap4



Author: fejj
Date: Sun Jul 20 00:41:50 2008
New Revision: 14
URL: http://svn.gnome.org/viewvc/camel-imap4?rev=14&view=rev

Log:
2008-07-19  Jeffrey Stedfast  <fejj novell com>

	* camel-imap4-store-summary.c: Removed macro for
	camel_folder_info_new().

	* camel-imap4-store.c Removed camel_folder_info_new() and
	camel_folder_info_free() macros.
	(camel_session_build_password_prompt): Removed.



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 Jul 20 00:41:50 2008
@@ -38,9 +38,6 @@
 #include "camel-imap4-store-summary.h"
 #include "camel-imap4-utils.h"
 
-#ifndef HAVE_CAMEL_FOLDER_INFO_NEW
-#define camel_folder_info_new() g_slice_new0 (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 Jul 20 00:41:50 2008
@@ -50,25 +50,6 @@
 #include "camel-imap4-summary.h"
 #include "camel-imap4-utils.h"
 
-#ifndef HAVE_CAMEL_FOLDER_INFO_NEW
-#define camel_folder_info_new() g_slice_new0 (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);
@@ -460,14 +441,6 @@
 	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)
 {



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