Turn off warnings. (get_name): Same.

2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-service.c (camel_service_finalize): Turn off warnings.
	(get_name): Same.

	* camel-sasl.c (sasl_challenge): Turn off warnings.

	* camel-tcp-stream.c (tcp_connect): Turn off warnings.
	(tcp_getsockopt): Same.
	(tcp_setsockopt): Here too.
	(tcp_get_socket): And here.

	* camel-folder.c (folder_sync): Turn off warnings.
	(expunge): Same.
	(append_message): Here too.
	(get_message): And here.
	(search_by_expression): And again here.
	(folder_changed): Here too.

	* camel-store.c (get_folder): Set an exception and turn off
	debugging g_warnings.
	(create_folder): Same.
	(delete_folder): Here too.
	(rename_folder): And here.
	(get_trash): And here.
	(get_folder_info): Same.
	(free_folder_info): And again here.
	(camel_folder_info_build): Here too.
	(folder_subscribed): Same.
	(subscribe_folder): Here too.
	(unsubscribe_folder): And here.

svn path=/trunk/; revision=13458

6 files changed, 106 insertions, 55 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 25a6108174..ab80c0cf0c 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,35 @@
+2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* camel-service.c (camel_service_finalize): Turn off warnings.
+	(get_name): Same.
+
+	* camel-sasl.c (sasl_challenge): Turn off warnings.
+
+	* camel-tcp-stream.c (tcp_connect): Turn off warnings.
+	(tcp_getsockopt): Same.
+	(tcp_setsockopt): Here too.
+	(tcp_get_socket): And here.
+
+	* camel-folder.c (folder_sync): Turn off warnings.
+	(expunge): Same.
+	(append_message): Here too.
+	(get_message): And here.
+	(search_by_expression): And again here.
+	(folder_changed): Here too.
+
+	* camel-store.c (get_folder): Set an exception and turn off
+	debugging g_warnings.
+	(create_folder): Same.
+	(delete_folder): Here too.
+	(rename_folder): And here.
+	(get_trash): And here.
+	(get_folder_info): Same.
+	(free_folder_info): And again here.
+	(camel_folder_info_build): Here too.
+	(folder_subscribed): Same.
+	(subscribe_folder): Here too.
+	(unsubscribe_folder): And here.
+
 2001-10-05    <NotZed@Ximian.com>
 
 	* camel-mime-utils.c (header_decode_mailbox): Try harder to get
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 8057f545e3..60b7c9dcb1 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -41,6 +41,7 @@
 #include "camel-private.h"
 
 #define d(x) 
+#define w(x)
 
 static CamelObjectClass *parent_class = NULL;
 
