Enlightenment CVS committal

Author  : tsauerbeck
Project : misc
Module  : embrace

Dir     : misc/embrace/src/plugins/imap


Modified Files:
        imap.c 


Log Message:
HAVE_ECORE_CON_SSL was superseeded by ecore_con_ssl_available_get()
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/plugins/imap/imap.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- imap.c      24 Oct 2004 20:20:45 -0000      1.16
+++ imap.c      30 Jan 2005 16:29:48 -0000      1.17
@@ -1,5 +1,5 @@
 /*
- * $Id: imap.c,v 1.16 2004/10/24 20:20:45 tsauerbeck Exp $
+ * $Id: imap.c,v 1.17 2005/01/30 16:29:48 tsauerbeck Exp $
  * vim:noexpandtab:ts=4:sw=4:sts=4
  *
  * Copyright (C) 2004 Embrace project.
@@ -190,10 +190,9 @@
                return false;
        }
 
-#ifdef HAVE_OPENSSL
-       if ((int) mailbox_property_get (mb, "ssl"))
+       if (ecore_con_ssl_available_get () &&
+           mailbox_property_get (mb, "ssl"))
                type |= ECORE_CON_USE_SSL;
-#endif
 
        server = ecore_con_server_connect (type, host, port, mb);
 
@@ -254,15 +253,15 @@
        assert (edb);
        assert (root);
 
-#ifdef HAVE_OPENSSL
-       /* check whether OpenSSL should be used */
-       snprintf (key, sizeof (key), "%s/ssl", root);
+       if (ecore_con_ssl_available_get ()) {
+               /* check whether OpenSSL should be used */
+               snprintf (key, sizeof (key), "%s/ssl", root);
 
-       if (!e_db_int_get (edb, key, &use_ssl))
-               use_ssl = 0;
+               if (!e_db_int_get (edb, key, &use_ssl))
+                       use_ssl = 0;
 
-       mailbox_property_set (mb, "ssl", (int *) use_ssl);
-#endif
+               mailbox_property_set (mb, "ssl", (int *) use_ssl);
+       }
 
        /* read server */
        snprintf (key, sizeof (key), "%s/host", root);




-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to