Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
Efreet.h Efreet_Mime.h efreet.c efreet_base.c efreet_base.h
efreet_desktop.c efreet_desktop.h efreet_icon.c efreet_icon.h
efreet_ini.c efreet_ini.h efreet_menu.c efreet_menu.h
efreet_mime.c efreet_private.h efreet_utils.c efreet_utils.h
Log Message:
EAPI
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/Efreet.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Efreet.h 6 Sep 2007 16:15:09 -0000 1.3
+++ Efreet.h 4 Nov 2007 09:32:35 -0000 1.4
@@ -24,18 +24,40 @@
* @li Desktop Menu Specification
*/
+#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
+
#ifdef __cplusplus
extern "C" {
#endif
#include "efreet_base.h"
+#include "efreet_ini.h"
#include "efreet_icon.h"
#include "efreet_desktop.h"
#include "efreet_menu.h"
#include "efreet_utils.h"
-int efreet_init(void);
-int efreet_shutdown(void);
+EAPI int efreet_init(void);
+EAPI int efreet_shutdown(void);
#ifdef __cplusplus
}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/Efreet_Mime.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Efreet_Mime.h 6 Sep 2007 16:15:09 -0000 1.7
+++ Efreet_Mime.h 4 Nov 2007 09:32:35 -0000 1.8
@@ -26,17 +26,17 @@
* @{
*/
-int efreet_mime_init(void);
-void efreet_mime_shutdown(void);
+EAPI int efreet_mime_init(void);
+EAPI void efreet_mime_shutdown(void);
-const char *efreet_mime_type_get(const char *file);
-const char *efreet_mime_magic_type_get(const char *file);
-const char *efreet_mime_globs_type_get(const char *file);
-const char *efreet_mime_special_type_get(const char *file);
-const char *efreet_mime_fallback_type_get(const char *file);
+EAPI const char *efreet_mime_type_get(const char *file);
+EAPI const char *efreet_mime_magic_type_get(const char *file);
+EAPI const char *efreet_mime_globs_type_get(const char *file);
+EAPI const char *efreet_mime_special_type_get(const char *file);
+EAPI const char *efreet_mime_fallback_type_get(const char *file);
-char *efreet_mime_type_icon_get(const char *mime, const char *theme,
- const char
*size);
+EAPI char *efreet_mime_type_icon_get(const char *mime, const char *theme,
+ const char *size);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- efreet.c 6 Sep 2007 16:15:09 -0000 1.6
+++ efreet.c 4 Nov 2007 09:32:35 -0000 1.7
@@ -15,7 +15,7 @@
* @return Returns > 0 if the initialization was successful, 0 otherwise
* @brief Initializes the Efreet system
*/
-int
+EAPI int
efreet_init(void)
{
if (init++) return init;
@@ -34,7 +34,7 @@
* @brief Shuts down Efreet if a balanced number of init/shutdown calls have
* been made
*/
-int
+EAPI int
efreet_shutdown(void)
{
if (--init) return init;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_base.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- efreet_base.c 6 Sep 2007 16:15:09 -0000 1.4
+++ efreet_base.c 4 Nov 2007 09:32:35 -0000 1.5
@@ -68,7 +68,7 @@
* @return Returns the XDG Data Home directory
* @brief Retrieves the XDG Data Home directory
*/
-const char *
+EAPI const char *
efreet_data_home_get(void)
{
if (xdg_data_home) return xdg_data_home;
@@ -85,7 +85,7 @@
* list then the next call to efreet_data_dirs_get() will return your
* modified values. DO NOT free this list.
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_data_dirs_get(void)
{
if (xdg_data_dirs) return xdg_data_dirs;
@@ -98,7 +98,7 @@
* @return Returns the XDG Config Home directory
* @brief Retrieves the XDG Config Home directory
*/
-const char *
+EAPI const char *
efreet_config_home_get(void)
{
if (xdg_config_home) return xdg_config_home;
@@ -115,7 +115,7 @@
* list then the next call to efreet_config_dirs_get() will return your
* modified values. DO NOT free this list.
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_config_dirs_get(void)
{
if (xdg_config_dirs) return xdg_config_dirs;
@@ -127,7 +127,7 @@
* @return Returns the XDG Cache Home directory
* @brief Retrieves the XDG Cache Home directory
*/
-const char *
+EAPI const char *
efreet_cache_home_get(void)
{
if (xdg_cache_home) return xdg_cache_home;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_base.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- efreet_base.h 6 Sep 2007 16:15:09 -0000 1.2
+++ efreet_base.h 4 Nov 2007 09:32:35 -0000 1.3
@@ -15,13 +15,13 @@
#include <Ecore.h>
#include <Ecore_Data.h>
-const char *efreet_data_home_get(void);
-Ecore_List *efreet_data_dirs_get(void);
+EAPI const char *efreet_data_home_get(void);
+EAPI Ecore_List *efreet_data_dirs_get(void);
-const char *efreet_config_home_get(void);
-Ecore_List *efreet_config_dirs_get(void);
+EAPI const char *efreet_config_home_get(void);
+EAPI Ecore_List *efreet_config_dirs_get(void);
-const char *efreet_cache_home_get(void);
+EAPI const char *efreet_cache_home_get(void);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- efreet_desktop.c 29 Sep 2007 13:24:31 -0000 1.27
+++ efreet_desktop.c 4 Nov 2007 09:32:35 -0000 1.28
@@ -28,9 +28,9 @@
static int init = 0;
static int cache_flush = 0;
-int EFREET_DESKTOP_TYPE_APPLICATION = 0;
-int EFREET_DESKTOP_TYPE_LINK = 0;
-int EFREET_DESKTOP_TYPE_DIRECTORY = 0;
+EAPI int EFREET_DESKTOP_TYPE_APPLICATION = 0;
+EAPI int EFREET_DESKTOP_TYPE_LINK = 0;
+EAPI int EFREET_DESKTOP_TYPE_DIRECTORY = 0;
/**
* @internal
@@ -49,6 +49,8 @@
static int efreet_desktop_read(Efreet_Desktop *desktop);
static void efreet_desktop_clear(Efreet_Desktop *desktop);
static Efreet_Desktop_Type_Info *efreet_desktop_type_parse(const char
*type_str);
+static Ecore_List *efreet_desktop_string_list_parse(const char *string);
+static char *efreet_desktop_string_list_join(Ecore_List *list);
static void *efreet_desktop_application_fields_parse(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static void efreet_desktop_application_fields_save(Efreet_Desktop *desktop,
@@ -179,7 +181,7 @@
* @brief Gets a reference to an Efreet_Desktop structure representing the
* contents of @a file or NULL if @a file is not a valid .desktop file.
*/
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_desktop_get(const char *file)
{
Efreet_Desktop *desktop;
@@ -220,7 +222,7 @@
* @param desktop: The Efreet_Desktop to ref
* @return Returns the new reference count
*/
-int
+EAPI int
efreet_desktop_ref(Efreet_Desktop *desktop)
{
if (!desktop) return 0;
@@ -233,7 +235,7 @@
* @return Returns a new empty_Efreet_Desktop on success, NULL on failure
* @brief Creates a new empty Efreet_Desktop structure or NULL on failure
*/
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_desktop_empty_new(const char *file)
{
Efreet_Desktop *desktop;
@@ -256,7 +258,7 @@
* @brief Creates a new Efreet_Desktop structure initialized from the
* contents of @a file or NULL on failure
*/
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_desktop_new(const char *file)
{
Efreet_Desktop *desktop;
@@ -382,7 +384,7 @@
* @brief Saves any changes made to @a desktop back to the file on the
* filesystem
*/
-int
+EAPI int
efreet_desktop_save(Efreet_Desktop *desktop)
{
Efreet_Desktop_Type_Info *info;
@@ -444,7 +446,7 @@
* @return Returns 1 on success or 0 on failure
* @brief Saves @a desktop to @a file
*/
-int
+EAPI int
efreet_desktop_save_as(Efreet_Desktop *desktop, const char *file)
{
if (desktop == ecore_hash_get(efreet_desktop_cache, desktop->orig_path))
@@ -463,7 +465,7 @@
* @return Returns no value
* @brief Frees the Efreet_Desktop structure and all of it's data
*/
-void
+EAPI void
efreet_desktop_free(Efreet_Desktop *desktop)
{
if (!desktop) return;
@@ -512,7 +514,7 @@
* @return Returns the Ecore_Exce for @a desktop
* @brief Parses the @a desktop exec line and returns an Ecore_Exe.
*/
-void
+EAPI void
efreet_desktop_exec(Efreet_Desktop *desktop, Ecore_List *files, void *data)
{
efreet_desktop_command_get(desktop, files, efreet_desktop_exec_cb, data);
@@ -527,11 +529,10 @@
}
/**
- * @internal
* @param environment: the environment name
* @brief sets the global desktop environment name
*/
-void
+EAPI void
efreet_desktop_environment_set(const char *environment)
{
if (desktop_environment) ecore_string_release(desktop_environment);
@@ -540,11 +541,10 @@
}
/**
- * @internal
* @return environment: the environment name
* @brief sets the global desktop environment name
*/
-const char *
+EAPI const char *
efreet_desktop_environment_get(void)
{
return desktop_environment;
@@ -556,7 +556,7 @@
* @brief Retrieves the number of categories the given @a desktop belongs
* too
*/
-unsigned int
+EAPI unsigned int
efreet_desktop_category_count_get(Efreet_Desktop *desktop)
{
if (!desktop || !desktop->categories) return 0;
@@ -568,7 +568,7 @@
* @param category: the category name
* @brief add a category to a desktop
*/
-void
+EAPI void
efreet_desktop_category_add(Efreet_Desktop *desktop, const char *category)
{
if (!desktop) return;
@@ -593,7 +593,7 @@
* @brief removes a category from a desktop
* @return 1 if the desktop had his category listed, 0 otherwise
*/
-int
+EAPI int
efreet_desktop_category_del(Efreet_Desktop *desktop, const char *category)
{
int found = 0;
@@ -617,7 +617,7 @@
* @return Returns the id of the new type
* @brief Adds the given type to the list of types in the system
*/
-int
+EAPI int
efreet_desktop_type_add(const char *type, Efreet_Desktop_Type_Parse_Cb
parse_func,
Efreet_Desktop_Type_Save_Cb save_func,
Efreet_Desktop_Type_Free_Cb free_func)
@@ -649,8 +649,8 @@
*
* This allows applications to add non-standard types that behave exactly as
standard types.
*/
-int
-efreet_desktop_type_alias (int from_type, const char *alias)
+EAPI int
+efreet_desktop_type_alias(int from_type, const char *alias)
{
Efreet_Desktop_Type_Info *info;
info = ecore_list_index_goto(efreet_desktop_types, from_type);
@@ -676,7 +676,7 @@
* @param desktop the desktop
* @return type specific data, or NULL if there is none
*/
-void *
+EAPI void *
efreet_desktop_type_data_get(Efreet_Desktop *desktop)
{
return desktop->type_data;
@@ -710,7 +710,7 @@
* @return an Ecore_List of ecore string's
* @brief Parse ';' separate list of strings according to the desktop spec
*/
-Ecore_List *
+static Ecore_List *
efreet_desktop_string_list_parse(const char *string)
{
Ecore_List *list;
@@ -754,7 +754,7 @@
* @return a raw string list
* @brief Create a ';' separate list of strings according to the desktop spec
*/
-char *
+static char *
efreet_desktop_string_list_join(Ecore_List *list)
{
const char *tmp;
@@ -792,7 +792,7 @@
* it will force it to be re-read off disk next time efreet_desktop_get() is
* called.
*/
-void
+EAPI void
efreet_desktop_cache_flush(void)
{
cache_flush++;
@@ -1080,7 +1080,7 @@
* @return Returns 1 on success or 0 on failure
* @brief Get a command to use to execute a desktop entry.
*/
-int
+EAPI int
efreet_desktop_command_get(Efreet_Desktop *desktop, Ecore_List *files,
Efreet_Desktop_Command_Cb func, void *data)
{
@@ -1095,7 +1095,7 @@
*
* The returned list and each of its elements must be freed.
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_desktop_command_local_get(Efreet_Desktop *desktop, Ecore_List *files)
{
Efreet_Desktop_Command *command;
@@ -1151,7 +1151,7 @@
* @brief Get a command to use to execute a desktop entry, and receive progress
* updates for downloading of remote URI's passed in.
*/
-int
+EAPI int
efreet_desktop_command_progress_get(Efreet_Desktop *desktop, Ecore_List *files,
Efreet_Desktop_Command_Cb cb_command,
Efreet_Desktop_Progress_Cb cb_progress,
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- efreet_desktop.h 6 Sep 2007 16:15:09 -0000 1.14
+++ efreet_desktop.h 4 Nov 2007 09:32:35 -0000 1.15
@@ -2,8 +2,6 @@
#ifndef EFREET_DESKTOP_H
#define EFREET_DESKTOP_H
-#include "efreet_ini.h"
-
/**
* @file efreet_desktop.h
* @brief Contains the structures and methods used to support the
@@ -14,9 +12,9 @@
* @{
*/
-extern int EFREET_DESKTOP_TYPE_APPLICATION;
-extern int EFREET_DESKTOP_TYPE_LINK;
-extern int EFREET_DESKTOP_TYPE_DIRECTORY;
+EAPI extern int EFREET_DESKTOP_TYPE_APPLICATION;
+EAPI extern int EFREET_DESKTOP_TYPE_LINK;
+EAPI extern int EFREET_DESKTOP_TYPE_DIRECTORY;
/**
* Efreet_Desktop_Type
@@ -99,49 +97,48 @@
void *type_data; /**< Type specific data for custom types */
};
-Efreet_Desktop *efreet_desktop_get(const char *file);
-int efreet_desktop_ref(Efreet_Desktop *desktop);
-Efreet_Desktop *efreet_desktop_empty_new(const char *file);
-Efreet_Desktop *efreet_desktop_new(const char *file);
-void efreet_desktop_free(Efreet_Desktop *desktop);
+EAPI Efreet_Desktop *efreet_desktop_get(const char *file);
+EAPI int efreet_desktop_ref(Efreet_Desktop *desktop);
+EAPI Efreet_Desktop *efreet_desktop_empty_new(const char *file);
+EAPI Efreet_Desktop *efreet_desktop_new(const char *file);
+EAPI void efreet_desktop_free(Efreet_Desktop *desktop);
-int efreet_desktop_save(Efreet_Desktop *desktop);
-int efreet_desktop_save_as(Efreet_Desktop *desktop,
+EAPI int efreet_desktop_save(Efreet_Desktop *desktop);
+EAPI int efreet_desktop_save_as(Efreet_Desktop *desktop,
const char *file);
-void efreet_desktop_exec(Efreet_Desktop *desktop,
+EAPI void efreet_desktop_exec(Efreet_Desktop *desktop,
Ecore_List *files, void *data);
-void efreet_desktop_environment_set(const char *environment);
-int efreet_desktop_command_progress_get(Efreet_Desktop *desktop,
+EAPI void efreet_desktop_environment_set(const char *environment);
+EAPI const char *efreet_desktop_environment_get(void);
+EAPI int efreet_desktop_command_progress_get(Efreet_Desktop
*desktop,
Ecore_List *files,
Efreet_Desktop_Command_Cb cb_command,
Efreet_Desktop_Progress_Cb cb_prog,
void *data);
-int efreet_desktop_command_get(Efreet_Desktop *desktop,
+EAPI int efreet_desktop_command_get(Efreet_Desktop *desktop,
Ecore_List *files,
Efreet_Desktop_Command_Cb func,
void *data);
-Ecore_List * efreet_desktop_command_local_get(Efreet_Desktop *desktop,
+EAPI Ecore_List * efreet_desktop_command_local_get(Efreet_Desktop
*desktop,
Ecore_List *files);
-unsigned int efreet_desktop_category_count_get(Efreet_Desktop *desktop);
-void efreet_desktop_category_add(Efreet_Desktop *desktop,
+EAPI unsigned int efreet_desktop_category_count_get(Efreet_Desktop
*desktop);
+EAPI void efreet_desktop_category_add(Efreet_Desktop *desktop,
const char *category);
-int efreet_desktop_category_del(Efreet_Desktop *desktop,
+EAPI int efreet_desktop_category_del(Efreet_Desktop *desktop,
const char *category);
-int efreet_desktop_type_add(const char *type,
+EAPI int efreet_desktop_type_add(const char *type,
Efreet_Desktop_Type_Parse_Cb parse_func,
Efreet_Desktop_Type_Save_Cb save_func,
Efreet_Desktop_Type_Free_Cb free_func);
-int efreet_desktop_type_alias (int from_type,
+EAPI int efreet_desktop_type_alias (int from_type,
const char *alias);
-void *efreet_desktop_type_data_get(Efreet_Desktop *desktop);
+EAPI void *efreet_desktop_type_data_get(Efreet_Desktop *desktop);
-Ecore_List *efreet_desktop_string_list_parse(const char *string);
-char *efreet_desktop_string_list_join(Ecore_List *list);
-void efreet_desktop_cache_flush(void);
+EAPI void efreet_desktop_cache_flush(void);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- efreet_icon.c 6 Sep 2007 16:15:09 -0000 1.29
+++ efreet_icon.c 4 Nov 2007 09:32:35 -0000 1.30
@@ -164,7 +164,7 @@
return efreet_icon_deprecated_user_dir;
}
-const char *
+EAPI const char *
efreet_icon_user_dir_get(void)
{
const char *user;
@@ -185,7 +185,7 @@
* @return Returns no value.
* @brief Adds the given extension to the list of possible icon extensions
*/
-void
+EAPI void
efreet_icon_extension_add(const char *ext)
{
ecore_list_prepend(efreet_icon_extensions, strdup(ext));
@@ -199,7 +199,7 @@
* from first to last directory in this list. the strings in the list should
* be created with ecore_string_instance().
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_icon_extra_list_get(void)
{
return efreet_extra_icon_dirs;
@@ -211,7 +211,7 @@
* @brief Retrieves all of the non-hidden icon themes available on the system.
* The returned list must be freed. Do not free the list data.
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_icon_theme_list_get(void)
{
Ecore_List *list, *theme_list;
@@ -248,7 +248,7 @@
* none exists.
* @brief Tries to get the icon theme structure for the given theme name
*/
-Efreet_Icon_Theme *
+EAPI Efreet_Icon_Theme *
efreet_icon_theme_find(const char *theme_name)
{
const char *key;
@@ -330,7 +330,7 @@
* @return Returns the path to the given icon or NULL if none found
* @brief Retrives the path to the given icon.
*/
-char *
+EAPI char *
efreet_icon_path_find(const char *theme_name, const char *icon, const char
*size)
{
struct stat st;
@@ -398,7 +398,7 @@
* @note This function will search the given theme for all icons before falling
* back. This is useful when searching for mimetype icons.
*/
-char *
+EAPI char *
efreet_icon_list_find(const char *theme_name, Ecore_List *icons,
const char *size)
{
@@ -450,7 +450,7 @@
* if the icon is not found
* @brief Retrieves all of the information about the given icon.
*/
-Efreet_Icon *
+EAPI Efreet_Icon *
efreet_icon_find(const char *theme, const char *icon, const char *size)
{
char *path;
@@ -961,7 +961,7 @@
* @return Returns no value.
* @brief Free's the given icon and all its internal data.
*/
-void
+EAPI void
efreet_icon_free(Efreet_Icon *icon)
{
if (!icon) return;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- efreet_icon.h 6 Sep 2007 16:15:09 -0000 1.6
+++ efreet_icon.h 4 Nov 2007 09:32:35 -0000 1.7
@@ -158,20 +158,22 @@
int y; /**< y coord */
};
-const char *efreet_icon_user_dir_get(void);
-void efreet_icon_extension_add(const char *ext);
+EAPI const char *efreet_icon_user_dir_get(void);
+EAPI void efreet_icon_extension_add(const char *ext);
-Ecore_List *efreet_icon_extra_list_get(void);
-Ecore_List *efreet_icon_theme_list_get(void);
-Efreet_Icon_Theme *efreet_icon_theme_find(const char *theme_name);
-Efreet_Icon *efreet_icon_find(const char *theme_name, const char *icon,
- const char *size);
-char *efreet_icon_list_find(const char *theme_name,
- Ecore_List *icons,
- const char *size);
-char *efreet_icon_path_find(const char *theme, const char *icon,
- const char *size);
-void efreet_icon_free(Efreet_Icon *icon);
+EAPI Ecore_List *efreet_icon_extra_list_get(void);
+EAPI Ecore_List *efreet_icon_theme_list_get(void);
+EAPI Efreet_Icon_Theme *efreet_icon_theme_find(const char *theme_name);
+EAPI Efreet_Icon *efreet_icon_find(const char *theme_name,
+ const char *icon,
+ const char *size);
+EAPI char *efreet_icon_list_find(const char *theme_name,
+ Ecore_List *icons,
+ const char *size);
+EAPI char *efreet_icon_path_find(const char *theme,
+ const char *icon,
+ const char *size);
+EAPI void efreet_icon_free(Efreet_Icon *icon);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_ini.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- efreet_ini.c 14 Sep 2007 22:22:29 -0000 1.7
+++ efreet_ini.c 4 Nov 2007 09:32:35 -0000 1.8
@@ -40,14 +40,13 @@
}
/**
- * @internal
* @param file: The file to parse
* @return Returns a new Efreet_Ini structure initialized with the contents
* of @a file, or NULL on memory allocation failure
* @brief Creates and initializes a new Ini structure with the contents of
* @a file, or NULL on failure
*/
-Efreet_Ini *
+EAPI Efreet_Ini *
efreet_ini_new(const char *file)
{
Efreet_Ini *ini;
@@ -241,12 +240,11 @@
}
/**
- * @internal
* @param ini: The Efreet_Ini to work with
* @return Returns no value
* @brief Frees the given Efree_Ini structure.
*/
-void
+EAPI void
efreet_ini_free(Efreet_Ini *ini)
{
if (!ini) return;
@@ -256,13 +254,12 @@
}
/**
- * @internal
* @param ini: The Efreet_Ini to work with
* @param file: The file to load
* @return Returns no value
* @brief Saves the given Efree_Ini structure.
*/
-int
+EAPI int
efreet_ini_save(Efreet_Ini *ini, const char *file)
{
FILE *f;
@@ -277,13 +274,12 @@
}
/**
- * @internal
* @param ini: The Efreet_Ini to work with
* @param section: The section of the ini file we want to get values from
* @return Returns 1 if the section exists, otherwise 0
* @brief Sets the current working section of the ini file to @a section
*/
-int
+EAPI int
efreet_ini_section_set(Efreet_Ini *ini, const char *section)
{
if (!ini || !ini->data || !section) return 0;
@@ -293,13 +289,12 @@
}
/**
- * @internal
* @param ini: The Efreet_Ini to work with
* @param section: The section of the ini file we want to add
* @return Returns no value
* @brief Adds a new working section of the ini file to @a section
*/
-void
+EAPI void
efreet_ini_section_add(Efreet_Ini *ini, const char *section)
{
Ecore_Hash *hash;
@@ -321,14 +316,13 @@
}
/**
- * @internal
* @param ini: The Efree_Ini to work with
* @param key: The key to lookup
* @return Returns the string associated with the given key or NULL if not
* found.
* @brief Retrieves the value for the given key or NULL if none found.
*/
-const char *
+EAPI const char *
efreet_ini_string_get(Efreet_Ini *ini, const char *key)
{
if (!ini || !key || !ini->section) return NULL;
@@ -337,14 +331,13 @@
}
/**
- * @internal
* @param ini: The Efree_Ini to work with
* @param key: The key to use
* @param value: The value to set
* @return Returns no value
* @brief Sets the value for the given key
*/
-void
+EAPI void
efreet_ini_string_set(Efreet_Ini *ini, const char *key, const char *value)
{
if (!ini || !key || !ini->section) return;
@@ -353,14 +346,13 @@
}
/**
- * @internal
* @param ini: The Efree_Ini to work with
* @param key: The key to lookup
* @return Returns the integer associated with the given key or -1 if not
* found.
* @brief Retrieves the value for the given key or -1 if none found.
*/
-int
+EAPI int
efreet_ini_int_get(Efreet_Ini *ini, const char *key)
{
const char *str;
@@ -374,14 +366,13 @@
}
/**
- * @internal
* @param ini: The Efree_Ini to work with
* @param key: The key to use
* @param value: The value to set
* @return Returns no value
* @brief Sets the value for the given key
*/
-void
+EAPI void
efreet_ini_int_set(Efreet_Ini *ini, const char *key, int value)
{
char str[12];
@@ -393,14 +384,13 @@
}
/**
- * @internal
* @param ini: The Efree_Ini to work with
* @param key: The key to lookup
* @return Returns the double associated with the given key or -1 if not
* found.
* @brief Retrieves the value for the given key or -1 if none found.
*/
-double
+EAPI double
efreet_ini_double_get(Efreet_Ini *ini, const char *key)
{
const char *str;
@@ -414,14 +404,13 @@
}
/**
- * @internal
* @param ini: The Efree_Ini to work with
* @param key: The key to use
* @param value: The value to set
* @return Returns no value
* @brief Sets the value for the given key
*/
-void
+EAPI void
efreet_ini_double_set(Efreet_Ini *ini, const char *key, double value)
{
char str[512];
@@ -437,13 +426,12 @@
}
/**
- * @internal
* @param ini: The ini struct to work with
* @param key: The key to search for
* @return Returns 1 if the boolean is true, 0 otherwise
* @brief Retrieves the boolean value at key @a key from the ini @a ini
*/
-unsigned int
+EAPI unsigned int
efreet_ini_boolean_get(Efreet_Ini *ini, const char *key)
{
const char *str;
@@ -457,14 +445,13 @@
}
/**
- * @internal
* @param ini: The ini struct to work with
* @param key: The key to use
* @param value: The value to set
* @return Returns no value
* @brief Sets the value for the given key
*/
-void
+EAPI void
efreet_ini_boolean_set(Efreet_Ini *ini, const char *key, unsigned int value)
{
if (!ini || !key || !ini->section) return;
@@ -474,14 +461,13 @@
}
/**
- * @internal
* @param ini: The ini struct to work with
* @param key: The key to search for
* @return Returns the utf8 encoded string associated with @a key, or NULL
* if none found
* @brief Retrieves the utf8 encoded string associated with @a key in the
current locale or NULL if none found
*/
-const char *
+EAPI const char *
efreet_ini_localestring_get(Efreet_Ini *ini, const char *key)
{
const char *lang, *country, *modifier;
@@ -541,14 +527,13 @@
}
/**
- * @internal
* @param ini: The ini struct to work with
* @param key: The key to use
* @param value: The value to set
* @return Returns no value
* @brief Sets the value for the given key
*/
-void
+EAPI void
efreet_ini_localestring_set(Efreet_Ini *ini, const char *key, const char
*value)
{
const char *lang, *country, *modifier;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_ini.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- efreet_ini.h 6 Sep 2007 16:15:09 -0000 1.2
+++ efreet_ini.h 4 Nov 2007 09:32:35 -0000 1.3
@@ -26,30 +26,30 @@
Ecore_Hash *section; /**< currently selected section */
};
-Efreet_Ini *efreet_ini_new(const char *file);
-void efreet_ini_free(Efreet_Ini *ini);
-int efreet_ini_save(Efreet_Ini *ini, const char *path);
+EAPI Efreet_Ini *efreet_ini_new(const char *file);
+EAPI void efreet_ini_free(Efreet_Ini *ini);
+EAPI int efreet_ini_save(Efreet_Ini *ini, const char *path);
-int efreet_ini_section_set(Efreet_Ini *ini, const char *section);
-void efreet_ini_section_add(Efreet_Ini *ini, const char *section);
+EAPI int efreet_ini_section_set(Efreet_Ini *ini, const char *section);
+EAPI void efreet_ini_section_add(Efreet_Ini *ini, const char *section);
-const char *efreet_ini_string_get(Efreet_Ini *ini, const char *key);
-void efreet_ini_string_set(Efreet_Ini *ini, const char *key,
+EAPI const char *efreet_ini_string_get(Efreet_Ini *ini, const char *key);
+EAPI void efreet_ini_string_set(Efreet_Ini *ini, const char *key,
const char *value);
-const char *efreet_ini_localestring_get(Efreet_Ini *ini, const char *key);
-void efreet_ini_localestring_set(Efreet_Ini *ini, const char *key,
+EAPI const char *efreet_ini_localestring_get(Efreet_Ini *ini, const char
*key);
+EAPI void efreet_ini_localestring_set(Efreet_Ini *ini, const char *key,
const char *value);
-unsigned int efreet_ini_boolean_get(Efreet_Ini *ini, const char *key);
-void efreet_ini_boolean_set(Efreet_Ini *ini, const char *key,
+EAPI unsigned int efreet_ini_boolean_get(Efreet_Ini *ini, const char *key);
+EAPI void efreet_ini_boolean_set(Efreet_Ini *ini, const char *key,
unsigned int value);
-int efreet_ini_int_get(Efreet_Ini *ini, const char *key);
-void efreet_ini_int_set(Efreet_Ini *ini, const char *key, int value);
+EAPI int efreet_ini_int_get(Efreet_Ini *ini, const char *key);
+EAPI void efreet_ini_int_set(Efreet_Ini *ini, const char *key, int
value);
-double efreet_ini_double_get(Efreet_Ini *ini, const char *key);
-void efreet_ini_double_set(Efreet_Ini *ini, const char *key,
+EAPI double efreet_ini_double_get(Efreet_Ini *ini, const char *key);
+EAPI void efreet_ini_double_set(Efreet_Ini *ini, const char *key,
double value);
/**
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- efreet_menu.c 6 Sep 2007 16:15:10 -0000 1.24
+++ efreet_menu.c 4 Nov 2007 09:32:35 -0000 1.25
@@ -486,7 +486,7 @@
* @brief Initialize legacy kde support. This function blocks while
* the kde-config script is run.
*/
-int
+EAPI int
efreet_menu_kde_legacy_init(void)
{
FILE *f;
@@ -554,7 +554,7 @@
ecore_string_shutdown();
}
-Efreet_Menu *
+EAPI Efreet_Menu *
efreet_menu_new(void)
{
Efreet_Menu *menu;
@@ -568,7 +568,7 @@
* NULL if none found
* @brief Creates the default menu representation
*/
-Efreet_Menu *
+EAPI Efreet_Menu *
efreet_menu_get(void)
{
char menu[PATH_MAX];
@@ -601,7 +601,7 @@
* failure
* @brief Parses the given .menu file and creates the menu representation
*/
-Efreet_Menu *
+EAPI Efreet_Menu *
efreet_menu_parse(const char *path)
{
Efreet_Xml *xml;
@@ -683,7 +683,7 @@
* @return Returns 1 on success, 0 on failure
* @brief Saves the menu to file
*/
-int
+EAPI int
efreet_menu_save(Efreet_Menu *menu, const char *path)
{
FILE *f;
@@ -802,7 +802,7 @@
* @brief Insert a desktop element in a menu structure. Only accepts desktop
files
* in default directories.
*/
-int
+EAPI int
efreet_menu_desktop_insert(Efreet_Menu *menu, Efreet_Desktop *desktop, int pos)
{
Efreet_Menu *entry;
@@ -842,7 +842,7 @@
* @brief Remove a desktop element in a menu structure. Only accepts desktop
files
* in default directories.
*/
-int
+EAPI int
efreet_menu_desktop_remove(Efreet_Menu *menu, Efreet_Desktop *desktop)
{
Efreet_Menu *entry;
@@ -868,7 +868,7 @@
* @return Returns no value
* @brief Dumps the contents of the menu to the command line
*/
-void
+EAPI void
efreet_menu_dump(Efreet_Menu *menu, const char *indent)
{
printf("%s%s: ", indent, menu->name);
@@ -2503,7 +2503,7 @@
* @return Returns no value
* @brief Frees the given structure
*/
-void
+EAPI void
efreet_menu_free(Efreet_Menu *entry)
{
IF_RELEASE(entry->name);
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- efreet_menu.h 6 Sep 2007 16:15:10 -0000 1.6
+++ efreet_menu.h 4 Nov 2007 09:32:35 -0000 1.7
@@ -49,18 +49,21 @@
Ecore_List *entries; /**< The menu items */
};
-int efreet_menu_kde_legacy_init(void);
+EAPI int efreet_menu_kde_legacy_init(void);
-Efreet_Menu *efreet_menu_new(void);
-Efreet_Menu *efreet_menu_get(void);
-Efreet_Menu *efreet_menu_parse(const char *path);
-int efreet_menu_save(Efreet_Menu *menu, const char *path);
-void efreet_menu_free(Efreet_Menu *menu);
+EAPI Efreet_Menu *efreet_menu_new(void);
+EAPI Efreet_Menu *efreet_menu_get(void);
+EAPI Efreet_Menu *efreet_menu_parse(const char *path);
+EAPI int efreet_menu_save(Efreet_Menu *menu, const char *path);
+EAPI void efreet_menu_free(Efreet_Menu *menu);
-int efreet_menu_desktop_insert(Efreet_Menu *menu, Efreet_Desktop
*desktop, int pos);
-int efreet_menu_desktop_remove(Efreet_Menu *menu, Efreet_Desktop
*desktop);
+EAPI int efreet_menu_desktop_insert(Efreet_Menu *menu,
+ Efreet_Desktop *desktop,
+ int pos);
+EAPI int efreet_menu_desktop_remove(Efreet_Menu *menu,
+ Efreet_Desktop *desktop);
-void efreet_menu_dump(Efreet_Menu *menu, const char *indent);
+EAPI void efreet_menu_dump(Efreet_Menu *menu, const char *indent);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_mime.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- efreet_mime.c 15 Sep 2007 09:51:19 -0000 1.33
+++ efreet_mime.c 4 Nov 2007 09:32:35 -0000 1.34
@@ -97,7 +97,7 @@
* @return Returns 1 on success or 0 on failure
* @brief Initializes the efreet mime settings
*/
-int
+EAPI int
efreet_mime_init(void)
{
if (!ecore_init())
@@ -126,7 +126,7 @@
* @return Returns no value
* @brief Cleans up the efreet mime settings system
*/
-void
+EAPI void
efreet_mime_shutdown(void)
{
IF_FREE_LIST(globs);
@@ -144,7 +144,7 @@
* @return Returns mime type as a string
* @brief Retreive the mime type of a file
*/
-const char *
+EAPI const char *
efreet_mime_type_get(const char *file)
{
const char *type = NULL;
@@ -178,7 +178,7 @@
* @return Returns mime type icon path as a string
* @brief Retreive the mime type icon for a file
*/
-char *
+EAPI char *
efreet_mime_type_icon_get(const char *mime, const char *theme, const char
*size)
{
char *icon = NULL;
@@ -245,7 +245,7 @@
* @return Returns mime type as a string
* @brief Retreive the mime type of a file using magic
*/
-const char *
+EAPI const char *
efreet_mime_magic_type_get(const char *file)
{
return efreet_mime_magic_check_priority(file, 0, 0);
@@ -256,7 +256,7 @@
* @return Returns mime type as a string
* @brief Retreive the mime type of a file using globs
*/
-const char *
+EAPI const char *
efreet_mime_globs_type_get(const char *file)
{
Efreet_Mime_Glob *g;
@@ -310,7 +310,7 @@
* @return Returns mime type as a string
* @brief Retreive the special mime type of a file
*/
-const char *
+EAPI const char *
efreet_mime_special_type_get(const char *file)
{
return efreet_mime_special_check(file);
@@ -322,7 +322,7 @@
* @return Returns mime type as a string
* @brief Retreive the fallback mime type of a file
*/
-const char *
+EAPI const char *
efreet_mime_fallback_type_get(const char *file)
{
return efreet_mime_fallback_check(file);
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_private.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- efreet_private.h 6 Sep 2007 16:15:10 -0000 1.10
+++ efreet_private.h 4 Nov 2007 09:32:35 -0000 1.11
@@ -207,6 +207,8 @@
const char *efreet_desktop_environment_get(void);
+const char *efreet_util_path_to_file_id(const char *path);
+
/**
* @}
*/
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_utils.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- efreet_utils.c 6 Sep 2007 16:15:10 -0000 1.45
+++ efreet_utils.c 4 Nov 2007 09:32:35 -0000 1.46
@@ -48,6 +48,8 @@
int priority;
};
+static char *efreet_util_path_in_default(const char *section, const char
*path);
+
static int efreet_util_cache_fill(void *data);
static void efreet_util_cache_add(const char *path, const char *file_id, int
priority, int event);
static void efreet_util_cache_remove(const char *path, const char *file_id,
int priority);
@@ -90,10 +92,10 @@
static int init = 0;
-int EFREET_EVENT_DESKTOP_LIST_CHANGE = 0;
-int EFREET_EVENT_DESKTOP_CHANGE = 0;
+EAPI int EFREET_EVENT_DESKTOP_LIST_CHANGE = 0;
+EAPI int EFREET_EVENT_DESKTOP_CHANGE = 0;
-int
+EAPI int
efreet_util_init(void)
{
Ecore_List *dirs;
@@ -143,7 +145,7 @@
return init;
}
-int
+EAPI int
efreet_util_shutdown(void)
{
if (--init) return init;
@@ -168,7 +170,7 @@
return init;
}
-char *
+static char *
efreet_util_path_in_default(const char *section, const char *path)
{
Ecore_List *dirs;
@@ -237,7 +239,7 @@
return file_id;
}
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_mime_list(const char *mime)
{
Efreet_Cache_Search_List search;
@@ -252,7 +254,7 @@
return search.list;
}
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_util_desktop_wm_class_find(const char *wmname, const char *wmclass)
{
Efreet_Cache_Search search;
@@ -266,7 +268,7 @@
return NULL;
}
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_util_desktop_file_id_find(const char *file_id)
{
Efreet_Desktop *desktop = NULL;
@@ -325,7 +327,7 @@
return desktop;
}
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_util_desktop_exec_find(const char *exec)
{
Efreet_Cache_Search search;
@@ -339,7 +341,7 @@
return NULL;
}
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_util_desktop_name_find(const char *name)
{
Efreet_Cache_Search search;
@@ -353,7 +355,7 @@
return NULL;
}
-Efreet_Desktop *
+EAPI Efreet_Desktop *
efreet_util_desktop_generic_name_find(const char *generic_name)
{
Efreet_Cache_Search search;
@@ -367,7 +369,7 @@
return NULL;
}
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_name_glob_list(const char *glob)
{
Efreet_Cache_Search_List search;
@@ -381,7 +383,7 @@
return search.list;
}
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_exec_glob_list(const char *glob)
{
Efreet_Cache_Search_List search;
@@ -395,7 +397,7 @@
return search.list;
}
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_generic_name_glob_list(const char *glob)
{
Efreet_Cache_Search_List search;
@@ -409,7 +411,7 @@
return search.list;
}
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_comment_glob_list(const char *glob)
{
Efreet_Cache_Search_List search;
@@ -429,7 +431,7 @@
*
* @return an Ecore_List of category names (const char *)
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_categories_list(void)
{
return ecore_hash_keys(desktops_by_category);
@@ -443,7 +445,7 @@
* @param category the category name
* @return a list of desktops
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_util_desktop_category_list(const char *category)
{
return ecore_hash_get(desktops_by_category, category);
@@ -989,7 +991,7 @@
* Returns a list of .menu files found in the various config dirs.
* @return An ecore list of menu file paths (const char *). This must be freed
with ecore_list_destroy().
*/
-Ecore_List *
+EAPI Ecore_List *
efreet_util_menus_find(void)
{
Ecore_List *menus, *dirs;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_utils.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- efreet_utils.h 27 Jun 2007 10:57:54 -0000 1.23
+++ efreet_utils.h 4 Nov 2007 09:32:35 -0000 1.24
@@ -20,29 +20,28 @@
Efreet_Desktop_Change change;
};
-char *efreet_util_path_in_default(const char *section, const char
*path);
-const char *efreet_util_path_to_file_id(const char *path);
+EAPI int efreet_util_init(void);
+EAPI int efreet_util_shutdown(void);
-Ecore_List *efreet_util_desktop_mime_list(const char *mime);
+EAPI Ecore_List *efreet_util_desktop_mime_list(const char *mime);
-Efreet_Desktop *efreet_util_desktop_wm_class_find(const char *wmname, const
char *wmclass);
-Efreet_Desktop *efreet_util_desktop_file_id_find(const char *file_id);
-Efreet_Desktop *efreet_util_desktop_exec_find(const char *exec);
-Efreet_Desktop *efreet_util_desktop_name_find(const char *name);
-Efreet_Desktop *efreet_util_desktop_generic_name_find(const char
*generic_name);
-
-int efreet_util_init(void);
-int efreet_util_shutdown(void);
-Ecore_List *efreet_util_desktop_name_glob_list(const char *glob);
-Ecore_List *efreet_util_desktop_exec_glob_list(const char *glob);
-Ecore_List *efreet_util_desktop_generic_name_glob_list(const char *glob);
-Ecore_List *efreet_util_desktop_comment_glob_list(const char *glob);
-
-Ecore_List *efreet_util_desktop_categories_list(void);
-Ecore_List *efreet_util_desktop_category_list(const char *category);
-
-Ecore_List *efreet_util_menus_find(void);
-extern int EFREET_EVENT_DESKTOP_LIST_CHANGE;
-extern int EFREET_EVENT_DESKTOP_CHANGE;
+EAPI Efreet_Desktop *efreet_util_desktop_wm_class_find(const char *wmname,
const char *wmclass);
+EAPI Efreet_Desktop *efreet_util_desktop_file_id_find(const char *file_id);
+EAPI Efreet_Desktop *efreet_util_desktop_exec_find(const char *exec);
+EAPI Efreet_Desktop *efreet_util_desktop_name_find(const char *name);
+EAPI Efreet_Desktop *efreet_util_desktop_generic_name_find(const char
*generic_name);
+
+EAPI Ecore_List *efreet_util_desktop_name_glob_list(const char *glob);
+EAPI Ecore_List *efreet_util_desktop_exec_glob_list(const char *glob);
+EAPI Ecore_List *efreet_util_desktop_generic_name_glob_list(const char *glob);
+EAPI Ecore_List *efreet_util_desktop_comment_glob_list(const char *glob);
+
+EAPI Ecore_List *efreet_util_desktop_categories_list(void);
+EAPI Ecore_List *efreet_util_desktop_category_list(const char *category);
+
+EAPI Ecore_List *efreet_util_menus_find(void);
+
+EAPI extern int EFREET_EVENT_DESKTOP_LIST_CHANGE;
+EAPI extern int EFREET_EVENT_DESKTOP_CHANGE;
#endif
-------------------------------------------------------------------------
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
