Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/bin
Modified Files:
Makefile.am ef_data_dirs.c ef_desktop.c ef_icon_theme.c
ef_ini.c ef_locale.c ef_menu.c ef_mime.c efreet_spec_test.c
main.c
Log Message:
remove trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 1 Jul 2007 05:10:14 -0000 1.4
+++ Makefile.am 6 Sep 2007 16:15:09 -0000 1.5
@@ -1,4 +1,6 @@
+
SUBDIRS = data compare
+
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_data_dirs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ef_data_dirs.c 25 Jul 2007 17:00:56 -0000 1.6
+++ ef_data_dirs.c 6 Sep 2007 16:15:09 -0000 1.7
@@ -236,7 +236,7 @@
char dirs[128], *val;
char *vals[] = {"/var/tmp/a", "/tmp/b", "/usr/local/share", "/etc", NULL};
char *def_vals[] = {"/etc/xdg", NULL};
-
+
dirs[0] = '\0';
for (i = 0; vals[i] != NULL; i++)
@@ -300,4 +300,3 @@
}
return ret;
}
-
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_desktop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ef_desktop.c 26 Jul 2007 10:20:24 -0000 1.7
+++ ef_desktop.c 6 Sep 2007 16:15:09 -0000 1.8
@@ -17,7 +17,7 @@
int ret = 1;
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
- if (!desktop)
+ if (!desktop)
{
printf("No desktop found.\n");
return 0;
@@ -29,7 +29,7 @@
ret = 0;
}
- if (!desktop->generic_name ||
+ if (!desktop->generic_name ||
strcmp(desktop->generic_name, "Test Application"))
{
printf("Incorrent GenericName\n");
@@ -51,7 +51,7 @@
ecore_list_first_goto(desktop->categories);
while ((cat = ecore_list_next(desktop->categories)))
{
- if (i >= num_categories)
+ if (i >= num_categories)
{
printf("Too many categories found.\n");
ret = 0;
@@ -318,7 +318,7 @@
ret = info->error > 0 ? 0 : 1;
free(info);
-
+
chdir(olddir);
return ret;
@@ -367,10 +367,10 @@
/* add my custom desktop type to efreet */
my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
- (Efreet_Desktop_Type_Free_Cb)free);
+ (Efreet_Desktop_Type_Free_Cb)free);
desktop =
efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop");
- if (!desktop)
+ if (!desktop)
{
printf("No desktop found.\n");
return 0;
@@ -388,10 +388,7 @@
printf("Invalid value of custom key (%s).\n", val);
ret = 0;
}
-
+
efreet_desktop_free(desktop);
return ret;
}
-
-
-
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_icon_theme.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ef_icon_theme.c 26 Jul 2007 11:30:10 -0000 1.6
+++ ef_icon_theme.c 6 Sep 2007 16:15:09 -0000 1.7
@@ -12,9 +12,9 @@
#define SIZE "128x128"
#define THEME "Tango"
-static void ef_icon_theme_themes_find(const char *search_dir,
+static void ef_icon_theme_themes_find(const char *search_dir,
Ecore_Hash *themes);
-static void ef_icons_find(Efreet_Icon_Theme *theme, Ecore_List *themes,
+static void ef_icons_find(Efreet_Icon_Theme *theme, Ecore_List *themes,
Ecore_Hash *icons);
static void ef_read_dir(const char *dir, Ecore_Hash *icons);
@@ -70,13 +70,13 @@
ecore_list_first_goto(icon_dirs);
ef_icon_theme_themes_find(efreet_icon_user_dir_get(), dirs);
- while ((dir = ecore_list_next(icon_dirs)))
+ while ((dir = ecore_list_next(icon_dirs)))
{
snprintf(buf, sizeof(buf), "%s/icons", dir);
ef_icon_theme_themes_find(buf, dirs);
}
ef_icon_theme_themes_find("/usr/share/pixmaps", dirs);
-
+
themes = efreet_icon_theme_list_get();
ecore_list_first_goto(themes);
while ((theme = ecore_list_next(themes)))
@@ -159,7 +159,7 @@
ecore_list_destroy(dirs);
}
-const char *icons[] =
+const char *icons[] =
{
"address-book-new",
"application-exit",
@@ -169,7 +169,7 @@
"dialog-cancel",
"dialog-close",
"dialog-ok",
- "document-new",
+ "document-new",
"document-open",
"document-open-recent",
"document-page-setup",
@@ -445,7 +445,7 @@
ecore_hash_free_key_cb_set(icon_hash, free);
ecore_hash_free_value_cb_set(icon_hash, free);
- ef_icons_find(theme, themes, icon_hash);
+ ef_icons_find(theme, themes, icon_hash);
ecore_list_destroy(themes);
for (i = 0; icons[i] != NULL; i++)
@@ -580,7 +580,7 @@
char *p;
p = strrchr(file, '.');
- if (!p)
+ if (!p)
{
FREE(file);
continue;
@@ -599,4 +599,3 @@
}
ecore_list_destroy(files);
}
-
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_ini.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ef_ini.c 3 Feb 2007 13:05:30 -0000 1.1
+++ ef_ini.c 6 Sep 2007 16:15:09 -0000 1.2
@@ -13,7 +13,7 @@
putenv("LC_ALL=en_US");
ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test.ini");
- if (!ini)
+ if (!ini)
{
printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
return 0;
@@ -26,14 +26,14 @@
unsigned int bval;
val = efreet_ini_string_get(ini, "Name");
- if (!val || strcmp(val, "Foo Bar"))
+ if (!val || strcmp(val, "Foo Bar"))
{
printf("efreet_ini_string_get() Name parsed incorrectly\n");
ret = 0;
}
val = efreet_ini_localestring_get(ini, "Name");
- if (!val || strcmp(val, "English Foo Bar"))
+ if (!val || strcmp(val, "English Foo Bar"))
{
printf("efreet_ini_localestring_get() Name parsed incorrectly\n");
ret = 0;
@@ -88,7 +88,7 @@
ret = 0;
}
}
- else
+ else
{
printf("efreet_ini_section_set() Failed to set 'contact' section\n");
ret = 0;
@@ -105,7 +105,7 @@
Efreet_Ini *ini;
int ret = 1;
- struct
+ struct
{
char *key;
int len;
@@ -113,7 +113,7 @@
{"key", 5099},
{"key2", 5099},
{NULL, 0}
- };
+ };
ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/long.ini");
if (!ini)
@@ -121,7 +121,7 @@
printf("Ini failed to parse.\n");
ret = 0;
}
-
+
if (ret) ret = efreet_ini_section_set(ini, "section");
if (ret)
{
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_locale.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ef_locale.c 3 Feb 2007 13:05:30 -0000 1.1
+++ ef_locale.c 6 Sep 2007 16:15:09 -0000 1.2
@@ -12,7 +12,7 @@
char *country;
char *modifier;
} langs[] = {
- /* these are ordered such that when we move from LANG to LC_MESSAGES
+ /* these are ordered such that when we move from LANG to LC_MESSAGES
* the LANG env will still be effect. Same with moving from
* LC_MESSAGES to LANG */
{"LANG=", NULL, NULL, NULL},
@@ -51,7 +51,7 @@
if ((langs[i].lang && (!tmp || strcmp(tmp, langs[i].lang)))
|| (!langs[i].lang && tmp))
{
- printf("efreet_lang_get() is wrong (%s) with %s\n",
+ printf("efreet_lang_get() is wrong (%s) with %s\n",
tmp, langs[i].lang);
ret = 0;
}
@@ -60,13 +60,13 @@
if ((langs[i].country && (!tmp || strcmp(tmp, langs[i].country)))
|| (!langs[i].country && tmp))
{
- printf("efreet_lang_country_get() is wrong (%s) with %s\n",
+ printf("efreet_lang_country_get() is wrong (%s) with %s\n",
tmp, langs[i].lang);
ret = 0;
}
tmp = efreet_lang_modifier_get();
- if ((langs[i].modifier && (!tmp || strcmp(tmp, langs[i].modifier)))
+ if ((langs[i].modifier && (!tmp || strcmp(tmp, langs[i].modifier)))
|| (!langs[i].modifier && tmp))
{
printf("efreet_lang_modifier_get() is wrong with %s with %s\n",
@@ -77,7 +77,6 @@
efreet_shutdown();
efreet_init();
}
-
+
return ret;
}
-
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_menu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ef_menu.c 25 Jul 2007 17:00:56 -0000 1.7
+++ ef_menu.c 6 Sep 2007 16:15:09 -0000 1.8
@@ -98,7 +98,7 @@
#endif
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
- if (!desktop)
+ if (!desktop)
{
efreet_menu_free(menu);
printf("No desktop found.\n");
@@ -150,4 +150,3 @@
efreet_menu_free(menu);
return 1;
}
-
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_mime.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ef_mime.c 3 Jul 2007 15:07:00 -0000 1.5
+++ ef_mime.c 6 Sep 2007 16:15:09 -0000 1.6
@@ -11,7 +11,7 @@
{
const char *mime = NULL;
int misses = 0, i = 0;
- struct
+ struct
{
char *file;
char *mime;
@@ -22,8 +22,8 @@
{PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"},
{NULL, NULL}
};
-
-
+
+
if (!efreet_mime_init())
{
printf("Could not init efreet\n");
@@ -31,10 +31,10 @@
}
for (i = 0; files[i].file != NULL; ++i)
- {
+ {
mime = efreet_mime_type_get(files[i].file);
if (!mime)
- {
+ {
printf("Got %s as null instead of %s\n", files[i].file,
files[i].mime);
misses ++;
}
@@ -44,8 +44,8 @@
misses ++;
}
}
-
+
efreet_mime_shutdown();
-
+
return !misses;
}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/efreet_spec_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- efreet_spec_test.c 25 Jul 2007 17:00:56 -0000 1.2
+++ efreet_spec_test.c 6 Sep 2007 16:15:09 -0000 1.3
@@ -43,7 +43,7 @@
if (entry->type == EFREET_MENU_ENTRY_DESKTOP)
{
if (!path || !*path) path = "/";
- printf("%s\t%s\t%s\n", path, entry->id,
+ printf("%s\t%s\t%s\n", path, entry->id,
entry->desktop->orig_path);
}
else if (entry->type == EFREET_MENU_ENTRY_MENU)
@@ -55,4 +55,3 @@
}
}
}
-
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c 25 Jul 2007 17:00:56 -0000 1.9
+++ main.c 6 Sep 2007 16:15:09 -0000 1.10
@@ -135,9 +135,9 @@
double start;
/* we've been given specific tests and it isn't in the list */
- if (run && !ecore_list_find(run, ECORE_COMPARE_CB(strcasecmp),
+ if (run && !ecore_list_find(run, ECORE_COMPARE_CB(strcasecmp),
tests[i].name))
- continue;
+ continue;
if (!efreet_init())
{
@@ -147,11 +147,11 @@
num_tests ++;
- printf("%s:\t\t", tests[i].name);
+ printf("%s:\t\t", tests[i].name);
fflush(stdout);
start = ecore_time_get();
ret = tests[i].cb();
- printf("%s in %.3f seconds\n", (ret ? "PASSED" : "FAILED"),
+ printf("%s in %.3f seconds\n", (ret ? "PASSED" : "FAILED"),
ecore_time_get() - start);
passed += ret;
@@ -168,4 +168,3 @@
printf("Total run: %.3f seconds\n", ecore_time_get() - total);
return 0;
}
-
-------------------------------------------------------------------------
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