Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17setroot
Modified Files:
e17setroot.c
Log Message:
small tidy, and stop cleaning up files you then delete :)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17setroot/e17setroot.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e17setroot.c 24 Jan 2005 13:02:17 -0000 1.5
+++ e17setroot.c 24 Jan 2005 14:24:10 -0000 1.6
@@ -170,7 +170,7 @@
file = _e_bg_bg_file_getfile(filename);
dir = _e_bg_bg_file_getdir(filename);
- edc = strdup(PACKAGE_DATA_DIR "/data/e17setroot/e17setroot_template.edc ");
+ edc = strdup(PACKAGE_DATA_DIR "/data/e17setroot/e17setroot_template.edc");
edj = strdup("edje_cc -id ");
filenoext = _e_bg_bg_file_stripext(filename);
@@ -186,7 +186,7 @@
/* change edc to the one stored in /tmp */
free(edc);
- edc = strdup("/tmp/e17setroot_template.edc ");
+ edc = strdup("/tmp/e17setroot_template.edc");
/* Set up eet path */
eet = malloc(strlen(getenv("HOME")) + strlen("/.e/e/backgrounds/")
@@ -204,8 +204,9 @@
strcat(edje, edc);
/* Set up edje_cc command + eet path */
- cmd = malloc(strlen(edje) + strlen(eet) + 1);
+ cmd = malloc(strlen(edje) + strlen(eet) + 2);
strcpy(cmd, edje);
+ strcat(cmd, " ");
strcat(cmd, eet);
/* Determine image width / height */
@@ -236,21 +237,6 @@
e_background_set(eet);
- sed = malloc(100 + strlen(filename) + strlen(edc));
- sprintf(sed, "sed -i -e 's,%s,FILENAME,' %s",filename,edc);
- system(sed);
- free(sed);
-
- sed = malloc(100 + 1 + strlen(edc));
- sprintf(sed, "sed -i -e 's/%d/WIDTH/' %s",w,edc);
- system(sed);
- free(sed);
-
- sed = malloc(100 + 1 + strlen(edc));
- sprintf(sed, "sed -i -e 's/%d/HEIGHT/' %s",h,edc);
- system(sed);
- free(sed);
-
/* If we're using pseudo-trans for eterm, then this will help */
esetroot = malloc(strlen("Esetroot ") + strlen(filename) + 1);
strcpy(esetroot, "Esetroot ");
@@ -259,7 +245,7 @@
free(esetroot);
/* unlink the temp edc */
- unlink("/tmp/e17setroot_template.edc");
+ unlink(edc);
}
int main(int argc, char **argv)
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
