From 3f8a019c3951eafe08d1e838ed101b4cff974ec6 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Tue, 6 Oct 2009 21:39:34 +0000 Subject: [PATCH] fix some problems found by llvm SVN revision: 42921 --- src/modules/everything/evry.c | 2 +- src/modules/everything/evry_plug_aggregator.c | 2 +- src/modules/everything/sources/evry_plug_dir_browse.c | 1 - src/modules/everything/views/evry_plug_view_thumb.c | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 65f9b88d2..b2113bf18 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -1375,7 +1375,7 @@ _evry_clear(Evry_State *s) _evry_update(s, 1); return 1; } - else if (s->input[0] != 0) + else if (s->input && s->input[0] != 0) { s->input[0] = 0; _evry_update(s, 1); diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c index a5f0c8e68..585868064 100644 --- a/src/modules/everything/evry_plug_aggregator.c +++ b/src/modules/everything/evry_plug_aggregator.c @@ -178,7 +178,7 @@ _fetch(Evry_Plugin *plugin, const char *input) } } - if (lp && (eina_list_count(lp) == 2) || (!EVRY_PLUGIN(p)->items)) + if (lp && ((eina_list_count(lp) == 2) || (!EVRY_PLUGIN(p)->items))) { pp = lp->data; EINA_LIST_FOREACH(pp->items, l, it) diff --git a/src/modules/everything/sources/evry_plug_dir_browse.c b/src/modules/everything/sources/evry_plug_dir_browse.c index 285774fa7..4969f5d56 100644 --- a/src/modules/everything/sources/evry_plug_dir_browse.c +++ b/src/modules/everything/sources/evry_plug_dir_browse.c @@ -352,7 +352,6 @@ _fetch(Evry_Plugin *plugin, const char *input) } _folder_item_add(p, "/"); - file = E_NEW(Evry_Item_File, 1); p->command = EINA_TRUE; return 1; diff --git a/src/modules/everything/views/evry_plug_view_thumb.c b/src/modules/everything/views/evry_plug_view_thumb.c index f55b64544..e4f57b71f 100644 --- a/src/modules/everything/views/evry_plug_view_thumb.c +++ b/src/modules/everything/views/evry_plug_view_thumb.c @@ -195,7 +195,6 @@ _e_smart_reconfigure_do(void *data) { x = 0; y += hh; - xx = sd->x - sd->cx + x; } it->x = x; @@ -577,14 +576,15 @@ _pan_item_select(Evas_Object *obj, Item *it) { sd->cur_item->selected = EINA_FALSE; edje_object_signal_emit(sd->cur_item->frame, "e,state,unselected", "e"); - sd->cur_item = it; - sd->cur_item->selected = EINA_TRUE; } if (it) { sd->update = EINA_FALSE; + sd->cur_item = it; + sd->cur_item->selected = EINA_TRUE; + if (sd->view->list_mode) align = it->y - (double)it->y / (double)sd->ch * (sd->h - it->h); else if ((it->y + it->h) - sd->cy > sd->h)