Hello,
please find attached the necessary patch for the language module due
to the Ecore API event callback modifications (int -> Eina_Bool).
Thanks,
Leif
Index: src/e_mod_lang.c
===================================================================
--- src/e_mod_lang.c (Revision 50125)
+++ src/e_mod_lang.c (Arbeitskopie)
@@ -612,7 +612,7 @@
cfg->language_predef_list = eina_list_sort(cfg->language_predef_list,
eina_list_count(cfg->language_predef_list),
- _lang_predef_language_sort_cb);
+ (Eina_Compare_Cb)_lang_predef_language_sort_cb);
}
static void
_lang_free_predef_language(Language_Predef *lp)
@@ -740,7 +740,7 @@
return 1;
}
/********************** event callbacks ***************************************/
-int
+Eina_Bool
lang_cb_event_desk_show(void *data, int type, void *event)
{
E_Event_Desk_Show *ev;
@@ -748,7 +748,7 @@
Eina_List *l;
E_Border *bd;
- if (!(conf = data)) return 1;
+ if (!(conf = data)) return ECORE_CALLBACK_RENEW;
ev = event;
// Actually this code should be executed only if WINDOW ir APPLICATION policy
@@ -758,7 +758,7 @@
e_module_dialog_show(NULL, "Warning", "Warning: This is a bug in the code. This message<br>"
"should in this context when GLOBAL policy is used.<br>"
"Please report this behaviour.");
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
for (l = e_border_focus_stack_get(); l; l = l->next)
@@ -776,10 +776,10 @@
if (!bd && conf->language_selector)
lang_language_switch_to(conf, 0);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-int
+Eina_Bool
lang_cb_event_border_focus_in(void *data, int type, void *ev)
{
Border_Language_Settings *bls;
@@ -791,7 +791,7 @@
conf = data;
if (conf->l.current == e->border)
- return 1;
+ return ECORE_CALLBACK_RENEW;
else
conf->l.current = e->border;
@@ -819,9 +819,10 @@
language_face_language_indicator_update();
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-int
+
+Eina_Bool
lang_cb_event_border_remove(void *data, int type, void *ev)
{
E_Event_Border_Remove *e;
@@ -849,10 +850,10 @@
if (!e_border_focused_get() && conf->language_selector)
lang_language_switch_to(conf, 0);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-int
+Eina_Bool
lang_cb_event_border_iconify(void *data, int type, void *ev)
{
E_Event_Border_Iconify *e;
@@ -864,11 +865,5 @@
if (!e_border_focused_get() && conf->language_selector)
lang_language_switch_to(conf, 0);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-
-
-
-
-
-
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel