From e38b64a98b25da1cc2694ffb7f1c92c4fb57d1fe Mon Sep 17 00:00:00 2001
From: Sebastian Dransfeld <sd@tango.flipp.net>
Date: Sat, 24 Mar 2007 09:54:23 +0000
Subject: [PATCH] Make fm2 use efreet. Don't use custom values in standard
 fields. This breaks the old .desktop files in fileman/favorites!

SVN revision: 28997
---
 data/other/efm_favorites.tar.gz | Bin 524 -> 560 bytes
 src/bin/e_fm.c                  |  60 ++++++++++----------------------
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/data/other/efm_favorites.tar.gz b/data/other/efm_favorites.tar.gz
index b47b46af3259dbda7483abeaa2da0f9c863046e8..e5906ac86b59d66457ea935e38963ef6e923be6d 100644
GIT binary patch
literal 560
zcmV-00?+*)iwFoJ@dQQy17&7yUuI!;Z*pmLWpgfcVR8WNm|t(3Fcigk_NVZ}UentA
zF;gX;)>N(3Zc>#>m8w0k#A#5$M#h=Mx1UW&NQzp5MA+8e-wOhp7;)}7zGRuCJd4G-
zb3%wA41&#(9Uf~OO8k(qAPijJA=C{Cb#QRXhuX3(bgVFT3jQlDbh3DBUf1}4%Cgpf
z8UL0l(Y!c8B^;+eBb0{3r&fQTndzYa2(<OrS$?+Q#fz5tKx<fmneV@;ze^kay}&j4
zn>uhEOa@y2T|T+~PnR31@l<G4{zS7f=h1B<UeHv`<suQ!(ZlR&@)doLGak)&mZNVn
z%ec_hiBz#Fu`QwkJx-<~O`cbp3p+lke(FxHg+>qew~?K6VXF(>%%zBSg(uSmSLkoQ
zhtEpe|4K?dYyfoopEdsXsrA3>QSkp5^z;9{sg1_}D~|02d}Zxl7Mf?+yd!>G5I_q2
z6SVzbTYta^==8tmHT@q6tp7tAg8#>$pa1L0y9lV9kEOt+Tr0dCJ;wiEu7BK3&$o9R
zWI<hc5C&t=_WzkwCW?n#qs#w<+5JBtZpeH$Ajbd9gaY_~3|2DZ+o(scq95(If@tr%
z5UlxOX#0P^B8FL`bN^><)BlHF)&CP8{67Z$_Wx^B8~8F&e6FP`555F;SFzd4b({!u
yD~{82(;DPl6;i}$kG~444&ksfu%!vv0{{R30000000000(2GC!LQ5b3C;$KePZ`7j

literal 524
zcmV+n0`vVJiwFR?=nF*v1MQeWZ<{a_fI0hD_^@kQ<JhK}#HmfyN$Vz6sWhqD!AqP5
z6>MZXllb?8G^8xFg-L{M?fWh$#>f%xeb3LVl2m0<p9V*Slti3Y*D&Iwd94XT!XhDf
z#3>6%NJ%seFhAy>s@XU%EyjVB&MW)!ysrEIDXU%lSMsN^iC69jnb0r(oX|)x%4r#Y
zMg)QQk3l>BKFd#*$~}0K541)VV8Pgn@uy_^<UgC1@fTFE0F!~%f0cJ0|GSIFP~(~Q
zw)l=_dSRA{zK?I`my<K}MP@3Vt1L(7Cd-ue+aJbCTi_~n9GVxoim%N^dvtsAIj#mj
zRyl;eO=dbx?$=)F>cPpUh0*7!bS~cKoJp6;qQCtL-ZgFitucPs0?_Gy7#{l1m;nFB
zppXAIWkx*tzgD;!z?YT&Mfp-P{6jkRd?A1;@Q>5>f2aO{C7{!PDh~XQLPo*=G3ev}
zZpyv{Y|Y0;<HBq#uJ1nQ|A(uu*R#`lMt3dP<s1})(P;aBV(fC*MDOyS2+=tImE$1~
zBk2D}VQn&1mwI$i`cbnLM2&MH`1xjN``^rnVb<u}|2c2<|8xrek3paP|EkOge34kS
z@WvLuodouyxZKOVOmz7umTCIf8sy44qh<Qar-E&V(4#Y`vJ%P;00000000000002M
OpYscFLWP(BC;$N685HsW

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 15d4a5f9a..5190f081a 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -2516,57 +2516,35 @@ static int
 _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
 {
    char buf[4096];
-   Ecore_Desktop *desktop;
+   Efreet_Desktop *desktop;
    
    snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file);
 
-   desktop = ecore_desktop_get(buf, NULL);
+   desktop = efreet_desktop_get(buf);
    if (desktop)
      {
-	if (desktop->name)     ic->info.label   = evas_stringshare_add(desktop->name);
-	if (desktop->generic)  ic->info.generic = evas_stringshare_add(desktop->generic);
-	if (desktop->comment)  ic->info.comment = evas_stringshare_add(desktop->comment);
+	if (desktop->name)         ic->info.label   = evas_stringshare_add(desktop->name);
+	if (desktop->generic_name) ic->info.generic = evas_stringshare_add(desktop->generic_name);
+	if (desktop->comment)      ic->info.comment = evas_stringshare_add(desktop->comment);
 	
-	if (desktop->icon)
+	if (desktop->icon) ic->info.icon = evas_stringshare_add(desktop->icon);
+
+	if (desktop->type == EFREET_DESKTOP_TYPE_LINK)
 	  {
-	     char *v;
-	     
-	     /* FIXME: Use a real icon size. */
-	     v = desktop->icon_path;
-// make it consistent and use the same icon everywhere	     
-//	     v = ecore_desktop_icon_find(desktop->icon, NULL, e_config->icon_theme);
-	     if (v)
+	     if (desktop->url)
+	       ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->url);
+	     if (desktop->x)
 	       {
-		  ic->info.icon = evas_stringshare_add(v);
-//		  free(v);
+		  const char *type;
+		  
+		  type = ecore_hash_get(desktop->x, "X-Enlightenment-Type");
+		  if (type)
+		    {
+		       if (!strcmp(type, "Mount")) ic->info.mount = 1;
+		       else if (!strcmp(type, "Removable")) ic->info.removable = 1;
+		    }
 	       }
 	  }
-	
-	if (desktop->type)
-	  {
-	     if (!strcmp(desktop->type, "Mount"))
-	       {
-		  ic->info.mount = 1;
-		  if (desktop->URL)
-		    ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->URL);
-	       }
-	     else if (!strcmp(desktop->type, "Removable"))
-	       {
-		  ic->info.removable = 1;
-		  if (desktop->URL)
-		    ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->URL);
-	       }
-	     else if (!strcmp(desktop->type, "Link"))
-	       {
-		  if (desktop->URL)
-		    ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->URL);
-	       }
-	     else if (!strcmp(desktop->type, "Application"))
-	       {
-	       }
-	     else
-	       goto error;
-	  }
      }
    
    return 1;