Re: [Evolution-hackers] [Fwd: Re: [evolution-patches] [PATCH] IMAP preauth and subcommand connection.]

[David Woodhouse <dwmw2 infradead org>]

On Fri, 2003-11-28 at 11:49 +1100, Not Zed wrote:
> Is the latest patch on this list still applying against head, or can
> you send an updated one David?  Its time to move this forward based on
> real technical issues.

This is the minimal version. Ideally, I'd like to switch from a
disconnected option on the second page to a more coherent selection like
'Connection Type: plain/ssl/tls/command' as discussed.

I'll do that if it'll be acceptable, but at this stage I'm sure you'll
forgive me for not bothering before there's a clear statement that it'll
actually be worthwhile :)

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1922
diff -u -p -r1.1922 ChangeLog
--- ChangeLog	26 Nov 2003 19:32:15 -0000	1.1922
+++ ChangeLog	28 Nov 2003 11:50:51 -0000
@@ -1,3 +1,10 @@
+2003-11-28  David Woodhouse  <dwmw2 redhat com>
+
+	* providers/imap/camel-imap-provider.c: Enable GUI option for
+	'custom command' connection.
+	* providers/imap/camel-imap-store.c: Don't g_free strings in
+	.rodata. It's considered rude.
+	
 2003-11-26  JP Rosevear <jpr ximian com>
 
 	* Makefile.am: make sure we always dist the smime stuff
Index: providers/imap/camel-imap-provider.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-provider.c,v
retrieving revision 1.25
diff -u -p -r1.25 camel-imap-provider.c
--- providers/imap/camel-imap-provider.c	22 Sep 2003 18:48:34 -0000	1.25
+++ providers/imap/camel-imap-provider.c	28 Nov 2003 11:50:51 -0000
@@ -39,6 +39,13 @@ static gint check_equal (char *s1, char 
 static gint imap_url_equal (gconstpointer a, gconstpointer b);
 
 CamelProviderConfEntry imap_conf_entries[] = {
+	{ CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL,
+	  N_("Connection to Server") },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "use_command", NULL,
+	  N_("Use custom command to connect to server"), "0" },
+	{ CAMEL_PROVIDER_CONF_ENTRY, "command", "use_command",
+	  N_("Command:"), "ssh -C -l %u %h exec /usr/sbin/imapd" },
+	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
 	  N_("Checking for new mail") },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
Index: providers/imap/camel-imap-store.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-store.c,v
retrieving revision 1.259
diff -u -p -r1.259 camel-imap-store.c
--- providers/imap/camel-imap-store.c	28 Oct 2003 19:01:55 -0000	1.259
+++ providers/imap/camel-imap-store.c	28 Nov 2003 11:50:51 -0000
@@ -774,7 +774,7 @@ connect_to_server_process (CamelService 
 	/* Now do %h, %u, etc. substitution in cmd */
 	buf = cmd_copy = g_strdup(cmd);
 
-	full_cmd = "";
+	full_cmd = g_strdup("");
 
 	for(;;) {
 		char *pc;


-- 
dwmw2