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

Use -1 to sort the remember list. Saves a call to evas_list_count because we 

are sorting the whole list anyway.
Fix formatting.
Remove whitespace.


SVN revision: 34598
This commit is contained in:
Christopher Michael 2008-05-18 17:59:12 +00:00
parent 9a417fc4b4
commit f8bbe02235
1 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/e_remember.c
View File

@ -19,7 +19,7 @@ static E_Remember *_e_remember_find(E_Border *bd, int check_usable);
EAPI int
e_remember_init(E_Startup_Mode mode)
{
Evas_List *l;
Evas_List *l = NULL;
int not_updated = 0;
if (mode == E_STARTUP_START)
@ -59,7 +59,8 @@ e_remember_init(E_Startup_Mode mode)
}
if (not_updated)
e_config->remembers = evas_list_sort(e_config->remembers, evas_list_count(e_config->remembers), _e_remember_sort_list);
e_config->remembers = evas_list_sort(e_config->remembers, -1,
_e_remember_sort_list);
#endif
return 1;
}
@ -108,7 +109,7 @@ e_remember_del(E_Remember *rem)
if (rem->delete_me) return;
if (rem->used_count != 0)
{
Evas_List *l;
Evas_List *l = NULL;
rem->delete_me = 1;
for (l = e_border_client_list(); l; l = l->next)
@ -131,6 +132,7 @@ EAPI E_Remember *
e_remember_find_usable(E_Border *bd)
{
E_Remember *rem;
rem = _e_remember_find(bd, 1);
return rem;
}
@ -139,6 +141,7 @@ EAPI E_Remember *
e_remember_find(E_Border *bd)
{
E_Remember *rem;
rem = _e_remember_find(bd, 0);
return rem;
}
@ -161,16 +164,16 @@ e_remember_match_update(E_Remember *rem)
/* The number of matches for this remember has changed so we
* need to remove from list and insert back into the appropriate
* loction. */
Evas_List *l;
Evas_List *l = NULL;
E_Remember *r;
rem->max_score = max_count;
e_config->remembers = evas_list_remove(e_config->remembers, rem);
for (l = e_config->remembers; l; l = l->next)
{
r = l->data;
if (r->max_score <= rem->max_score)
break;
if (r->max_score <= rem->max_score) break;
}
if (l)
@ -283,9 +286,9 @@ e_remember_update(E_Remember *rem, E_Border *bd)
rem->prop.sticky = bd->sticky;
if (bd->shaded)
rem->prop.shaded = 100 + bd->shade.dir;
rem->prop.shaded = (100 + bd->shade.dir);
else
rem->prop.shaded = 50 + bd->shade.dir;
rem->prop.shaded = (50 + bd->shade.dir);
rem->prop.skip_winlist = bd->user_skip_winlist;
rem->prop.skip_pager = bd->client.netwm.state.skip_pager;
@ -295,7 +298,6 @@ e_remember_update(E_Remember *rem, E_Border *bd)
e_desk_xy_get(bd->desk, &rem->prop.desk_x, &rem->prop.desk_y);
rem->prop.zone = bd->zone->num;
rem->prop.head = bd->zone->container->manager->num;
if ((bd->client.icccm.command.argc > 0) &&
@ -347,9 +349,9 @@ e_remember_update(E_Remember *rem, E_Border *bd)
static E_Remember *
_e_remember_find(E_Border *bd, int check_usable)
{
#if REMEMBER_SIMPLE
Evas_List *l;
Evas_List *l = NULL;
#if REMEMBER_SIMPLE
for (l = e_config->remembers; l; l = l->next)
{
E_Remember *rem;
@ -399,8 +401,6 @@ _e_remember_find(E_Border *bd, int check_usable)
return NULL;
#endif
#if REMEMBER_HIERARCHY
Evas_List *l;
/* This search method finds the best possible match available and is
* based on the fact that the list is sorted, with those remembers
* with the most possible matches at the start of the list. This
@ -412,7 +412,7 @@ _e_remember_find(E_Border *bd, int check_usable)
const char *title = "";
rem = l->data;
if (check_usable && !e_remember_usable_get(rem))
if ((check_usable) && (!e_remember_usable_get(rem)))
continue;
if (bd->client.netwm.name) title = bd->client.netwm.name;