Enable GUI option for 'custom command' connection. Don't g_free strings in

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.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7cf23c5..3854e75 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -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-28  Not Zed  <NotZed@Ximian.com>
 
        * camel-mime-utils.c (mail_list_magic[]): Added list-unsubscribe

diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index b7e92a7..abda8f8 100644 (file)
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -39,6 +39,13 @@ static gint check_equal (char *s1, char *s2);
 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,

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 46c30ab..07152ee 100644 (file)
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -774,7 +774,7 @@ connect_to_server_process (CamelService *service, const char *cmd, CamelExceptio
        /* Now do %h, %u, etc. substitution in cmd */
        buf = cmd_copy = g_strdup(cmd);
 
-       full_cmd = "";
+       full_cmd = g_strdup("");
 
        for(;;) {
                char *pc;