Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_fwin.c e_utils.c
Log Message:
patches for imlib2 and e.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- e_fm.c 29 May 2007 11:25:53 -0000 1.173
+++ e_fm.c 30 May 2007 14:35:26 -0000 1.174
@@ -2797,6 +2797,10 @@
/* FIXME: end go away chunk */
}
+ if(S_ISDIR(ic->info.statinfo.st_mode))
+ {
+ ic->info.mime = evas_stringshare_add("x-directory/normal");
+ }
if (!ic->info.mime)
{
mime = e_fm_mime_filename_get(ic->info.file);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_fwin.c 26 May 2007 17:16:21 -0000 1.47
+++ e_fwin.c 30 May 2007 14:35:26 -0000 1.48
@@ -726,8 +726,7 @@
_e_fwin_file_is_exec(E_Fm2_Icon_Info *ici)
{
/* special file or dir - can't exec anyway */
- if ((S_ISDIR(ici->statinfo.st_mode)) ||
- (S_ISCHR(ici->statinfo.st_mode)) ||
+ if ((S_ISCHR(ici->statinfo.st_mode)) ||
(S_ISBLK(ici->statinfo.st_mode)) ||
(S_ISFIFO(ici->statinfo.st_mode)) ||
(S_ISSOCK(ici->statinfo.st_mode)))
@@ -936,22 +935,16 @@
{
if (ici->link)
{
- if (!S_ISDIR(ici->statinfo.st_mode))
- {
- f = e_fm_mime_filename_get(ici->link);
- mimes = evas_hash_del(mimes, f, (void *)1);
- mimes = evas_hash_direct_add(mimes, f, (void *)1);
- }
+ f = e_fm_mime_filename_get(ici->link);
+ mimes = evas_hash_del(mimes, f, (void *)1);
+ mimes = evas_hash_direct_add(mimes, f, (void *)1);
}
else
{
- snprintf(buf, sizeof(buf), "%s/%s",
- e_fm2_real_path_get(fwin->fm_obj), ici->file);
- if (!S_ISDIR(ici->statinfo.st_mode))
- {
- mimes = evas_hash_del(mimes, ici->mime, (void *)1);
- mimes = evas_hash_direct_add(mimes, ici->mime,
(void *)1);
- }
+ snprintf(buf, sizeof(buf), "%s/%s",
+ e_fm2_real_path_get(fwin->fm_obj), ici->file);
+ mimes = evas_hash_del(mimes, ici->mime, (void *)1);
+ mimes = evas_hash_direct_add(mimes, ici->mime, (void *)1);
}
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_utils.c 22 May 2007 18:54:58 -0000 1.71
+++ e_utils.c 30 May 2007 14:35:26 -0000 1.72
@@ -888,11 +888,14 @@
EAPI int
e_util_dir_check(const char *dir)
{
+ char msg[PATH_MAX];
+
if (!ecore_file_exists(dir))
{
- if (!ecore_file_mkdir(dir))
+ if (!ecore_file_mkpath(dir))
{
- e_util_dialog_show("Error creating the directory: %s. Check that
you have correct permissions set.", dir);
+ snprintf (msg, sizeof (msg), "Failed to create directory: %s
.<br>Check that you have correct permissions set.", dir);
+ e_util_dialog_show("Error creating directory", msg);
return 0;
}
}
@@ -900,7 +903,8 @@
{
if (!ecore_file_is_dir(dir))
{
- e_util_dialog_show("Error creating the directory: %s. A file of
that name already exists.", dir);
+ snprintf (msg, sizeof (msg), "Failed to create directory: %s
.<br>A file of that name already exists.", dir);
+ e_util_dialog_show("Error creating directory", msg);
return 0;
}
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
