Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_eap_editor.c e_int_border_menu.c
Log Message:
Save new apps as .desktops, and also save new images.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- e_apps.c 3 Sep 2006 11:32:13 -0000 1.166
+++ e_apps.c 3 Sep 2006 12:43:08 -0000 1.167
@@ -322,7 +322,7 @@
{
char buf[4096];
- snprintf(buf, sizeof(buf), "%s/_new_app_%1.1f.eap",
+ snprintf(buf, sizeof(buf), "%s/_new_app_%1.1f.desktop",
_e_apps_all->path, ecore_time_get());
a->path = evas_stringshare_add(buf);
}
@@ -1261,9 +1261,16 @@
e_app_fields_save(E_App *a)
{
char buf[PATH_MAX];
- const char *lang, *ext;
+ const char *lang, *ext = NULL;
- /* FIXME: if there is no path, put it in applications/all/a->name.desktop.
*/
+ /* Check if it's a new one that has not been saved yet. */
+ if (a->path)
+ ext = ecore_file_get_file(a->path);
+ if ( (!a->path) || ((strncmp(ext, "_new_app_", 9) == 0) &&
(!ecore_file_exists(a->path))) )
+ {
+ snprintf(buf, sizeof(buf), "%s/%s.desktop", _e_apps_all->path,
a->name);
+ a->path = evas_stringshare_add(buf);
+ }
ext = strrchr(a->path, '.');
if ((ext) && (strcmp(ext, ".desktop") == 0))
@@ -1275,6 +1282,7 @@
if (!desktop)
{
desktop = E_NEW(Ecore_Desktop, 1);
+ desktop->original_path = strdup(a->path);
created = 1;
}
if (desktop)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_eap_editor.c 3 Sep 2006 11:55:16 -0000 1.48
+++ e_eap_editor.c 3 Sep 2006 12:43:08 -0000 1.49
@@ -254,6 +254,7 @@
if (data->wtitle) eap->win_title = evas_stringshare_add(data->wtitle);
if (data->wrole) eap->win_role = evas_stringshare_add(data->wrole);
if (data->iclass) eap->icon_class = evas_stringshare_add(data->iclass);
+ if (data->eap.icon_path) eap->icon_path =
evas_stringshare_add(data->eap.icon_path);
if (data->image)
{
@@ -528,16 +529,16 @@
cfdata->editor->img_set = 1;
if (cfdata->editor->img) evas_object_del(cfdata->editor->img);
- if (cfdata->eap.path)
- free((char *) cfdata->eap.path);
+// if (cfdata->eap.path)
+// free((char *) cfdata->eap.path);
if (cfdata->eap.icon_class)
free((char *) cfdata->eap.icon_class);
if (cfdata->eap.icon_path)
free((char *) cfdata->eap.icon_path);
cfdata->eap.icon_path = strdup(cfdata->image);
- cfdata->eap.path = strdup("");
- cfdata->eap.icon_class = strdup("");
+// cfdata->eap.path = strdup("");
+ cfdata->eap.icon_class = NULL;
cfdata->editor->img = e_app_icon_add(cfdata->editor->evas,
&(cfdata->eap));
#if 0
cfdata->editor->img = e_icon_add(cfdata->editor->evas);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_int_border_menu.c 1 Sep 2006 10:43:20 -0000 1.41
+++ e_int_border_menu.c 3 Sep 2006 12:43:08 -0000 1.42
@@ -556,7 +556,7 @@
{
if (bname)
{
- snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.eap",
getenv("HOME"), bname);
+ snprintf(path, sizeof(path),
"%s/.e/e/applications/all/%s.desktop", getenv("HOME"), bname);
a = e_app_empty_new(path);
}
else
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
