rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.


SVN revision: 34389
This commit is contained in:
Carsten Haitzler 2008-04-28 10:50:36 +00:00
parent 548c57be3e
commit b1c69d3f5f
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_border.c
View File

@ -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))
{

21
src/bin/e_fm.c
View File

@ -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)
{

1
src/bin/e_fm.h
View File

@ -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;