working a bit more on the icon in file prop dialog - now it gets the props

right.

SVN revision: 27851

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 161916e..16c40eb 100644 (file)
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -970,6 +970,7 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
                  oic = edje_object_add(evas);
                  e_theme_edje_object_set(oic, "base/theme/fileman",
                                          "e/icons/fileman/file");
+                 if (type_ret) *type_ret = "FILE_TYPE";
               }
             else if (!strcmp(icon, "THUMB"))
               {

diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c
index 800bd1c..32f58b7 100644 (file)
--- a/src/bin/e_fm_prop.c
+++ b/src/bin/e_fm_prop.c
@@ -276,7 +276,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_radio_add(evas, _("Custom"), 2, rg);
    evas_object_smart_callback_add(ob, "changed", _cb_type, cfdata);
    e_widget_frametable_object_append(ot, ob, 1, 2, 1, 1, 1, 1, 1, 1);
-   
+
+   cfdata->icon_mime = 1;
+   if ((cfdata->fi->icon) || ((itype) && (!strcmp(itype, "DESKTOP"))))
+     cfdata->icon_mime = 0;
    ob = e_widget_check_add(evas, _("Use this icon for all files of this type"), &(cfdata->icon_mime));
    e_widget_frametable_object_append(ot, ob, 0, 3, 2, 1, 1, 1, 1, 1);