Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_fm.c e_fm.h
Log Message:
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.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -3 -r1.631 -r1.632
--- e_border.c 26 Apr 2008 06:41:48 -0000 1.631
+++ e_border.c 28 Apr 2008 10:50:35 -0000 1.632
@@ -1404,7 +1404,7 @@
// 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))
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -3 -r1.240 -r1.241
--- e_fm.c 17 Apr 2008 02:51:26 -0000 1.240
+++ e_fm.c 28 Apr 2008 10:50:36 -0000 1.241
@@ -3377,6 +3377,7 @@
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 @@
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 @@
}
}
}
+ /* FIXME: get category */
+ ic->info.category = NULL;
efreet_desktop_free(desktop);
return 1;
@@ -3934,11 +3938,13 @@
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 @@
{
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)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- e_fm.h 14 Dec 2007 20:44:59 -0000 1.55
+++ e_fm.h 28 Apr 2008 10:50:36 -0000 1.56
@@ -106,6 +106,7 @@
const char *icon;
const char *link;
const char *real_link;
+ const char *category;
struct stat statinfo;
unsigned char icon_type;
unsigned char mount : 1;
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
