From f00a498e24c396fc7ae0ffea146781b979a0f7c4 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Wed, 19 May 2010 14:47:12 +0000 Subject: [PATCH] use plugin instance macro SVN revision: 49008 --- src/modules/everything-files/e_mod_main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/modules/everything-files/e_mod_main.c b/src/modules/everything-files/e_mod_main.c index 092e99b46..5639bf1b6 100644 --- a/src/modules/everything-files/e_mod_main.c +++ b/src/modules/everything-files/e_mod_main.c @@ -567,19 +567,16 @@ _browse(Evry_Plugin *plugin, const Evry_Item *it) { Plugin *p = NULL; - if (!it || (it && !CHECK_TYPE(it, EVRY_TYPE_FILE))) + if (!it || !(CHECK_TYPE(it, EVRY_TYPE_FILE))) return NULL; - /* GET_PLUGIN(parent, plugin); */ GET_FILE(file, it); if (!evry->file_path_get(file) || !ecore_file_is_dir(file->path)) return NULL; - p = E_NEW(Plugin, 1); - p->base = *plugin; - p->base.items = NULL; + EVRY_PLUGIN_INSTANCE(p, plugin); p->directory = eina_stringshare_add(file->path); p->parent = EINA_TRUE; @@ -1071,7 +1068,7 @@ _recentf_browse(Evry_Plugin *plugin, const Evry_Item *it) { Plugin *p = NULL; - if (!it || (it && !CHECK_TYPE(it, EVRY_TYPE_FILE))) + if (!it || !CHECK_TYPE(it, EVRY_TYPE_FILE)) return NULL; GET_FILE(file, it); @@ -1098,9 +1095,7 @@ _recentf_begin(Evry_Plugin *plugin, const Evry_Item *it) if (it && !CHECK_TYPE(it, EVRY_TYPE_ACTION)) return NULL; - p = E_NEW(Plugin, 1); - p->base = *plugin; - p->base.items = NULL; + EVRY_PLUGIN_INSTANCE(p, plugin); p->parent = EINA_FALSE; if (it)