On Fri, Dec 30, 2011 at 07:58:27PM +0900, ChunEon Park wrote: > Looks good thank you! > but could you please attach the patch file? :) > ------------------------------------ > -Regards, Hermet-
I don't see the point, but here you go :). Regards, -- Martin 'JaMa' Jansa jabber: [email protected]
From 73ddd6cd7dcb5f1da949f138bbc07a69e8dd5eda Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 30 Dec 2011 11:02:38 +0100 Subject: [PATCH] callbacks: replace remaining delete-request usages with delete,request which is emited by elm_win, update focus callback names in comments too * since r58816 elm_win calls only delete,request, so delete-request is not called and still many apps and and examples are expecting it Signed-off-by: Martin Jansa <[email protected]> --- .../src/elementaryxx/external/main.cpp | 2 +- .../eflxx_examples/src/elementaryxx/full/main.cpp | 2 +- .../cxx/elementaryxx/include/elementaryxx/Window.h | 6 +++--- BINDINGS/vala/examples/elementary/abstract.vala | 2 +- BINDINGS/vala/examples/elementary/main.vala | 2 +- .../examples/library/application/application.vala | 2 +- BINDINGS/vala/examples/library/dialer/dialer.vala | 2 +- .../examples/library/viewstates/viewstates.vala | 2 +- EXAMPLES/elementary/calculator/src/bin/main.c | 2 +- EXAMPLES/elementary/converter/src/bin/main.c | 2 +- EXAMPLES/elementary/phonebook/src/bin/main.c | 2 +- EXAMPLES/elementary/sticky-notes/src/bin/gui.c | 2 +- EXAMPLES/elementary/sticky-notes/src/bin/main.c | 2 +- PROTO/elm_illume/src/bin/main.c | 2 +- PROTO/elm_indicator/src/bin/elm_ind_win.c | 2 +- PROTO/elm_kbd/src/bin/main.c | 2 +- PROTO/elm_softkey/src/bin/main.c | 2 +- PROTO/emote/src/bin/em_config.c | 2 +- PROTO/emote/src/bin/em_gui.c | 2 +- PROTO/eupnp/examples/media_server_browser.c | 2 +- PROTO/eupnp/tools/igd/igd.c | 2 +- PROTO/eupnp/tools/lighting/lighting_gui.c | 2 +- PROTO/eyelight_edit/src/bin/main.c | 2 +- TMP/st/elementary-alarm/src/bin/main.c | 4 ++-- .../main_templates/empty_window.c | 2 +- .../main_templates/frame_label_buttons.c | 2 +- .../main_templates/genlist_pager.c | 2 +- TMP/st/elementary-generator/ui.c | 2 +- TMP/st/elementary-presenter/src/bin/main.c | 2 +- TMP/st/elementary-sms/src/bin/list.c | 2 +- edje_viewer/src/bin/edje_viewer_gui.c | 2 +- elmdentica/src/elmdentica.c | 8 ++++---- elmdentica/src/settings.c | 8 ++++---- ensure/src/display.c | 2 +- envision/src/bin/main.c | 2 +- exactness/src/bin/test_index.c | 2 +- 36 files changed, 45 insertions(+), 45 deletions(-) diff --git a/BINDINGS/cxx/eflxx_examples/src/elementaryxx/external/main.cpp b/BINDINGS/cxx/eflxx_examples/src/elementaryxx/external/main.cpp index ef305b9..91dd3ce 100644 --- a/BINDINGS/cxx/eflxx_examples/src/elementaryxx/external/main.cpp +++ b/BINDINGS/cxx/eflxx_examples/src/elementaryxx/external/main.cpp @@ -31,7 +31,7 @@ int main (int argc, const char **argv) Application elmApp (argc, argv); Window *elmWin = Window::factory ("window1", ELM_WIN_BASIC); - elmWin->getEventSignal ("delete-request")->connect (sigc::ptr_fun (&my_win_del)); + elmWin->getEventSignal ("delete,request")->connect (sigc::ptr_fun (&my_win_del)); Background *bg = Background::factory (*elmWin); diff --git a/BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/main.cpp b/BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/main.cpp index bc3ead5..7b0bff4 100644 --- a/BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/main.cpp +++ b/BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/main.cpp @@ -99,7 +99,7 @@ int main (int argc, const char **argv) /* set the title of the window - this is in the titlebar */ win->setTitle ("Elementary Tests"); - /* set a callback on the window when "delete-request" is emitted as + /* set a callback on the window when "delete,request" is emitted as * a callback. when this happens my_win_del() is called and the * data pointer (first param) is passed the final param here (in this * case it is NULL). This is how you can pass specific things to a diff --git a/BINDINGS/cxx/elementaryxx/include/elementaryxx/Window.h b/BINDINGS/cxx/elementaryxx/include/elementaryxx/Window.h index 84d48f0..9112afa 100644 --- a/BINDINGS/cxx/elementaryxx/include/elementaryxx/Window.h +++ b/BINDINGS/cxx/elementaryxx/include/elementaryxx/Window.h @@ -14,9 +14,9 @@ namespace Elmxx { /*! * smart callbacks called: - * "delete-request" - the user requested to delete the window - * "focus-in" - window got focus - * "focus-out" - window lost focus + * "delete,request" - the user requested to delete the window + * "focus,in" - window got focus + * "focus,out" - window lost focus */ class Window : public Object { diff --git a/BINDINGS/vala/examples/elementary/abstract.vala b/BINDINGS/vala/examples/elementary/abstract.vala index 4be506e..df3668f 100644 --- a/BINDINGS/vala/examples/elementary/abstract.vala +++ b/BINDINGS/vala/examples/elementary/abstract.vala @@ -25,7 +25,7 @@ public abstract class T.Abstract { debug( "open window" ); win = new Elm.Win( null, "window", Elm.WinType.BASIC ); - win.smart_callback_add( "delete-request", close ); + win.smart_callback_add( "delete,request", close ); win.autodel_set( true ); win.resize( 320, 320 ); win.show(); diff --git a/BINDINGS/vala/examples/elementary/main.vala b/BINDINGS/vala/examples/elementary/main.vala index 046e02a..d61a5ec 100644 --- a/BINDINGS/vala/examples/elementary/main.vala +++ b/BINDINGS/vala/examples/elementary/main.vala @@ -41,7 +41,7 @@ public int main( string[] args ) win.title_set( "Elementary meets Vala" ); win.autodel_set( true ); win.resize( 320, 320 ); - win.smart_callback_add( "delete-request", Elm.exit ); + win.smart_callback_add( "delete,request", Elm.exit ); /* var bg = new Bg( win ); diff --git a/BINDINGS/vala/examples/library/application/application.vala b/BINDINGS/vala/examples/library/application/application.vala index d72eee7..66fe9bb 100644 --- a/BINDINGS/vala/examples/library/application/application.vala +++ b/BINDINGS/vala/examples/library/application/application.vala @@ -38,7 +38,7 @@ class DemoApplication : EflVala.Application win.title_set( "Elementary meets Vala" ); win.autodel_set( true ); win.resize( 320, 320 ); - win.smart_callback_add( "delete-request", this.quit ); + win.smart_callback_add( "delete,request", this.quit ); win.show(); layout = new Elm.Layout( win ); diff --git a/BINDINGS/vala/examples/library/dialer/dialer.vala b/BINDINGS/vala/examples/library/dialer/dialer.vala index d72eee7..66fe9bb 100644 --- a/BINDINGS/vala/examples/library/dialer/dialer.vala +++ b/BINDINGS/vala/examples/library/dialer/dialer.vala @@ -38,7 +38,7 @@ class DemoApplication : EflVala.Application win.title_set( "Elementary meets Vala" ); win.autodel_set( true ); win.resize( 320, 320 ); - win.smart_callback_add( "delete-request", this.quit ); + win.smart_callback_add( "delete,request", this.quit ); win.show(); layout = new Elm.Layout( win ); diff --git a/BINDINGS/vala/examples/library/viewstates/viewstates.vala b/BINDINGS/vala/examples/library/viewstates/viewstates.vala index 888971c..f531fab 100644 --- a/BINDINGS/vala/examples/library/viewstates/viewstates.vala +++ b/BINDINGS/vala/examples/library/viewstates/viewstates.vala @@ -87,7 +87,7 @@ static int main(string[] args) win.title_set("Elementary StateMachine"); win.autodel_set(true); win.resize(320, 320); - win.smart_callback_add("delete-request", Elm.exit); + win.smart_callback_add("delete,request", Elm.exit); Elm.Bg bg = new Elm.Bg(win); bg.size_hint_weight_set(1.0, 1.0); diff --git a/EXAMPLES/elementary/calculator/src/bin/main.c b/EXAMPLES/elementary/calculator/src/bin/main.c index 6a2f9fb..f16b844 100644 --- a/EXAMPLES/elementary/calculator/src/bin/main.c +++ b/EXAMPLES/elementary/calculator/src/bin/main.c @@ -167,7 +167,7 @@ create_main_win(App *app) } elm_win_title_set(app->win, "Edje Calculator"); evas_object_smart_callback_add - (app->win, "delete-request", on_win_del_req, NULL); + (app->win, "delete,request", on_win_del_req, NULL); app->bg = elm_bg_add(app->win); if (!app->bg) diff --git a/EXAMPLES/elementary/converter/src/bin/main.c b/EXAMPLES/elementary/converter/src/bin/main.c index d2cb643..1f69f25 100644 --- a/EXAMPLES/elementary/converter/src/bin/main.c +++ b/EXAMPLES/elementary/converter/src/bin/main.c @@ -45,7 +45,7 @@ elm_main(int argc, char **argv) bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_smart_callback_add(win, "delete-request", + evas_object_smart_callback_add(win, "delete,request", _win_delete_request, NULL); evas_object_show(bg); diff --git a/EXAMPLES/elementary/phonebook/src/bin/main.c b/EXAMPLES/elementary/phonebook/src/bin/main.c index deb7673..7c19bff 100644 --- a/EXAMPLES/elementary/phonebook/src/bin/main.c +++ b/EXAMPLES/elementary/phonebook/src/bin/main.c @@ -338,7 +338,7 @@ create_win(){ elm_win_title_set(win, "Phone Book"); /* Register the callback for close window function */ - evas_object_smart_callback_add(win, "delete-request", on_win_del_req, NULL); + evas_object_smart_callback_add(win, "delete,request", on_win_del_req, NULL); /* Add Back Ground */ bg = elm_bg_add(win); diff --git a/EXAMPLES/elementary/sticky-notes/src/bin/gui.c b/EXAMPLES/elementary/sticky-notes/src/bin/gui.c index 61c129f..e6488fb 100644 --- a/EXAMPLES/elementary/sticky-notes/src/bin/gui.c +++ b/EXAMPLES/elementary/sticky-notes/src/bin/gui.c @@ -121,7 +121,7 @@ edit_note_window_new(Evas_Object *list, Elm_List_Item *selection, Db *db) note_window = elm_win_add(NULL, "sticky-notes-add-note", ELM_WIN_BASIC); elm_win_autodel_set(note_window, 1); elm_win_title_set(note_window, "Add Note"); - evas_object_smart_callback_add(note_window, "delete-request", _edit_note_cb_delete_request, gui); + evas_object_smart_callback_add(note_window, "delete,request", _edit_note_cb_delete_request, gui); evas_object_resize(note_window, 200, 100); background = elm_bg_add(note_window); diff --git a/EXAMPLES/elementary/sticky-notes/src/bin/main.c b/EXAMPLES/elementary/sticky-notes/src/bin/main.c index 2404bc5..0bb70e9 100644 --- a/EXAMPLES/elementary/sticky-notes/src/bin/main.c +++ b/EXAMPLES/elementary/sticky-notes/src/bin/main.c @@ -172,7 +172,7 @@ elm_main(int argc, char **argv) background = elm_bg_add(main_window); elm_win_resize_object_add(main_window, background); evas_object_size_hint_weight_set(background, 1.0, 1.0); - evas_object_smart_callback_add(main_window, "delete-request", + evas_object_smart_callback_add(main_window, "delete,request", _main_window_delete_request, NULL); evas_object_show(background); diff --git a/PROTO/elm_illume/src/bin/main.c b/PROTO/elm_illume/src/bin/main.c index d8ae0e0..ce97596 100644 --- a/PROTO/elm_illume/src/bin/main.c +++ b/PROTO/elm_illume/src/bin/main.c @@ -16,7 +16,7 @@ elm_main(int argc, char **argv) win = elm_win_add(NULL, "elm_illume", ELM_WIN_BASIC); elm_win_title_set(win, "Illume Conformant Window"); elm_win_conformant_set(win, 1); - evas_object_smart_callback_add(win, "delete-request", _cb_win_del, NULL); + evas_object_smart_callback_add(win, "delete,request", _cb_win_del, NULL); bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/PROTO/elm_indicator/src/bin/elm_ind_win.c b/PROTO/elm_indicator/src/bin/elm_ind_win.c index 40f2fb4..9b9fdd5 100644 --- a/PROTO/elm_indicator/src/bin/elm_ind_win.c +++ b/PROTO/elm_indicator/src/bin/elm_ind_win.c @@ -32,7 +32,7 @@ elm_ind_win_new(Ecore_X_Window zone) iwin->win = elm_win_add(NULL, "Illume-Indicator", ELM_WIN_DOCK); evas_object_data_set(iwin->win, "zone", (const void *)zone); elm_win_title_set(iwin->win, "Illume Indicator"); - evas_object_smart_callback_add(iwin->win, "delete-request", + evas_object_smart_callback_add(iwin->win, "delete,request", _cb_win_del, iwin); xwin = elm_win_xwindow_get(iwin->win); diff --git a/PROTO/elm_kbd/src/bin/main.c b/PROTO/elm_kbd/src/bin/main.c index 26d976c..fb212d9 100644 --- a/PROTO/elm_kbd/src/bin/main.c +++ b/PROTO/elm_kbd/src/bin/main.c @@ -17,7 +17,7 @@ elm_main(int argc, char **argv) win = elm_win_add(NULL, "elm_kbd", ELM_WIN_BASIC); elm_win_title_set(win, "Elm Keyboard"); - evas_object_smart_callback_add(win, "delete-request", _cb_win_del, NULL); + evas_object_smart_callback_add(win, "delete,request", _cb_win_del, NULL); elm_win_keyboard_win_set(win, EINA_TRUE); xwin = elm_win_xwindow_get(win); diff --git a/PROTO/elm_softkey/src/bin/main.c b/PROTO/elm_softkey/src/bin/main.c index 5790324..4df736e 100644 --- a/PROTO/elm_softkey/src/bin/main.c +++ b/PROTO/elm_softkey/src/bin/main.c @@ -40,7 +40,7 @@ elm_main(int argc, char **argv) /* create new window */ win = elm_win_add(NULL, "Illume-Softkey", ELM_WIN_DOCK); elm_win_title_set(win, "Illume Softkey"); - evas_object_smart_callback_add(win, "delete-request", + evas_object_smart_callback_add(win, "delete,request", _cb_win_del, NULL); evas_object_data_set(win, "zone", (const void *)zones[x]); diff --git a/PROTO/emote/src/bin/em_config.c b/PROTO/emote/src/bin/em_config.c index 064164e..ff14120 100644 --- a/PROTO/emote/src/bin/em_config.c +++ b/PROTO/emote/src/bin/em_config.c @@ -164,7 +164,7 @@ _em_config_win_create(Evas_Object *parent) elm_win_add(parent, "emote::config", ELM_WIN_DIALOG_BASIC); elm_win_title_set(_em_config_win, _("Emote - Configuration")); elm_win_keyboard_mode_set(_em_config_win, ELM_WIN_KEYBOARD_ALPHA); - evas_object_smart_callback_add(_em_config_win, "delete-request", + evas_object_smart_callback_add(_em_config_win, "delete,request", _em_config_cb_win_del, NULL); o = elm_bg_add(_em_config_win); diff --git a/PROTO/emote/src/bin/em_gui.c b/PROTO/emote/src/bin/em_gui.c index a690aa1..1f96cfc 100644 --- a/PROTO/emote/src/bin/em_gui.c +++ b/PROTO/emote/src/bin/em_gui.c @@ -46,7 +46,7 @@ em_gui_init(void) gui->w_win = elm_win_add(NULL, "emote", ELM_WIN_BASIC); elm_win_title_set(gui->w_win, "Emote"); elm_win_keyboard_mode_set(gui->w_win, ELM_WIN_KEYBOARD_ALPHA); - evas_object_smart_callback_add(gui->w_win, "delete-request", + evas_object_smart_callback_add(gui->w_win, "delete,request", _em_gui_cb_win_del, NULL); /* create background */ diff --git a/PROTO/eupnp/examples/media_server_browser.c b/PROTO/eupnp/examples/media_server_browser.c index 6828380..459b5ea 100644 --- a/PROTO/eupnp/examples/media_server_browser.c +++ b/PROTO/eupnp/examples/media_server_browser.c @@ -385,7 +385,7 @@ av_browser_win_create(void) win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Enlightenment UPnP AV Browser"); - evas_object_smart_callback_add(win, "delete-request", av_browser_del, NULL); + evas_object_smart_callback_add(win, "delete,request", av_browser_del, NULL); bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/PROTO/eupnp/tools/igd/igd.c b/PROTO/eupnp/tools/igd/igd.c index c96b10f..fc93add 100644 --- a/PROTO/eupnp/tools/igd/igd.c +++ b/PROTO/eupnp/tools/igd/igd.c @@ -161,7 +161,7 @@ igd_client_win_create(void) Evas_Object *win, *bg, *bx0, *lb, *fr; win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Internet Gateway Device Controller"); - evas_object_smart_callback_add(win, "delete-request", igd_client_win_del, NULL); + evas_object_smart_callback_add(win, "delete,request", igd_client_win_del, NULL); bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, 1.0, 1.0); elm_win_resize_object_add(win, bg); diff --git a/PROTO/eupnp/tools/lighting/lighting_gui.c b/PROTO/eupnp/tools/lighting/lighting_gui.c index e9cf438..3989795 100644 --- a/PROTO/eupnp/tools/lighting/lighting_gui.c +++ b/PROTO/eupnp/tools/lighting/lighting_gui.c @@ -21,7 +21,7 @@ lighting_control_win_create(void) win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Lighting Controls"); - evas_object_smart_callback_add(win, "delete-request", lighting_control_win_del_cb, NULL); + evas_object_smart_callback_add(win, "delete,request", lighting_control_win_del_cb, NULL); Evas_Object *bg; bg = elm_bg_add(win); diff --git a/PROTO/eyelight_edit/src/bin/main.c b/PROTO/eyelight_edit/src/bin/main.c index c8ad140..590103a 100644 --- a/PROTO/eyelight_edit/src/bin/main.c +++ b/PROTO/eyelight_edit/src/bin/main.c @@ -38,7 +38,7 @@ static void win_main(void) win = elm_win_add(NULL, "Eyelight", ELM_WIN_BASIC); elm_win_title_set(win, "Eyelight - presentation viewer"); - evas_object_smart_callback_add(win, "delete-request", win_del, NULL); + evas_object_smart_callback_add(win, "delete,request", win_del, NULL); bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, 1.0, 1.0); diff --git a/TMP/st/elementary-alarm/src/bin/main.c b/TMP/st/elementary-alarm/src/bin/main.c index 5eb6a62..5df2b61 100644 --- a/TMP/st/elementary-alarm/src/bin/main.c +++ b/TMP/st/elementary-alarm/src/bin/main.c @@ -130,7 +130,7 @@ create_main_win(void) win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Set Alarm"); - evas_object_smart_callback_add(win, "delete-request", on_win_del_req, NULL); + evas_object_smart_callback_add(win, "delete,request", on_win_del_req, NULL); bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, 1.0, 1.0); // expand h/v 1/1 (for win this also fills) @@ -251,7 +251,7 @@ create_alarm_win(void) win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Alarm"); - evas_object_smart_callback_add(win, "delete-request", on_win_del_req, NULL); + evas_object_smart_callback_add(win, "delete,request", on_win_del_req, NULL); bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, 1.0, 1.0); // expand h/v 1/1 (for win this also fills) diff --git a/TMP/st/elementary-generator/main_templates/empty_window.c b/TMP/st/elementary-generator/main_templates/empty_window.c index 8e0e9f5..4fc9bc3 100644 --- a/TMP/st/elementary-generator/main_templates/empty_window.c +++ b/TMP/st/elementary-generator/main_templates/empty_window.c @@ -45,7 +45,7 @@ create_main_win(App *app) } elm_win_title_set(app->win, "@PROJECT@"); evas_object_smart_callback_add - (app->win, "delete-request", on_win_del_req, NULL); + (app->win, "delete,request", on_win_del_req, NULL); app->bg = elm_bg_add(app->win); if (!app->bg) diff --git a/TMP/st/elementary-generator/main_templates/frame_label_buttons.c b/TMP/st/elementary-generator/main_templates/frame_label_buttons.c index 71b7b5f..2206b12 100644 --- a/TMP/st/elementary-generator/main_templates/frame_label_buttons.c +++ b/TMP/st/elementary-generator/main_templates/frame_label_buttons.c @@ -70,7 +70,7 @@ create_main_win(App *app) } elm_win_title_set(app->win, "@PROJECT@"); evas_object_smart_callback_add - (app->win, "delete-request", on_win_del_req, NULL); + (app->win, "delete,request", on_win_del_req, NULL); app->bg = elm_bg_add(app->win); if (!app->bg) diff --git a/TMP/st/elementary-generator/main_templates/genlist_pager.c b/TMP/st/elementary-generator/main_templates/genlist_pager.c index a2a66d8..4d1ca8f 100644 --- a/TMP/st/elementary-generator/main_templates/genlist_pager.c +++ b/TMP/st/elementary-generator/main_templates/genlist_pager.c @@ -102,7 +102,7 @@ create_main_win(App *app) } elm_win_title_set(app->win, "@PROJECT@"); evas_object_smart_callback_add - (app->win, "delete-request", on_win_del_req, NULL); + (app->win, "delete,request", on_win_del_req, NULL); app->bg = elm_bg_add(app->win); if (!app->bg) diff --git a/TMP/st/elementary-generator/ui.c b/TMP/st/elementary-generator/ui.c index 906be36..f770630 100644 --- a/TMP/st/elementary-generator/ui.c +++ b/TMP/st/elementary-generator/ui.c @@ -533,7 +533,7 @@ create_main_win(App *app) } elm_win_title_set(app->win, "Elementary Project Generator"); evas_object_smart_callback_add - (app->win, "delete-request", on_win_del_req, app); + (app->win, "delete,request", on_win_del_req, app); app->bg = elm_bg_add(app->win); if (!app->bg) diff --git a/TMP/st/elementary-presenter/src/bin/main.c b/TMP/st/elementary-presenter/src/bin/main.c index 7b03dd3..8297bac 100644 --- a/TMP/st/elementary-presenter/src/bin/main.c +++ b/TMP/st/elementary-presenter/src/bin/main.c @@ -558,7 +558,7 @@ create_main_win(void) win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Elementary Presenter"); - evas_object_smart_callback_add(win, "delete-request", on_win_del_req, NULL); + evas_object_smart_callback_add(win, "delete,request", on_win_del_req, NULL); evas_object_key_grab(win, "space", 0, 0, 0); evas_object_key_grab(win, "Return", 0, 0, 0); diff --git a/TMP/st/elementary-sms/src/bin/list.c b/TMP/st/elementary-sms/src/bin/list.c index 0e40b9b..cd11e18 100644 --- a/TMP/st/elementary-sms/src/bin/list.c +++ b/TMP/st/elementary-sms/src/bin/list.c @@ -826,7 +826,7 @@ create_main_win(void) win = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(win, "Messages"); - evas_object_smart_callback_add(win, "delete-request", on_win_del_req, NULL); + evas_object_smart_callback_add(win, "delete,request", on_win_del_req, NULL); window = win; diff --git a/edje_viewer/src/bin/edje_viewer_gui.c b/edje_viewer/src/bin/edje_viewer_gui.c index 92879a3..69fe9ef 100644 --- a/edje_viewer/src/bin/edje_viewer_gui.c +++ b/edje_viewer/src/bin/edje_viewer_gui.c @@ -67,7 +67,7 @@ create_main_win(Viewer *v) o = elm_win_add(NULL, "main", ELM_WIN_BASIC); elm_win_title_set(o, "Edje Viewer"); - evas_object_smart_callback_add(o, "delete-request", on_win_del_req, v); + evas_object_smart_callback_add(o, "delete,request", on_win_del_req, v); evas_object_resize(o, 600, 400); v->gui.win = o; diff --git a/elmdentica/src/elmdentica.c b/elmdentica/src/elmdentica.c index 2163fee..ed69b12 100644 --- a/elmdentica/src/elmdentica.c +++ b/elmdentica/src/elmdentica.c @@ -574,7 +574,7 @@ void user_show(void *data) { evas_object_size_hint_min_set(ud->win, 480, 480); evas_object_size_hint_max_set(ud->win, 640, 640); elm_win_title_set(ud->win, ud->au->user->name); - evas_object_smart_callback_add(ud->win, "delete-request", user_win_del, ud); + evas_object_smart_callback_add(ud->win, "delete,request", user_win_del, ud); bg = elm_bg_add(ud->win); evas_object_size_hint_weight_set(bg, 1, 1); @@ -709,7 +709,7 @@ static void group_show(void *data) { evas_object_name_set(gd->win, "group_win"); elm_win_title_set(gd->win, gd->group->fullname); - evas_object_smart_callback_add(gd->win, "delete-request", group_win_del, gd); + evas_object_smart_callback_add(gd->win, "delete,request", group_win_del, gd); bg = elm_bg_add(gd->win); evas_object_size_hint_weight_set(bg, 1, 1); @@ -1586,7 +1586,7 @@ void show_error(StatusesList * statuses) { /* Error Window */ error_win = elm_win_add(NULL, _("Error"), ELM_WIN_DIALOG_BASIC); elm_win_title_set(error_win, _("ยต-blog Error")); - evas_object_smart_callback_add(error_win, "delete-request", error_win_del, (void*)error_win); + evas_object_smart_callback_add(error_win, "delete,request", error_win_del, (void*)error_win); /* Background */ bg = elm_bg_add(error_win); @@ -2049,7 +2049,7 @@ EAPI int elm_main(int argc, char **argv) #endif gui.win = elm_win_add(NULL, "elmdentica", ELM_WIN_BASIC); - evas_object_smart_callback_add(gui.win, "delete-request", win_del, NULL); + evas_object_smart_callback_add(gui.win, "delete,request", win_del, NULL); evas_object_size_hint_min_set(gui.win, 480, 480); evas_object_size_hint_max_set(gui.win, 640, 640); diff --git a/elmdentica/src/settings.c b/elmdentica/src/settings.c index a82c942..be5acdb 100644 --- a/elmdentica/src/settings.c +++ b/elmdentica/src/settings.c @@ -589,7 +589,7 @@ static int account_edit(void *data, int argc, char **argv, char **azColName) { user_data_dialog = elm_win_inwin_add(settings_win); if(user_data_dialog) { - evas_object_smart_callback_add(user_data_dialog, "delete-request", user_data_dialog_win_del, NULL); + evas_object_smart_callback_add(user_data_dialog, "delete,request", user_data_dialog_win_del, NULL); if(strlen(proto) == 5 && strncmp("https", proto, 5) == 0) box = account_dialog(user_data_dialog, screen_name, password, type, TRUE, domain, base_url, enabled, (Evas_Object*)data, receive, send); @@ -631,7 +631,7 @@ void on_account_add(void *data, Evas_Object *obj, void *event_info) { user_data_dialog = elm_win_inwin_add(settings_win); if(user_data_dialog) { - evas_object_smart_callback_add(user_data_dialog, "delete-request", user_data_dialog_win_del, NULL); + evas_object_smart_callback_add(user_data_dialog, "delete,request", user_data_dialog_win_del, NULL); box = account_dialog(user_data_dialog, "", "", ACCOUNT_TYPE_NONE, TRUE, "", "/", TRUE, (Evas_Object*)data, 1, 1); if(box) { @@ -1230,7 +1230,7 @@ Evas_Object * gag_edit_widgets(char *pattern) { evas_object_size_hint_weight_set(inwin, 1, 1); evas_object_size_hint_align_set(inwin, -1, 1); - evas_object_smart_callback_add(inwin, "delete-request", on_gag_dialog_win_del, NULL); + evas_object_smart_callback_add(inwin, "delete,request", on_gag_dialog_win_del, NULL); box = elm_box_add(settings_win); evas_object_size_hint_weight_set(box, 1, 1); @@ -1426,7 +1426,7 @@ void on_settings(void *data, Evas_Object *obj, void *event_info) { settings_win = elm_win_add(NULL, _("Settings"), ELM_WIN_BASIC); elm_win_title_set(settings_win, _("ElmDentica settings...")); - evas_object_smart_callback_add(settings_win, "delete-request", settings_win_del, NULL); + evas_object_smart_callback_add(settings_win, "delete,request", settings_win_del, NULL); /* Background */ bg = elm_bg_add(settings_win); diff --git a/ensure/src/display.c b/ensure/src/display.c index a701969..286e6f6 100644 --- a/ensure/src/display.c +++ b/ensure/src/display.c @@ -93,7 +93,7 @@ display_enobj_cb(void *enobjv, Evas_Object *obj __UNUSED__, void *event __UNUSED enobj->win = win; elm_win_title_set(win, buf); elm_win_autodel_set(win, true); - evas_object_smart_callback_add(win, "delete-request", enobj_del, enobj); + evas_object_smart_callback_add(win, "delete,request", enobj_del, enobj); bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); diff --git a/envision/src/bin/main.c b/envision/src/bin/main.c index db4351d..9e4a411 100644 --- a/envision/src/bin/main.c +++ b/envision/src/bin/main.c @@ -821,7 +821,7 @@ create_main_win(App *app) evas_object_resize(app->win, 480, 640); elm_win_title_set(app->win, "Envision"); evas_object_smart_callback_add - (app->win, "delete-request", on_win_del_req, app); + (app->win, "delete,request", on_win_del_req, app); elm_win_autodel_set(app->win, EINA_TRUE); /* Background */ diff --git a/exactness/src/bin/test_index.c b/exactness/src/bin/test_index.c index 34d02b7..9d4ad52 100644 --- a/exactness/src/bin/test_index.c +++ b/exactness/src/bin/test_index.c @@ -296,7 +296,7 @@ TEST_START(test_index2) gui = malloc(sizeof(*gui)); - evas_object_smart_callback_add(win, "delete-request", test_index2_del, gui); + evas_object_smart_callback_add(win, "delete,request", test_index2_del, gui); bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); -- 1.7.8.1
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
