From 96fcf80c228e6819d0c3068541b86c4b392d453b Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Tue, 1 May 2007 13:41:09 +0000 Subject: [PATCH] Add prototype for func. Delete objects with e_object_del SVN revision: 29788 --- src/bin/e_confirm_dialog.c | 12 ++++-------- src/bin/e_editable.h | 1 + src/bin/e_entry.c | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/bin/e_confirm_dialog.c b/src/bin/e_confirm_dialog.c index 147484ad8..0d243dbb2 100644 --- a/src/bin/e_confirm_dialog.c +++ b/src/bin/e_confirm_dialog.c @@ -32,8 +32,8 @@ e_confirm_dialog_show(const char *title, const char *icon, const char *text, dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_confirm_dialog"); if (!dia) { - E_FREE(cd); - return; + e_object_del(E_OBJECT(cd)); + return NULL; } dia->data = cd; cd->dia = dia; @@ -58,12 +58,8 @@ e_confirm_dialog_show(const char *title, const char *icon, const char *text, static void _e_confirm_dialog_free(E_Confirm_Dialog *cd) { - E_Dialog *dia; - E_Win *win; - - dia = cd->dia; - win = dia->win; - _e_confirm_dialog_delete(win); + if ((cd->dia) && (cd->dia->win)) + _e_confirm_dialog_delete(cd->dia->win); } static void diff --git a/src/bin/e_editable.h b/src/bin/e_editable.h index fafeb8a61..a6ec44c7e 100644 --- a/src/bin/e_editable.h +++ b/src/bin/e_editable.h @@ -35,6 +35,7 @@ EAPI void e_editable_selection_move_left (Evas_Object *editable); EAPI void e_editable_selection_move_right (Evas_Object *editable); EAPI void e_editable_select_all (Evas_Object *editable); EAPI void e_editable_unselect_all (Evas_Object *editable); +EAPI void e_editable_select_word (Evas_Object *editable, int index); EAPI void e_editable_selection_show (Evas_Object *editable); EAPI void e_editable_selection_hide (Evas_Object *editable); diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c index c7d9cce36..562f5eeb1 100644 --- a/src/bin/e_entry.c +++ b/src/bin/e_entry.c @@ -1118,7 +1118,6 @@ _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi) int start_pos, end_pos; int selecting; char *range; - E_Win *win; sd = data; if (!sd->enabled) return;