vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Style 

SVN revision: 17986
This commit is contained in:
sebastid 2005-10-26 20:10:44 +00:00 committed by sebastid
parent 48f2c282ff
commit 0ee490dd03
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/bin/e_apps.c
View File

@ -285,7 +285,7 @@ e_app_empty_new(const char *path)
a = E_OBJECT_ALLOC(E_App, E_APP_TYPE, _e_app_free); a = E_OBJECT_ALLOC(E_App, E_APP_TYPE, _e_app_free);
a->image = NULL; a->image = NULL;
if(path) if (path)
a->path = strdup(path); a->path = strdup(path);
return a; return a;
} }
@ -1007,10 +1007,9 @@ e_app_fields_save(E_App *a)
unsigned char tmp[1]; unsigned char tmp[1];
int img; int img;
if(!a->path) if (!a->path) return;
return;
if(!ecore_file_exists(a->path)) if (!ecore_file_exists(a->path))
{ {
_e_app_new_save(a); _e_app_new_save(a);
img = 0; img = 0;
@ -1024,56 +1023,59 @@ e_app_fields_save(E_App *a)
if ((lang) && (!strcmp(lang, "C"))) if ((lang) && (!strcmp(lang, "C")))
lang = NULL; lang = NULL;
ef = eet_open(a->path, EET_FILE_MODE_READ_WRITE); ef = eet_open(a->path, EET_FILE_MODE_READ_WRITE);
if (!ef) return; if (!ef) return;
if(a->name) if (a->name)
{ {
/*if (lang) snprintf(buf, sizeof(buf), "app/info/name[%s]", lang); /*if (lang) snprintf(buf, sizeof(buf), "app/info/name[%s]", lang);
else */snprintf(buf, sizeof(buf), "app/info/name"); else */
snprintf(buf, sizeof(buf), "app/info/name");
eet_write(ef, buf, a->name, strlen(a->name), 0); eet_write(ef, buf, a->name, strlen(a->name), 0);
} }
if(a->generic) if (a->generic)
{ {
/*if (lang) snprintf(buf, sizeof(buf), "app/info/generic[%s]", lang); /*if (lang) snprintf(buf, sizeof(buf), "app/info/generic[%s]", lang);
else */snprintf(buf, sizeof(buf), "app/info/generic"); else */
snprintf(buf, sizeof(buf), "app/info/generic");
eet_write(ef, buf, a->generic, strlen(a->generic), 0); eet_write(ef, buf, a->generic, strlen(a->generic), 0);
} }
if(a->comment) if (a->comment)
{ {
/*if (lang) snprintf(buf, sizeof(buf), "app/info/comment[%s]", lang); /*if (lang) snprintf(buf, sizeof(buf), "app/info/comment[%s]", lang);
else*/ snprintf(buf, sizeof(buf), "app/info/comment"); else*/
snprintf(buf, sizeof(buf), "app/info/comment");
eet_write(ef, buf, a->comment, strlen(a->comment), 0); eet_write(ef, buf, a->comment, strlen(a->comment), 0);
} }
if(a->exe) if (a->exe)
eet_write(ef, "app/info/exe", a->exe, strlen(a->exe), 0); eet_write(ef, "app/info/exe", a->exe, strlen(a->exe), 0);
if(a->win_name) if (a->win_name)
eet_write(ef, "app/window/name", a->win_name, strlen(a->win_name), 0); eet_write(ef, "app/window/name", a->win_name, strlen(a->win_name), 0);
if(a->win_class) if (a->win_class)
eet_write(ef, "app/window/class", a->win_class, strlen(a->win_class), 0); eet_write(ef, "app/window/class", a->win_class, strlen(a->win_class), 0);
if(a->win_title) if (a->win_title)
eet_write(ef, "app/window/title", a->win_title, strlen(a->win_title), 0); eet_write(ef, "app/window/title", a->win_title, strlen(a->win_title), 0);
if(a->win_role) if (a->win_role)
eet_write(ef, "app/window/role", a->win_role, strlen(a->win_role), 0); eet_write(ef, "app/window/role", a->win_role, strlen(a->win_role), 0);
if(a->icon_class) if (a->icon_class)
eet_write(ef, "app/icon/class", a->icon_class, strlen(a->icon_class), 0); eet_write(ef, "app/icon/class", a->icon_class, strlen(a->icon_class), 0);
if(a->startup_notify) if (a->startup_notify)
tmp[0] = 1; tmp[0] = 1;
else else
tmp[0] = 0; tmp[0] = 0;
eet_write(ef, "app/info/startup_notify", tmp, 1, 0); eet_write(ef, "app/info/startup_notify", tmp, 1, 0);
if(a->wait_exit) if (a->wait_exit)
tmp[0] = 1; tmp[0] = 1;
else else
tmp[0] = 0; tmp[0] = 0;
eet_write(ef, "app/info/wait_exit", tmp, 1, 0); eet_write(ef, "app/info/wait_exit", tmp, 1, 0);
if(a->image && img) if ((a->image) && (img))
{ {
int alpha; int alpha;
Ecore_Evas *buf; Ecore_Evas *buf;
@ -1102,7 +1104,6 @@ e_app_fields_save(E_App *a)
} }
} }
eet_close(ef); eet_close(ef);
} }
@ -1219,15 +1220,15 @@ _e_app_new_save(E_App *a)
char *start, *end, *imgdir; char *start, *end, *imgdir;
int i; int i;
if(!a->path) if (!a->path) return 0;
return 0;
strcpy(tmpn, "/tmp/eapp_edit_cc.edc-tmp-XXXXXX"); strcpy(tmpn, "/tmp/eapp_edit_cc.edc-tmp-XXXXXX");
fd = mkstemp(tmpn); fd = mkstemp(tmpn);
if (fd < 0) { if (fd < 0)
fprintf(stderr, "Unable to create tmp file: %s\n", strerror(errno)); {
return 0; fprintf(stderr, "Unable to create tmp file: %s\n", strerror(errno));
} return 0;
}
close(fd); close(fd);
out = fopen(tmpn, "w"); out = fopen(tmpn, "w");
@ -1239,7 +1240,7 @@ _e_app_new_save(E_App *a)
i = 0; i = 0;
if(a->image) if (a->image)
{ {
start = strchr(a->image, '/'); start = strchr(a->image, '/');
end = strrchr(a->image ,'/'); end = strrchr(a->image ,'/');
@ -1266,7 +1267,7 @@ _e_app_new_save(E_App *a)
if (imgdir) snprintf(ipart, sizeof(ipart), "-id %s", imgdir); if (imgdir) snprintf(ipart, sizeof(ipart), "-id %s", imgdir);
else ipart[0] = '\0'; else ipart[0] = '\0';
if(a->image) if (a->image)
fprintf(out, EAP_EDC_TMPL, a->image, "48", "48", a->image); fprintf(out, EAP_EDC_TMPL, a->image, "48", "48", a->image);
else else
fprintf(out, EAP_EDC_TMPL_EMPTY); fprintf(out, EAP_EDC_TMPL_EMPTY);
@ -1275,11 +1276,12 @@ _e_app_new_save(E_App *a)
snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s", ipart, tmpn, a->path); snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s", ipart, tmpn, a->path);
ret = system(cmd); ret = system(cmd);
if (ret < 0) { if (ret < 0)
fprintf(stderr, "Unable to execute edje_cc on tmp file: %s\n", {
strerror(errno)); fprintf(stderr, "Unable to execute edje_cc on tmp file: %s\n",
return 0; strerror(errno));
} return 0;
}
unlink(tmpn); unlink(tmpn);
return 1; return 1;