Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
and survive other fields being null.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- e_fm.c 17 Jun 2007 03:56:11 -0000 1.181
+++ e_fm.c 17 Jun 2007 04:00:04 -0000 1.182
@@ -2078,24 +2078,34 @@
f = fopen(buf, "w");
if (f)
{
+ char label[1024];
+
+ if ((s->vendor) && (s->model))
+ snprintf(label, sizeof(label), "%s %s", s->vendor, s->model);
+ else if (s->model)
+ snprintf(label, sizeof(label), "%s", s->model);
+ else if (s->vendor)
+ snprintf(label, sizeof(label), "%s", s->vendor);
+ else
+ snprintf(label, sizeof(label), _("Unknown Data"));
fprintf(f,
"[Desktop Entry]\n"
"Encoding=UTF-8\n"
"Type=Link\n"
"X-Enlightenment-Type=Removable\n"
"X-Enlightenment-Removable-State=Empty\n"
- "Name=%s %s\n"
+ "Name=%s\n"
"Icon=%s\n"
"Comment=%s\n"
"URL=file:/%s\n"
,
- s->vendor, s->model,
+ label,
"fileman/hd", /* FIXME different based on state and storage */
_("Removable Device"),
s->udi);
fclose(f);
snprintf(buf2, sizeof(buf2), "%s/Desktop/|%s.desktop",
- e_user_homedir_get(), s->serial);
+ e_user_homedir_get(), id);
// ecore_file_unlink(buf2);
ecore_file_symlink(buf, buf2);
/* FIXME: manipulate icon directly */
@@ -2141,8 +2151,14 @@
snprintf(label, sizeof(label), "%s", v->label);
else if (v->partition_label)
snprintf(label, sizeof(label), "%s", v->partition_label);
- else
+ else if ((v->storage->vendor) && (v->storage->model))
snprintf(label, sizeof(label), "%s %s", v->storage->vendor,
v->storage->model);
+ else if (v->storage->model)
+ snprintf(label, sizeof(label), "%s", v->storage->model);
+ else if (v->storage->vendor)
+ snprintf(label, sizeof(label), "%s", v->storage->vendor);
+ else
+ snprintf(label, sizeof(label), _("Unknown Data"));
fprintf(f,
"[Desktop Entry]\n"
"Encoding=UTF-8\n"
@@ -2160,7 +2176,7 @@
v->udi);
fclose(f);
snprintf(buf2, sizeof(buf2), "%s/Desktop/|%s.desktop",
- e_user_homedir_get(), v->storage->serial);
+ e_user_homedir_get(), id);
// ecore_file_unlink(buf2);
ecore_file_symlink(buf, buf2);
/* FIXME: manipulate icon directly */
-------------------------------------------------------------------------
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
