Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore/src/lib/ecore_ipc


Modified Files:
        Makefile.am ecore_ipc.c ecore_ipc_private.h 
Added Files:
        Ecore_Ipc.h 
Removed Files:
        Ecore_Ipc.h.in 


Log Message:


ok fix some things with SSL and ecore_evas. you ALWYAs have at least the api
to do ssl and al fo ecorE_evas stuff

BUt ecore_* may not be BUILT with that support
so the api stub exists
but it may just return NULL. theres calls to query for support here.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 20 Oct 2004 17:51:29 -0000      1.5
+++ Makefile.am 22 Oct 2004 03:41:48 -0000      1.6
@@ -1,15 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_con \
--I$(top_srcdir)/src/lib/ecore_ipc \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_con \
 -I$(top_builddir)/src/lib/ecore_ipc \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_con \
+-I$(top_srcdir)/src/lib/ecore_ipc \
 @SSL_CFLAGS@
 
-libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \
+libecore_ipc_la_LDFLAGS = $(LDFLAGS) -version-info 1:0:0 \
 -L$(top_builddir)/src/lib/ecore/.libs \
 -L$(top_builddir)/src/lib/ecore_con/.libs
 
@@ -35,6 +35,5 @@
 endif
 
 EXTRA_DIST = \
-Ecore_Ipc.h.in \
 ecore_ipc.c \
 ecore_ipc_private.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/ecore_ipc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ecore_ipc.c 20 Oct 2004 17:51:29 -0000      1.14
+++ ecore_ipc.c 22 Oct 2004 03:41:48 -0000      1.15
@@ -280,10 +280,8 @@
    svr = calloc(1, sizeof(Ecore_Ipc_Server));
    if (!svr) return NULL;
    type = compl_type;
-#if USE_OPENSSL
    type &= ~ECORE_IPC_USE_SSL;
    if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
-#endif   
    switch (type)
      {
       case ECORE_IPC_LOCAL_USER:
@@ -337,10 +335,8 @@
    svr = calloc(1, sizeof(Ecore_Ipc_Server));
    if (!svr) return NULL;
    type = compl_type;
-#if USE_OPENSSL
    type &= ~ECORE_IPC_USE_SSL;
    if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
-#endif   
    switch (type)
      {
       case ECORE_IPC_LOCAL_USER:
@@ -702,6 +698,16 @@
    return cl->data;
 }
 
+/**
+ *  * Returns if SSL support is available
+ *  * @return  1 if SSL is available, 0 if it is not.
+ *  * @ingroup Ecore_Con_Client_Group
+ *  */
+int
+ecore_ipc_ssl_available_get(void)
+{
+   return ecore_con_ssl_available_get();
+}
 
 
 static int
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/ecore_ipc_private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_ipc_private.h 23 Apr 2004 07:24:40 -0000      1.3
+++ ecore_ipc_private.h 22 Oct 2004 03:41:48 -0000      1.4
@@ -1,6 +1,10 @@
 #ifndef _ECORE_IPC_PRIVATE_H
 #define _ECORE_IPC_PRIVATE_H
 
+#if USE_OPENSSL
+#include <openssl/ssl.h>
+#endif
+
 #define ECORE_MAGIC_IPC_SERVER             0x87786556
 #define ECORE_MAGIC_IPC_CLIENT             0x78875665
 




-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to