[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. a8698069ec4eec9c2a189198fa5eec9854b168ac

[raster]

The following commit has been merged in the upstream-vcs branch:
commit 74ddf641bbbc0f18a67a672a0c7c27d0a2890b69
Author: raster <raster>
Date:   Mon Apr 28 10:50:35 2008 +0000

    put in some place markers in efm for categories in a fm widget - nothing
    there currently but the entry, and fix focus of iconified windows. broke it
    before.

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 29f75ca..2bb939f 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -1404,7 +1404,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 //   printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
    if (!bd->client.icccm.accepts_focus) return;
    /* dont focus an iconified window. that's silly! */
-   if (bd->iconic) return;
+   if ((focus) && (bd->iconic))return;
    
    if ((bd->modal) && (bd->modal != bd))
      {
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 9454de7..5159e59 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -3377,6 +3377,7 @@ _e_fm2_icon_unfill(E_Fm2_Icon *ic)
    if (ic->info.icon) evas_stringshare_del(ic->info.icon);
    if (ic->info.link) evas_stringshare_del(ic->info.link);
    if (ic->info.real_link) evas_stringshare_del(ic->info.real_link);
+   if (ic->info.category) evas_stringshare_del(ic->info.category);
    ic->info.mime = NULL;
    ic->info.label = NULL;
    ic->info.comment = NULL;
@@ -3649,6 +3650,7 @@ _e_fm2_icon_free(E_Fm2_Icon *ic)
    if (ic->info.icon) evas_stringshare_del(ic->info.icon);
    if (ic->info.link) evas_stringshare_del(ic->info.link);
    if (ic->info.real_link) evas_stringshare_del(ic->info.real_link);
+   if (ic->info.category) evas_stringshare_del(ic->info.category);
    free(ic);
 }
 
@@ -3925,6 +3927,8 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
 	       }
 	  }
      }
+   /* FIXME: get category */
+   ic->info.category = NULL;
    efreet_desktop_free(desktop);
 
    return 1;
@@ -3934,11 +3938,13 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
    if (ic->info.generic) evas_stringshare_del(ic->info.generic);
    if (ic->info.icon) evas_stringshare_del(ic->info.icon);
    if (ic->info.link) evas_stringshare_del(ic->info.link);
+   if (ic->info.category) evas_stringshare_del(ic->info.category);
    ic->info.label = NULL;
    ic->info.comment = NULL;
    ic->info.generic = NULL;
    ic->info.icon = NULL;
    ic->info.link = NULL;
+   ic->info.category = NULL;
    //Hack
    if (!strncmp(ic->info.file, "|storage_", 9)) ecore_file_unlink(buf);
    return 0;
@@ -5807,10 +5813,17 @@ _e_fm2_cb_icon_sort(void *data1, void *data2)
      {
 	char buf1[4096], buf2[4096], *p;
 	
-	strncpy(buf1, l1, sizeof(buf1) - 2);
-	strncpy(buf2, l2, sizeof(buf2) - 2);
-	buf1[sizeof(buf1) - 1] = 0;
-	buf2[sizeof(buf2) - 1] = 0;
+/*	if (ic1->sd->config->list.sort.category)
+	  {
+ * FIXME: implement category sorting
+	  }
+	else
+*/	  {
+	     strncpy(buf1, l1, sizeof(buf1) - 2);
+	     strncpy(buf2, l2, sizeof(buf2) - 2);
+	     buf1[sizeof(buf1) - 1] = 0;
+	     buf2[sizeof(buf2) - 1] = 0;
+	  }
 	p = buf1;
 	while (*p)
 	  {
diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h
index b499bb5..b03fecb 100644
--- a/src/bin/e_fm.h
+++ b/src/bin/e_fm.h
@@ -106,6 +106,7 @@ struct _E_Fm2_Icon_Info
    const char       *icon;
    const char       *link;
    const char       *real_link;
+   const char       *category;
    struct stat       statinfo;
    unsigned char     icon_type;
    unsigned char     mount : 1;

-- 
Enlightenment 17