Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/lib
Modified Files:
Entrance_Edit.h Makefile.am entrance_edit.c
Log Message:
EAPI
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/lib/Entrance_Edit.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Entrance_Edit.h 28 Aug 2006 04:12:44 -0000 1.3
+++ Entrance_Edit.h 4 Nov 2007 12:00:53 -0000 1.4
@@ -32,18 +32,37 @@
#define ENTRANCE_EDIT_KEY_CLIENT_SESSION_0_TITLE_STR
"/entrance/session/0/title"
#define ENTRANCE_EDIT_KEY_CLIENT_SESSION_0_ICON_STR "/entrance/session/0/icon"
-int entrance_edit_init(const char*);
-int entrance_edit_shutdown();
-int entrance_edit_save();
+#ifdef EAPI
+#undef EAPI
+#endif
+#ifdef _MSC_VER
+# ifdef BUILDING_DLL
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI __declspec(dllimport)
+# endif
+#else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# else
+# define EAPI
+# endif
+# else
+# define EAPI
+# endif
+#endif
-void entrance_edit_list();
+EAPI int entrance_edit_init(const char *filename);
+EAPI int entrance_edit_shutdown(void);
+EAPI int entrance_edit_save(void);
-int entrance_edit_int_get(const char*);
-int entrance_edit_int_set(const char*, int);
+EAPI void entrance_edit_list(void);
-char* entrance_edit_string_get(const char*);
-int entrance_edit_string_set(const char*, const char*);
+EAPI int entrance_edit_int_get(const char *key);
+EAPI int entrance_edit_int_set(const char *key, int val);
-int entrance_edit_session_add(const char *title, const char *exec, const char
*icon);
+EAPI char *entrance_edit_string_get(const char *key);
+EAPI int entrance_edit_string_set(const char *key, const char *val);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 13 Aug 2006 23:46:40 -0000 1.4
+++ Makefile.am 4 Nov 2007 12:00:53 -0000 1.5
@@ -5,12 +5,12 @@
entrancelibdir = $(libdir)/$(PACKAGE)
-lib_LTLIBRARIES=libentrance_edit.la
+lib_LTLIBRARIES = libentrance_edit.la
-libentrance_edit_la_SOURCES=../daemon/Entranced.h entrance_edit.c
Entrance_Edit.h
-libentrance_edit_la_HEADERS=Entrance_Edit.h
-libentrance_edit_ladir=$(prefix)/include
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+libentrance_edit_la_SOURCES = ../daemon/Entranced.h entrance_edit.c
Entrance_Edit.h
+libentrance_edit_la_HEADERS = Entrance_Edit.h
+libentrance_edit_ladir = $(prefix)/include
+libentrance_edit_la_LIBADD = @ECORE_LIBS@
+libentrance_edit_la_CFLAGS = @ECORE_CFLAGS@
bin_SCRIPTS = entrance_edit-config
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/lib/entrance_edit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- entrance_edit.c 17 Aug 2006 00:20:12 -0000 1.2
+++ entrance_edit.c 4 Nov 2007 12:00:53 -0000 1.3
@@ -9,26 +9,25 @@
-struct __Entranced_Edit {
- char* config_file;
+struct _Entranced_Edit {
+ char *config_file;
};
-typedef struct __Entranced_Edit _Entranced_Edit;
-typedef struct __Entranced_Edit* Entranced_Edit;
+typedef struct _Entranced_Edit Entranced_Edit;
-static Entranced_Edit _entrance_edit;
+static Entranced_Edit *_entrance_edit;
-static int _entrance_edit_new();
-static void _entrance_edit_free();
-static void _entrance_edit_defaults_set();
+static int _entrance_edit_new(void);
+static void _entrance_edit_free(void);
+static void _entrance_edit_defaults_set(void);
-int
+EAPI int
entrance_edit_init(const char *filename)
{
int status;
ecore_init();
- if(ecore_config_init(_CONF_INIT_DOMAIN) != ECORE_CONFIG_ERR_SUCC)
+ if (ecore_config_init(_CONF_INIT_DOMAIN) != ECORE_CONFIG_ERR_SUCC)
{
ecore_shutdown();
return 0;
@@ -37,13 +36,13 @@
_entrance_edit_defaults_set();
- if(!_entrance_edit_new())
+ if (!_entrance_edit_new())
{
ecore_shutdown();
return 0;
}
- if(filename)
+ if (filename)
{
_entrance_edit->config_file = strdup(filename);
}
@@ -54,7 +53,7 @@
status = ecore_config_file_load(_entrance_edit->config_file);
- if(status != ECORE_CONFIG_ERR_SUCC)
+ if (status != ECORE_CONFIG_ERR_SUCC)
{
return 0;
}
@@ -63,8 +62,8 @@
}
-int
-entrance_edit_shutdown()
+EAPI int
+entrance_edit_shutdown(void)
{
_entrance_edit_free();
ecore_config_shutdown();
@@ -74,12 +73,12 @@
return 1;
}
-int
-entrance_edit_save()
+EAPI int
+entrance_edit_save(void)
{
- if(_entrance_edit)
+ if (_entrance_edit)
{
- if(ecore_config_file_save(_entrance_edit->config_file) !=
ECORE_CONFIG_ERR_SUCC)
+ if (ecore_config_file_save(_entrance_edit->config_file) !=
ECORE_CONFIG_ERR_SUCC)
{
return 0;
}
@@ -92,8 +91,8 @@
return 0;
}
-void
-entrance_edit_list()
+EAPI void
+entrance_edit_list(void)
{
/*TODO:eet_list anyone?*/
printf("Entrance Daemon Settings\n");
@@ -138,26 +137,26 @@
* entrance_edit_auth_set/get, entrance_edit_theme_set/get
* */
-int
+EAPI int
entrance_edit_int_get(const char *key)
{
return ecore_config_int_get(key);
}
-int
+EAPI int
entrance_edit_int_set(const char *key, int val)
{
return ecore_config_int_set(key, val);
}
-char*
+EAPI char *
entrance_edit_string_get(const char *key)
{
return ecore_config_string_get(key);
}
-int
-entrance_edit_string_set(const char *key, const char* val)
+EAPI int
+entrance_edit_string_set(const char *key, const char *val)
{
return ecore_config_string_set(key, val);
}
@@ -165,10 +164,10 @@
/*private parts - oops!!!*/
static int
-_entrance_edit_new()
+_entrance_edit_new(void)
{
- _entrance_edit = calloc(1, sizeof(_Entranced_Edit));
- if(!_entrance_edit)
+ _entrance_edit = calloc(1, sizeof(Entranced_Edit));
+ if (!_entrance_edit)
{
return 0;
}
@@ -177,11 +176,11 @@
}
static void
-_entrance_edit_free()
+_entrance_edit_free(void)
{
- if(_entrance_edit)
+ if (_entrance_edit)
{
- if(_entrance_edit->config_file)
+ if (_entrance_edit->config_file)
{
free(_entrance_edit->config_file);
}
@@ -191,7 +190,8 @@
}
-static void _entrance_edit_defaults_set()
+static void
+_entrance_edit_defaults_set(void)
{
ecore_config_string_default(ENTRANCE_EDIT_KEY_DAEMON_XSERVER_STR,
DEFAULT_X_SERVER);
ecore_config_int_default(ENTRANCE_EDIT_KEY_DAEMON_ATTEMPTS_INT, 5);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
