[evolution-patches] debug vomit and warning spew, in mail, shell, camel, composer

[Not Zed <notzed ximian com>]

A couple of small patches to remove some warnings at runtime.
Mainly from startup + sending mail.

Not sure if the shell patch is the correct fix for the problem though.

 Z


Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1801
diff -u -3 -r1.1801 ChangeLog
--- camel/ChangeLog	23 Apr 2003 04:44:57 -0000	1.1801
+++ camel/ChangeLog	23 Apr 2003 08:04:43 -0000
@@ -1,5 +1,8 @@
 2003-04-23  Not Zed  <NotZed Ximian com>
 
+	* providers/smtp/camel-smtp-transport.c (smtp_helo): only free the
+	host if it was set.  removes a run-time warning.
+
 	* camel-session.c (get_service): oops, the service owns the url
 	after we construct it.
 
Index: camel/providers/smtp/camel-smtp-transport.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/smtp/camel-smtp-transport.c,v
retrieving revision 1.135
diff -u -3 -r1.135 camel-smtp-transport.c
--- camel/providers/smtp/camel-smtp-transport.c	10 Apr 2003 17:13:15 -0000	1.135
+++ camel/providers/smtp/camel-smtp-transport.c	23 Apr 2003 08:04:55 -0000
@@ -891,8 +891,10 @@
 	
 	camel_exception_clear (&err);
 	
-	if (host && host->h_name && *host->h_name) {
-		name = g_strdup (host->h_name);
+	if (host) {
+		if (host->h_name && *host->h_name)
+			name = g_strdup (host->h_name);
+		camel_free_host (host);
 	} else {
 #ifdef ENABLE_IPv6
 		char ip[MAXHOSTNAMELEN + 1];
@@ -909,9 +911,7 @@
 					transport->localaddr->address[3]);
 #endif
 	}
-	
-	camel_free_host (host);
-	
+		
 	/* hiya server! how are you today? */
 	if (transport->flags & CAMEL_SMTP_TRANSPORT_IS_ESMTP)
 		cmdbuf = g_strdup_printf ("EHLO %s\r\n", name);
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2702
diff -u -3 -r1.2702 ChangeLog
--- mail/ChangeLog	21 Apr 2003 17:42:40 -0000	1.2702
+++ mail/ChangeLog	23 Apr 2003 08:06:17 -0000
@@ -1,3 +1,8 @@
+2003-04-23  Not Zed  <NotZed Ximian com>
+
+	* mail-send-recv.c (get_receive_type): pass an exception to
+	get_provider, to silence some warnings/get a valid result.
+
 2003-04-18  Jeffrey Stedfast  <fejj ximian com>
 
 	* mail-composer-prefs.c (spell_set_ui): Protect against a NULL
Index: mail/mail-send-recv.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-send-recv.c,v
retrieving revision 1.70
diff -u -3 -r1.70 mail-send-recv.c
--- mail/mail-send-recv.c	14 Apr 2003 22:52:32 -0000	1.70
+++ mail/mail-send-recv.c	23 Apr 2003 08:06:20 -0000
@@ -261,8 +261,11 @@
 static send_info_t get_receive_type(const char *url)
 {
 	CamelProvider *provider;
+	CamelException ex;
 
-	provider = camel_session_get_provider (session, url, NULL);
+	camel_exception_init(&ex);
+	provider = camel_session_get_provider (session, url, &ex);
+	camel_exception_clear(&ex);
 	if (!provider)
 		return SEND_INVALID;
 	
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1253
diff -u -3 -r1.1253 ChangeLog
--- shell/ChangeLog	22 Apr 2003 19:49:21 -0000	1.1253
+++ shell/ChangeLog	23 Apr 2003 08:07:04 -0000
@@ -1,3 +1,9 @@
+2003-04-23  Not Zed  <NotZed Ximian com>
+
+	* e-local-storage.c (load_folder): cast to remove warning.
+	(construct): set a physiucal uri on the root folder, so we dont
+	get warnings when we add it later.
+
 2003-04-22  Anna Marie Dirks  <anna ximian com>
 	
 	* e-shortcuts-view.c
Index: shell/e-local-storage.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-local-storage.c,v
retrieving revision 1.92
diff -u -3 -r1.92 e-local-storage.c
--- shell/e-local-storage.c	21 Apr 2003 20:00:56 -0000	1.92
+++ shell/e-local-storage.c	23 Apr 2003 08:07:06 -0000
@@ -200,7 +200,7 @@
 		return TRUE;
 	}
 
-	e_storage_new_folder (local_storage, path, folder);
+	e_storage_new_folder ((EStorage *)local_storage, path, folder);
 	return TRUE;
 }
 
@@ -1146,8 +1146,12 @@
 	ELocalStoragePrivate *priv;
 	EFolder *root_folder;
 	int base_path_len;
+	char *uri;
 
 	root_folder = e_folder_new (_("Local Folders"), "noselect", "");
+	uri = g_strdup_printf("file://%s;noselect", base_path);
+	e_folder_set_physical_uri(root_folder, uri);
+	g_free(uri);
 	e_storage_construct (E_STORAGE (local_storage),
 			     E_LOCAL_STORAGE_NAME,
 			     root_folder);
Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.532
diff -u -3 -r1.532 ChangeLog
--- composer/ChangeLog	22 Apr 2003 18:14:44 -0000	1.532
+++ composer/ChangeLog	23 Apr 2003 08:07:19 -0000
@@ -1,3 +1,7 @@
+2003-04-23  Not Zed  <NotZed Ximian com>
+
+	* e-msg-composer.c (map_default_cb): removed debug printfs.
+
 2003-04-22  Radek Doulik  <rodo ximian com>
 
 	* e-msg-composer.c (add_attachments_handle_mime_part): added
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.389
diff -u -3 -r1.389 e-msg-composer.c
--- composer/e-msg-composer.c	22 Apr 2003 18:14:44 -0000	1.389
+++ composer/e-msg-composer.c	23 Apr 2003 08:07:28 -0000
@@ -2773,8 +2773,6 @@
 	bonobo_object_release_unref (pb, NULL);
 	
 	if (!text || text[0] == '\0') {
-		printf ("grabbing focus in the To entry...\n");
-
 		bonobo_control_frame_control_activate (cf);
 
 		g_free (text);
@@ -2787,7 +2785,6 @@
 	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
 	
 	if (!subject || subject[0] == '\0') {
-		printf ("grabbing focus in the Subject entry...\n");
 		widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
 		gtk_widget_grab_focus (widget);
 		return;