The second patch fixes on bug related to an invalid memory access that was

causing segmentation fault in my computer (valgrind was complaining
about it too).

patch from Otávio Pontes.



SVN revision: 52898
This commit is contained in:
Nicolas Aguirre 2010-09-29 17:09:42 +00:00
parent 7e44cd9256
commit 4da0ca1b85
2 changed files with 11 additions and 17 deletions

View File

@ -19,6 +19,7 @@ _ephoto_flow_browser_delete_cb(void *data, Evas_Object *obj, void *event_info)
_ephoto_thumb_browser_selected_cb,
NULL);
em->state = EPHOTO_STATE_THUMB;
em->flow_browser = NULL;
}
static void

View File

@ -353,21 +353,6 @@ _ephoto_grid_del(const void *data, Evas_Object *obj)
/*Thumb clicked job*/
static void
_ephoto_thumb_clicked_job(void *data)
{
const char *file;
file = data;
/* evas_object_smart_callback_call(ef->flow_browser, "selected", file); */
/* em->flow_browser = ephoto_create_flow_browser(em->layout); */
/* ephoto_flow_browser_image_set(em->flow_browser, file); */
/* elm_layout_content_set(em->layout, "ephoto.content.swallow", em->flow_browser); */
}
/*Check to see if the thumbnail was double clicked*/
static void
_ephoto_thumb_clicked(void *data, Evas_Object *obj, void *event_info)
{
const Eina_List *selected;
Ephoto_Thumb_Data *etd;
@ -378,7 +363,13 @@ _ephoto_thumb_clicked(void *data, Evas_Object *obj, void *event_info)
o = eina_list_data_get(selected);
etd = (Ephoto_Thumb_Data *)elm_gengrid_item_data_get((Elm_Gengrid_Item *)o);
evas_object_smart_callback_call(tb->layout, "selected", (char *)etd->file);
// ecore_job_add(_ephoto_thumb_clicked_job, etd->file);
}
/*Check to see if the thumbnail was double clicked*/
static void
_ephoto_thumb_clicked(void *data, Evas_Object *obj, void *event_info)
{
ecore_job_add(_ephoto_thumb_clicked_job, data);
}
/*File Selector is shown*/
@ -526,5 +517,7 @@ _ephoto_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
eina_stringshare_del(etd->file);
free(etd);
}
if (tb->ec)
ethumb_client_disconnect(tb->ec);
em->thumb_browser = NULL;
}