Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/bin
Modified Files:
Makefile.am ef_desktop.c ef_icon_theme.c ef_ini.c ef_locale.c
ef_menu.c ef_mime.c ef_utils.c main.c
Log Message:
EAPI
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 6 Sep 2007 16:15:09 -0000 1.5
+++ Makefile.am 4 Nov 2007 09:32:35 -0000 1.6
@@ -17,13 +17,16 @@
ef_data_dirs.c \
ef_icon_theme.c \
ef_ini.c \
-ef_locale.c \
ef_desktop.c \
ef_menu.c \
-ef_utils.c \
ef_mime.c \
main.c
+if DEFAULT_VISIBILITY
+efreet_test_SOURCES += \
+ef_utils.c \
+ef_locale.c
+endif
efreet_spec_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_desktop.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ef_desktop.c 6 Sep 2007 16:15:09 -0000 1.8
+++ ef_desktop.c 4 Nov 2007 09:32:35 -0000 1.9
@@ -5,7 +5,9 @@
#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
-#include "../lib/efreet_private.h"
+
+#define IF_FREE(x) do { if (x) free(x); x = NULL; } while (0);
+#define NEW(x, c) calloc(c, sizeof(x))
static void _cb_command(void *data, Efreet_Desktop *desktop, char *exec, int
remaining);
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_icon_theme.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ef_icon_theme.c 6 Sep 2007 16:15:09 -0000 1.7
+++ ef_icon_theme.c 4 Nov 2007 09:32:35 -0000 1.8
@@ -1,5 +1,4 @@
#include "Efreet.h"
-#include "efreet_private.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -11,6 +10,7 @@
#define SIZE "128x128"
#define THEME "Tango"
+#define FREE(x) do { free(x); x = NULL; } while (0);
static void ef_icon_theme_themes_find(const char *search_dir,
Ecore_Hash *themes);
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_ini.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ef_ini.c 6 Sep 2007 16:15:09 -0000 1.2
+++ ef_ini.c 4 Nov 2007 09:32:35 -0000 1.3
@@ -1,8 +1,8 @@
#include "Efreet.h"
-#include "efreet_private.h"
#include "config.h"
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
int
ef_cb_ini_parse(void)
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_locale.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ef_locale.c 6 Sep 2007 16:15:09 -0000 1.2
+++ ef_locale.c 4 Nov 2007 09:32:35 -0000 1.3
@@ -1,5 +1,8 @@
-#include <Efreet.h>
+#include "Efreet.h"
#include "efreet_private.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
int
ef_cb_locale(void)
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_menu.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ef_menu.c 6 Sep 2007 16:15:09 -0000 1.8
+++ ef_menu.c 4 Nov 2007 09:32:35 -0000 1.9
@@ -1,11 +1,13 @@
/* vim: set sw=4 ts=4 sts=4 et: */
#include "Efreet.h"
-#include "efreet_private.h"
+#include "config.h"
+#include <stdio.h>
+#include <unistd.h>
+#if 0
static void
ef_menu_desktop_exec(Efreet_Menu *menu)
{
-#if 0
if (menu->entries)
{
Efreet_Desktop *desktop;
@@ -22,8 +24,8 @@
while ((sub_menu = ecore_list_next(menu->sub_menus)))
ef_menu_desktop_exec(sub_menu);
}
-#endif
}
+#endif
int
ef_cb_menu_get(void)
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_mime.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ef_mime.c 6 Sep 2007 16:15:09 -0000 1.6
+++ ef_mime.c 4 Nov 2007 09:32:35 -0000 1.7
@@ -1,8 +1,9 @@
/* vim: set sw=4 ts=4 sts=4 et: */
#include "Efreet.h"
#include "Efreet_Mime.h"
-#include "efreet_private.h"
+#include "config.h"
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/time.h>
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ef_utils.c 3 Jun 2007 19:53:08 -0000 1.6
+++ ef_utils.c 4 Nov 2007 09:32:35 -0000 1.7
@@ -1,23 +1,16 @@
/* vim: set sw=4 ts=4 sts=4 et: */
#include "Efreet.h"
#include "efreet_private.h"
+#include <stdio.h>
int
ef_cb_utils(void)
{
Efreet_Desktop *desktop;
- char *tmp1;
const char *tmp2;
if (!efreet_util_init()) return 0;
printf("\n");
- tmp1 = efreet_util_path_in_default("applications",
- "/usr/share/applications/test.desktop");
- if (tmp1)
- {
- printf("%s\n", tmp1);
- free(tmp1);
- }
tmp2 =
efreet_util_path_to_file_id("/usr/share/applications/this/tmp/test.desktop");
if (tmp2) printf("%s\n", tmp2);
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- main.c 6 Sep 2007 16:15:09 -0000 1.10
+++ main.c 4 Nov 2007 09:32:35 -0000 1.11
@@ -15,7 +15,10 @@
int ef_cb_efreet_icon_theme_list(void);
int ef_cb_efreet_icon_match(void);
int ef_cb_ini_parse(void);
+int ef_cb_ini_long_line(void);
+#if DEFAULT_VISIBILITY
int ef_cb_locale(void);
+#endif
int ef_cb_desktop_parse(void);
int ef_cb_desktop_save(void);
int ef_cb_desktop_command_get(void);
@@ -29,8 +32,9 @@
#if 0
int ef_cb_menu_edit(void);
#endif
-int ef_cb_ini_long_line(void);
+#ifndef HIDDEN_VISIBILITY
int ef_cb_utils(void);
+#endif
int ef_mime_cb_get(void);
typedef struct Efreet_Test Efreet_Test;
@@ -51,7 +55,9 @@
{"Icon Matching", ef_cb_efreet_icon_match},
{"INI Parsing", ef_cb_ini_parse},
{"INI Long Line Parsing", ef_cb_ini_long_line},
+#if DEFAULT_VISIBILITY
{"Locale Parsing", ef_cb_locale},
+#endif
{"Desktop Parsing", ef_cb_desktop_parse},
{"Desktop Type Parsing", ef_cb_desktop_type_parse},
{"Desktop Save", ef_cb_desktop_save},
@@ -65,7 +71,9 @@
#if 0
{"Menu Edit", ef_cb_menu_edit},
#endif
+#if DEFAULT_VISIBILITY
{"Utils", ef_cb_utils},
+#endif
{"Mime", ef_mime_cb_get},
{NULL, NULL}
};
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
