Evas_Object *o = NULL;
if (app->desktop)
- o = e_util_desktop_icon_add(app->desktop, 128, e);
+ {
+ o = evry->icon_theme_get(app->desktop->icon, e);
+ if (!o)
+ o = e_util_desktop_icon_add(app->desktop, 128, e);
+ }
+
if (!o)
o = evry->icon_theme_get("system-run", e);
{
GET_APP(app, item);
+
if (app->desktop)
efreet_desktop_free(app->desktop);
if (app->file)
exec = ecore_file_file_get(desktop->exec);
if (exec && (end = strchr(exec, '%')))
{
- strncpy(buf, exec, end - exec - 1);
- buf[end - exec] = 0;
+ strncpy(buf, exec, (end - exec) - 1);
+ buf[(end - exec)-1] = '\0';
m1 = evry->fuzzy_match(buf, input);
}
else
_item_free(Evry_Item *it)
{
GET_FILE(file, it);
- if (file->url) eina_stringshare_del(file->url);
- if (file->path) eina_stringshare_del(file->path);
- if (file->mime) eina_stringshare_del(file->mime);
+
+ IF_RELEASE(file->url);
+ IF_RELEASE(file->path);
+ IF_RELEASE(file->mime);
E_FREE(file);
}
static const Evry_API *evry = NULL;
static Evry_Module *evry_module = NULL;
-static Evry_Plugin *p1;
+static Evry_Plugin *_plug;
static Eina_List *handlers = NULL;
static Eina_Hash *border_hash = NULL;
static Eina_List *_actions = NULL;
static int
_plugins_init(const Evry_API *_api)
{
- Evry_Plugin *p;
Evry_Action *act;
if (evry_module->active)
if (!evry->api_version_check(EVRY_API_VERSION))
return EINA_FALSE;
- p1 = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Windows"), NULL, EVRY_TYPE_BORDER,
- _begin, _cleanup, _fetch, NULL);
-
- p1->transient = EINA_TRUE;
- evry->plugin_register(p1, EVRY_PLUGIN_SUBJECT, 2);
-
+ _plug = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Windows"),
+ "preferences-system-windows",
+ EVRY_TYPE_BORDER,
+ _begin, _cleanup, _fetch, NULL);
+ _plug->transient = EINA_TRUE;
+ evry->plugin_register(_plug, EVRY_PLUGIN_SUBJECT, 2);
act = EVRY_ACTION_NEW(_("Switch to Window"),
EVRY_TYPE_BORDER, 0, "go-next",
if (!evry_module->active) return;
- EVRY_PLUGIN_FREE(p1);
+ EVRY_PLUGIN_FREE(_plug);
EINA_LIST_FREE(_actions, act)
evry->action_free(act);
char *input = NULL;
Evry_Item *it = s->cur_item;
+ if (!it) return 0;
+
evry_item_ref(it);
s->item_auto_selected = EINA_FALSE;
Eina_List *l, *ll;
Evry_Item *it = s->cur_item;
+ if (!it) return 0;
+
if (!(ht = evry_history_types_get(it->type)))
return 1;
else if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
(!strcmp(ev->key, "Delete") || !strcmp(ev->key, "Insert")))
{
- if (!s->cur_item)
- goto end;
-
int delete = (!strcmp(ev->key, "Delete") &&
(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT));
int promote = (!strcmp(ev->key, "Insert"));
if (ev->changed_selection)
{
if (it->item->selected)
- _pan_item_select(v->span, it, 1);
+ {
+ evry_item_select(v->state, ev->item);
+ _pan_item_select(v->span, it, 1);
+ }
}
if (!it->visible)
diff_x = abs(ev->cur.canvas.x - sd->mouse_x);
diff_y = abs(ev->cur.canvas.y - sd->mouse_y);
- if (diff_y > (diff_x + 10) * 2)
+ if (diff_y > 10 + (diff_x/2))
goto end;
if ((sd->cur_item != sd->it_down) && (diff_x > 10))
if ((sd->mouse_button == 1) &&
(sd->cur_item == sd->it_down))
{
- if (ev->cur.canvas.x - sd->mouse_x > 150)
+ if (ev->cur.canvas.x - sd->mouse_x > 100)
{
sd->it_down = NULL;
sd->mouse_x = 0;
sd->mouse_y = 0;
evry_browse_back(NULL);
}
- else if (sd->mouse_x - ev->cur.canvas.x > 150)
+ else if (sd->mouse_x - ev->cur.canvas.x > 100)
{
sd->it_down = NULL;
sd->mouse_x = 0;