@@ -256,8 +257,8 @@ camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,
 static void
 folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 {
-	g_warning ("CamelFolder::sync not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	w(g_warning ("CamelFolder::sync not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 }
 
 /**
@@ -380,8 +381,8 @@ camel_folder_get_parent_store (CamelFolder *folder)
 static void
 expunge (CamelFolder *folder, CamelException *ex)
 {
-	g_warning ("CamelFolder::expunge not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	w(g_warning ("CamelFolder::expunge not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 }
 
 
@@ -474,12 +475,13 @@ static void
 append_message (CamelFolder *folder, CamelMimeMessage *message,
 		const CamelMessageInfo *info, CamelException *ex)
 {
-	camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-			     _("Unsupported operation: append message: for %s"),
-			     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-
-	g_warning ("CamelFolder::append_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
+			      _("Unsupported operation: append message: for %s"),
+			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	
+	w(g_warning ("CamelFolder::append_message not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+	
 	return;
 
 }
@@ -861,8 +863,9 @@ camel_folder_has_summary_capability (CamelFolder *folder)
 static CamelMimeMessage *
 get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 {
-	g_warning ("CamelFolder::get_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	w(g_warning ("CamelFolder::get_message not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+	
 	return NULL;
 }
 
@@ -1041,12 +1044,13 @@ static GPtrArray *
 search_by_expression (CamelFolder *folder, const char *expression,
 		      CamelException *ex)
 {
-	camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-			     _("Unsupported operation: search by expression: for %s"),
-			     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-
-	g_warning ("CamelFolder::search_by_expression not implemented for "
-		   "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
+			      _("Unsupported operation: search by expression: for %s"),
+			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+	
+	w(g_warning ("CamelFolder::search_by_expression not implemented for "
+		     "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+	
 	return NULL;
 }
 
@@ -1485,8 +1489,8 @@ folder_changed (CamelObject *obj, gpointer event_data)
 		}
 		CAMEL_FOLDER_UNLOCK(folder, change_lock);
 	} else {
-			g_warning("Class %s is passing NULL to folder_changed event",
-				  camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
+			w(g_warning ("Class %s is passing NULL to folder_changed event",
+				     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 	}
 
 	return ret;
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index c70a52d8a8..eff482bfde 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -36,6 +36,8 @@
 #include "camel-sasl-plain.h"
 #include "camel-sasl-popb4smtp.h"
 
+#define w(x)
+
 static CamelObjectClass *parent_class = NULL;
 
 /* Returns the class for a CamelSasl */
@@ -82,7 +84,7 @@ camel_sasl_get_type (void)
 static GByteArray *
 sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
 {
-	g_warning ("sasl_challenge: Using default implementation!");
+	w(g_warning ("sasl_challenge: Using default implementation!"));
 	return NULL;
 }
 
diff --git a/camel/camel-service.c b/camel/camel-service.c
index befc8d4f69..4df8154d98 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -47,6 +47,7 @@
 #include "camel-private.h"
 
 #define d(x)
+#define w(x)
 
 static CamelObjectClass *parent_class = NULL;
 
@@ -103,8 +104,8 @@ camel_service_finalize (CamelObject *object)
 		camel_exception_init (&ex);
 		CSERV_CLASS (service)->disconnect (service, TRUE, &ex);
 		if (camel_exception_is_set (&ex)) {
-			g_warning ("camel_service_finalize: silent disconnect failure: %s",
-				   camel_exception_get_description (&ex));
+			w(g_warning ("camel_service_finalize: silent disconnect failure: %s",
+				     camel_exception_get_description (&ex)));
 		}
 		camel_exception_clear (&ex);
 	}
