Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_fwin.c
Log Message:
use direct desktop load fn
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- e_fm.c 17 Jun 2007 07:38:48 -0000 1.184
+++ e_fm.c 17 Jun 2007 08:29:28 -0000 1.185
@@ -1081,7 +1081,7 @@
Efreet_Desktop *ef;
snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath,
ic->info.file);
- ef = efreet_desktop_get(buf);
+ ef = efreet_desktop_new(buf);
if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
if (type_ret) *type_ret = "DESKTOP";
// FIXME: there is no way to just unref an efreet
desktop - free completely
@@ -1159,7 +1159,7 @@
oic = NULL;
snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath,
ic->info.file);
- ef = efreet_desktop_get(buf);
+ ef = efreet_desktop_new(buf);
if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
if (type_ret) *type_ret = "DESKTOP";
// FIXME: there is no way to just unref an efreet desktop - free completely
@@ -1233,7 +1233,7 @@
Efreet_Desktop *ef;
oic = NULL;
- ef = efreet_desktop_get(buf);
+ ef = efreet_desktop_new(buf);
if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
if (type_ret) *type_ret = "DESKTOP";
// FIXME: there is no way to just unref an efreet desktop - free completely
@@ -2127,7 +2127,7 @@
/* FIXME: manipulate icon directly */
_e_fm2_file_force_update(buf);
_e_fm2_file_force_update(buf2);
- efreet_desktop_cache_flush();
+// efreet_desktop_cache_flush();
}
}
@@ -2198,7 +2198,7 @@
/* FIXME: manipulate icon directly */
_e_fm2_file_force_update(buf);
_e_fm2_file_force_update(buf2);
- efreet_desktop_cache_flush();
+// efreet_desktop_cache_flush();
}
}
@@ -4011,8 +4011,8 @@
snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file);
- desktop = efreet_desktop_get(buf);
- printf("efreet_desktop_get(%s) = %p\n", buf, desktop);
+ desktop = efreet_desktop_new(buf);
+ printf("efreet_desktop_new(%s) = %p\n", buf, desktop);
if (!desktop) goto error;
// if (desktop->type != EFREET_DESKTOP_TYPE_LINK) goto error;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- e_fwin.c 16 Jun 2007 16:18:45 -0000 1.52
+++ e_fwin.c 17 Jun 2007 08:29:28 -0000 1.53
@@ -420,7 +420,7 @@
* or overlay
*/
snprintf(buf, sizeof(buf), "%s/.directory.desktop",
e_fm2_real_path_get(fwin->fm_obj));
- ef = efreet_desktop_get(buf);
+ ef = efreet_desktop_new(buf);
if (ef)
{
fwin->wallpaper_file = _e_fwin_custom_file_path_eval(fwin, ef,
fwin->wallpaper_file, "X-Enlightenment-Directory-Wallpaper");
@@ -846,13 +846,14 @@
break;
case E_FWIN_EXEC_DESKTOP:
snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->fm_obj),
ici->file);
- desktop = efreet_desktop_get(buf);
+ desktop = efreet_desktop_new(buf);
if (desktop)
{
if (fwin->win)
e_exec(fwin->win->border->zone, desktop, NULL, NULL, NULL);
else if (fwin->zone)
e_exec(fwin->zone, desktop, NULL, NULL, NULL);
+ efreet_desktop_free(desktop);
}
break;
default:
-------------------------------------------------------------------------
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
