Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/bin
Modified Files:
ef_desktop.c ef_ini.c ef_menu.c ef_mime.c
Log Message:
- fix the package paths used in the test files. this makes 19/19 tests pass.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_desktop.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ef_desktop.c 7 May 2008 02:16:50 -0000 1.11
+++ ef_desktop.c 7 May 2008 03:04:12 -0000 1.12
@@ -16,7 +16,7 @@
Efreet_Desktop *desktop;
int ret = 1;
- desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
+ desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
if (!desktop)
{
printf("No desktop found.\n");
@@ -80,7 +80,7 @@
Efreet_Desktop *desktop;
int ret = 1;
- desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
+ desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
if (desktop)
{
const char *id;
@@ -92,10 +92,10 @@
char *prefix;
char *expected;
} tests[] = {
- {PACKAGE_DATA_DIR"/efreet/test/", 0, NULL, "test.desktop"},
- {PACKAGE_DATA_DIR"/efreet/", 0, NULL, "test-test.desktop"},
- {PACKAGE_DATA_DIR"/efreet/", 1, NULL, "test.desktop"},
- {PACKAGE_DATA_DIR"/efreet/", 1, "prefix", "prefix-test.desktop"},
+ {PACKAGE_DATA_DIR"/test/", 0, NULL, "test.desktop"},
+ {PACKAGE_DATA_DIR"/", 0, NULL, "test-test.desktop"},
+ {PACKAGE_DATA_DIR"/", 1, NULL, "test.desktop"},
+ {PACKAGE_DATA_DIR"/", 1, "prefix", "prefix-test.desktop"},
{NULL, 0, NULL, NULL}
};
@@ -126,7 +126,7 @@
Efreet_Desktop *desktop;
printf("\n");
- desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
+ desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
if (!desktop)
{
printf("Failed to get Desktop file\n");
@@ -371,7 +371,7 @@
my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
(Efreet_Desktop_Type_Free_Cb)free);
- desktop =
efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop");
+ desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test_type.desktop");
if (!desktop)
{
printf("No desktop found.\n");
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_ini.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ef_ini.c 4 Nov 2007 09:32:35 -0000 1.3
+++ ef_ini.c 7 May 2008 03:04:12 -0000 1.4
@@ -12,7 +12,7 @@
putenv("LC_ALL=en_US");
- ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test.ini");
+ ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/test.ini");
if (!ini)
{
printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
@@ -115,7 +115,7 @@
{NULL, 0}
};
- ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/long.ini");
+ ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/long.ini");
if (!ini)
{
printf("Ini failed to parse.\n");
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_menu.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ef_menu.c 4 Nov 2007 09:32:35 -0000 1.9
+++ ef_menu.c 7 May 2008 03:04:12 -0000 1.10
@@ -33,7 +33,7 @@
Efreet_Menu *menu;
menu = efreet_menu_get();
-// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
+// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
if (!menu)
{
printf("efreet_menu_get() returned NULL\n");
@@ -51,7 +51,7 @@
{
Efreet_Menu *menu;
- menu =
efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_slash_bad.menu");
+ menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test_menu_slash_bad.menu");
if (menu)
{
printf("efreet_menu_get() didn't return NULL\n");
@@ -68,7 +68,7 @@
int ret;
// menu = efreet_menu_get();
- menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
+ menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
if (!menu)
{
printf("efreet_menu_get() returned NULL\n");
@@ -87,7 +87,7 @@
Efreet_Desktop *desktop;
// menu = efreet_menu_get();
- menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
+ menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
if (!menu)
{
printf("efreet_menu_get() returned NULL\n");
@@ -99,7 +99,7 @@
printf("\n");
#endif
- desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
+ desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
if (!desktop)
{
efreet_menu_free(menu);
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_mime.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ef_mime.c 4 Nov 2007 09:32:35 -0000 1.7
+++ ef_mime.c 7 May 2008 03:04:12 -0000 1.8
@@ -17,10 +17,10 @@
char *file;
char *mime;
} files[] = {
- {PACKAGE_DATA_DIR"/efreet/test/test_type.desktop",
"application/x-desktop"},
- {PACKAGE_DATA_DIR"/efreet/test/entry.png", "image/png"},
- {PACKAGE_DATA_DIR"/efreet/test/entry", "image/png"},
- {PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"},
+ {PACKAGE_DATA_DIR"/test/test_type.desktop", "application/x-desktop"},
+ {PACKAGE_DATA_DIR"/test/entry.png", "image/png"},
+ {PACKAGE_DATA_DIR"/test/entry", "image/png"},
+ {PACKAGE_DATA_DIR"/test/sub", "inode/directory"},
{NULL, NULL}
};
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