@@ -370,8 +371,8 @@ camel_service_get_url (CamelService *service)
 static char *
 get_name (CamelService *service, gboolean brief)
 {
-	g_warning ("CamelService::get_name not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service)));
+	w(g_warning ("CamelService::get_name not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service))));
 	return g_strdup ("???");
 }		
 
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 792dd6c6f9..779c900edd 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -37,6 +37,9 @@
 #include "camel-exception.h"
 #include "camel-private.h"
 
+#define d(x)
+#define w(x)
+
 static CamelServiceClass *parent_class = NULL;
 
 /* Returns the class for a CamelStore */
@@ -135,9 +138,9 @@ camel_store_finalize (CamelObject *object)
 
 	if (store->folders) {
 		if (g_hash_table_size (store->folders) != 0) {
-			g_warning ("Folder cache for store %p contains "
-				   "%d folders at destruction.", store,
-				   g_hash_table_size (store->folders));
+			d(g_warning ("Folder cache for store %p contains "
+				     "%d folders at destruction.", store,
+				     g_hash_table_size (store->folders)));
 		}
 		g_hash_table_destroy (store->folders);
 	}
@@ -209,8 +212,12 @@ construct (CamelService *service, CamelSession *session,
 static CamelFolder *
 get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
 {
-	g_warning ("CamelStore::get_folder not implemented for `%s'",
-		   camel_type_to_name(CAMEL_OBJECT_GET_TYPE(store)));
+	w(g_warning ("CamelStore::get_folder not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
+	
+	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
+			      _("Cannot get folder: Invalid operation on this store"));
+	
 	return NULL;
 }
 
@@ -266,11 +273,12 @@ static CamelFolderInfo *
 create_folder (CamelStore *store, const char *parent_name,
 	       const char *folder_name, CamelException *ex)
 {
-	g_warning ("CamelStore::create_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-
-	camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_INVALID,
-			     _("Cannot create folder: Invalid operation on this store"));
+	w(g_warning ("CamelStore::create_folder not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
+	
+	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
+			      _("Cannot create folder: Invalid operation on this store"));
+	
 	return NULL;
 }
 
@@ -304,8 +312,8 @@ camel_store_create_folder (CamelStore *store, const char *parent_name,
 static void
 delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
 {
-	g_warning ("CamelStore::delete_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::delete_folder not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
 /** 
@@ -361,8 +369,8 @@ static void
 rename_folder (CamelStore *store, const char *old_name,
 	       const char *new_name, CamelException *ex)
 {
-	g_warning ("CamelStore::rename_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::rename_folder not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
 /**
@@ -491,7 +499,7 @@ get_trash (CamelStore *store, CamelException *ex)
 			/*camel_object_ref (CAMEL_OBJECT (store->vtrash));*/
 			return store->vtrash;
 		} else {
-			g_warning ("This store does not support vTrash.");
+			w(g_warning ("This store does not support vTrash."));
 			return NULL;
 		}
 	}
@@ -580,8 +588,9 @@ static CamelFolderInfo *
 get_folder_info (CamelStore *store, const char *top,
 		 guint32 flags, CamelException *ex)
 {
-	g_warning ("CamelStore::get_folder_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::get_folder_info not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
+	
 	return NULL;
 }
 
@@ -629,8 +638,8 @@ camel_store_get_folder_info (CamelStore *store, const char *top,
 static void
 free_folder_info (CamelStore *store, CamelFolderInfo *fi)
 {
-	g_warning ("CamelStore::free_folder_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::free_folder_info not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
 /**
@@ -802,7 +811,7 @@ camel_folder_info_build (GPtrArray *folders, const char *namespace,
 				if (sep)
 					*sep = '\0';
 				else
-					g_warning ("huh, no \"%c\" in \"%s\"?", separator, fi->url);
+					d(g_warning ("huh, no \"%c\" in \"%s\"?", separator, fi->url));
 				
 				/* FIXME: wtf is this? This is WRONG. Parent folders can be selectable */
 				camel_url_set_param (url, "noselect", "yes");
@@ -843,8 +852,9 @@ camel_store_supports_subscriptions (CamelStore *store)
 static gboolean
 folder_subscribed (CamelStore *store, const char *folder_name)
 {
-	g_warning ("CamelStore::folder_subscribed not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::folder_subscribed not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
+	
 	return FALSE;
 }
 
@@ -875,8 +885,8 @@ camel_store_folder_subscribed (CamelStore *store,
 static void
 subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
 {
-	g_warning ("CamelStore::subscribe_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::subscribe_folder not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
 /**
@@ -902,8 +912,8 @@ camel_store_subscribe_folder (CamelStore *store,
 static void
 unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
 {
-	g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
+	w(g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",
+		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
 
diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
index c00ca7e39d..30a483fbf3 100644
--- a/camel/camel-tcp-stream.c
+++ b/camel/camel-tcp-stream.c
@@ -26,6 +26,8 @@
 
 #include "camel-tcp-stream.h"
 
+#define w(x)
+
 static CamelStreamClass *parent_class = NULL;
 
 /* Returns the class for a CamelTcpStream */
@@ -80,7 +82,7 @@ camel_tcp_stream_get_type (void)
 static int
 tcp_connect (CamelTcpStream *stream, struct hostent *host, int port)
 {
-	g_warning ("CamelTcpStream::connect called on default implementation\n");
+	w(g_warning ("CamelTcpStream::connect called on default implementation"));
 	return -1;
 }
 
@@ -106,7 +108,7 @@ camel_tcp_stream_connect (CamelTcpStream *stream, struct hostent *host, int port
 static int
 tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
 {
-	g_warning ("CamelTcpStream::getsockopt called on default implementation\n");
+	w(g_warning ("CamelTcpStream::getsockopt called on default implementation"));
 	return -1;
 }
 
@@ -132,7 +134,7 @@ camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
 static int
 tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
 {
-	g_warning ("CamelTcpStream::setsockopt called on default implementation\n");
+	w(g_warning ("CamelTcpStream::setsockopt called on default implementation"));
 	return -1;
 }
 
@@ -158,7 +160,7 @@ camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *dat
 static gpointer
 tcp_get_socket (CamelTcpStream *stream)
 {
-	g_warning ("CamelTcpStream::get_socket called on default implementation\n");
+	w(g_warning ("CamelTcpStream::get_socket called on default implementation"));
 	return NULL;
 }