okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d4a045278ca9d0f2b3a17ea4f65bba48cba55f72
commit d4a045278ca9d0f2b3a17ea4f65bba48cba55f72
Author: Stephen okra Houston <smhousto...@gmail.com>
Date: Mon Nov 28 13:04:38 2016 -0600
Luncher: Fix Coverity Issues: CID 1366276 1366275
---
src/modules/luncher/bar.c | 2 +-
src/modules/luncher/grid.c | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 5f34708..3321b69 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -1563,7 +1563,7 @@ _bar_mouse_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, v
Edje_Message_Int_Set *msg;
Evas_Coord x, y, w, h;
- evas_object_geometry_get(ic->o_layout, &x, &y, &w, &h);
+ evas_object_geometry_get(ic->o_icon, &x, &y, &w, &h);
msg = alloca(sizeof(Edje_Message_Int_Set) + (7 * sizeof(int)));
msg->count = 7;
msg->val[0] = px;
diff --git a/src/modules/luncher/grid.c b/src/modules/luncher/grid.c
index fb869be..225455c 100644
--- a/src/modules/luncher/grid.c
+++ b/src/modules/luncher/grid.c
@@ -250,8 +250,7 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
Icon *ic;
ic = E_NEW(Icon, 1);
- if (desktop)
- efreet_desktop_ref(desktop);
+ efreet_desktop_ref(desktop);
ic->desktop = desktop;
ic->inst = inst;
ic->preview = NULL;
@@ -302,12 +301,6 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
path = e_theme_edje_file_get("base/theme/icons",
"e/icons/unknown");
k = "e/icons/unknown";
}
- if (path && desktop->icon && !k)
- {
- len = strlen(desktop->icon);
- if ((len > 4) && (!strcasecmp(desktop->icon + len - 4, ".edj")))
- k = "icon";
- }
}
elm_image_file_set(ic->o_icon, path, k);
elm_object_tooltip_text_set(ic->o_icon, desktop->name);
--
