[EGIT] [apps/econnman] master 01/01: Add support for IPv6

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/apps/econnman.git/commit/?id=18e7be6bf80df6b86965ba93391b205339fc7267

commit 18e7be6bf80df6b86965ba93391b205339fc7267
Author: Kai Huuhko 
Date:   Sat Mar 5 08:20:56 2016 +0200

Add support for IPv6
---
 econnman-bin.in | 212 
 1 file changed, 197 insertions(+), 15 deletions(-)

diff --git a/econnman-bin.in b/econnman-bin.in
index 2715f1d..4f23acb 100755
--- a/econnman-bin.in
+++ b/econnman-bin.in
@@ -56,10 +56,10 @@ except:
 
 dbus_ml = DBusEcoreMainLoop()
 bus = dbus.SystemBus(mainloop=dbus_ml)
-log = logging.getLogger("econnman")
+log = logging.getLogger("econnman-bin")
 log_handler = logging.StreamHandler()
 log_formatter = logging.Formatter(
-"%(relativeCreated)d %(levelname)s %(name)s: %(message)s"
+"%(created)d %(name)s [%(levelname)s]:: %(message)s (@lineno %(lineno)d)"
 )
 log_handler.setFormatter(log_formatter)
 log.addHandler(log_handler)
@@ -347,6 +347,20 @@ class ObjectView(object):
 sc.callback_changed_add(callback)
 return sc, items
 
+def add_label_and_segment_control(self, box, options, callback, label):
+lb = self.add_label(box, label)
+
+sc = SegmentControl(box)
+sc.size_hint_weight = EXPAND_HORIZ
+sc.size_hint_align = FILL_BOTH
+items = {}
+for o in options:
+items[o] = sc.item_add(None, o)
+sc.show()
+box.pack_end(sc)
+sc.callback_changed_add(callback)
+return lb, sc, items
+
 def add_frame_and_box(self, box, label):
 fr = Frame(box)
 fr.size_hint_weight = EXPAND_HORIZ
@@ -925,6 +939,28 @@ class ServiceView(ObjectView):
 """
 bus_interface = "net.connman.Service"
 
+ipv4_fields = (#("Method", "ipv4_method"),
+   ("Address", "ipv4_address"),
+   ("Netmask", "ipv4_netmask"),
+   ("Gateway", "ipv4_gateway"),
+   )
+ipv6_fields = (#("Method", "ipv6_method"),
+   ("Address", "ipv6_address"),
+   ("Prefix Length", "ipv6_prefix_length"),
+   ("Gateway", "ipv6_gateway"),
+   #("Privacy", "ipv6_privacy"),
+   )
+proxy_fields = (("Method", "proxy_method"),
+("URL", "proxy_url"),
+("Servers", "proxy_servers"),
+("Excludes", "proxy_excludes"),
+)
+vpn_fields = (  # named Provider in spec
+  ("Host", "vpn_host"),
+  ("Domain", "vpn_domain"),
+  ("Name", "vpn_name"),
+  ("Type", "vpn_type"),
+  )
 eth_fields = (("Method", "eth_method"),
   ("Interface", "eth_iface"),
   ("Address", "eth_addr"),
@@ -932,15 +968,6 @@ class ServiceView(ObjectView):
   ("Speed", "eth_speed"),
   ("Duplex", "eth_duplex"),
   )
-vpn_fields = (("Host", "vpn_host"),
-  ("Domain", "vpn_domain"),
-  ("Name", "vpn_name"),
-  ("Type", "vpn_type"),
-  )
-ipv4_fields = (("Address", "ipv4_address"),
-   ("Netmask", "ipv4_netmask"),
-   ("Gateway", "ipv4_gateway"),
-   )
 
 top_widgets = (
 "connect",
@@ -959,6 +986,7 @@ class ServiceView(ObjectView):
 "domains_label",
 "domains_entry",
 "ipv4_frame",
+"ipv6_frame",
 "proxy_frame",
 "ethernet_frame",
 "vpn_frame",
@@ -1033,10 +1061,22 @@ class ServiceView(ObjectView):
 en.callback_unfocused_add(self._on_ipv4_property_unfocused)
 setattr(self, attr, en)
 
-# section: IPv6: similar to ipv4? refactor ipv4?
-if properties.get("IPv6"):
-fr, bx = self.add_frame_and_box(self.box, "IPv6")
-lb = self.add_label(bx, "TODO")
+# section: IPv6
+self.ipv6_properties = {"IPv6": {}, "IPv6.Configuration": {}}
+fr, bx = self.add_frame_and_box(self.box, "IPv6")
+self.ipv6_frame = fr
+self.ipv6_box = bx
+options = ("Automatic", "Manual", "Off")
+self.ipv6_method, self.ipv6_method_items = self.add_segment_control(
+bx, options, self._on_ipv6_method)
+for name, attr in self.ipv6_fields:
+lb, en = self.add_label_and_entry(bx, name)
+en.callback_activated_add(self._on_ipv6_property_changed)
+en.callback_unfocused_add(self._on_ipv6_property_unfocused)
+setattr(self, attr, en)
+options = ("Disabled", "Enabled", "Prefered")
+self.ipv6_privacy_lb, self.ipv6_privacy, self.ipv6_privacy_items = 
self.add_label_and_segment_control(
+bx, options, self._on_ipv6_privacy, "Privacy")
 
 # section: Proxy: custom contents 

[EGIT] [tools/enventor] master 01/01: edj_viewer: fix a problem that live view failed to update images.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=3f8dfe944c4477a20bb1997ca48e52c1473c2f27

commit 3f8dfe944c4477a20bb1997ca48e52c1473c2f27
Author: Hermet Park 
Date:   Sat Mar 5 13:02:18 2016 +0900

edj_viewer: fix a problem that live view failed to update images.

This problem scenario belongs to the image modification by an other process.
If an image size is very huge, live view possibly lost the image monitoring
because of asynchorous file handling.

Here solution is to update images repeatedly for those unexpected case.

@fix T3094
---
 src/lib/edj_viewer.c | 109 +--
 1 file changed, 88 insertions(+), 21 deletions(-)

diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 0bd8d03..0a24dea 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -25,7 +25,9 @@ struct viewer_s
 
Ecore_Idler *idler;
Ecore_Animator *animator;
-   Ecore_Timer *timer;
+   Ecore_Timer *update_img_timer;
+   Ecore_Timer *update_edj_timer;
+   Ecore_Timer *edj_monitor_timer;
Eio_Monitor *edj_monitor;
Eina_List *img_monitors;
Eina_List *part_names;
@@ -63,15 +65,14 @@ exe_del_event_cb(void *data, int type, void *even);
 /*/
 
 static Eina_Bool
-img_changed_animator_cb(void *data)
+img_changed_timer_cb(void *data)
 {
view_data *vd = data;
Eina_File *file = eina_file_open(eio_monitor_path_get(vd->img_monitor),
 EINA_FALSE);
if (!file) return ECORE_CALLBACK_RENEW;
-
vd->edj_reload_need = EINA_TRUE;
-   vd->timer = NULL;
+   vd->update_img_timer = NULL;
vd->img_monitor = NULL;
build_edc();
eina_file_close(file);
@@ -89,8 +90,11 @@ img_changed_cb(void *data, int type EINA_UNUSED, void *event)
  {
 if (ev->monitor != monitor) continue;
 vd->img_monitor = monitor;
-ecore_timer_del(vd->timer);
-vd->timer = ecore_timer_add(0.025, img_changed_animator_cb, vd);
+ecore_timer_del(vd->update_img_timer);
+//FIXME: here 0.5 was confirmed by experimental way. But we need to
+//decide the time size based on the image file size in order that
+//we could update small images quickly but large images slowly.
+vd->update_img_timer = ecore_timer_add(1, img_changed_timer_cb, vd);
 return ECORE_CALLBACK_DONE;
  }
return ECORE_CALLBACK_PASS_ON;
@@ -353,21 +357,9 @@ view_obj_parts_callbacks_set(view_data *vd)
edje_edit_string_list_free(parts);
 }
 
-static Eina_Bool
-exe_del_event_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
+static void
+update_edj_file_internal(view_data *vd)
 {
-   view_data *vd = data;
-
-   if (!vd->edj_reload_need) return ECORE_CALLBACK_PASS_ON;
-
-   if (!edje_object_file_set(vd->layout, build_edj_path_get(), vd->group_name))
- {
-vd->del_cb(vd->data);
-view_term(vd);
-EINA_LOG_ERR("Failed to load edj file \"%s\"", build_edj_path_get());
-return ECORE_CALLBACK_DONE;
- }
-
view_images_monitor_set(vd);
view_obj_min_update(vd);
view_part_highlight_set(vd, vd->part_name);
@@ -382,11 +374,73 @@ exe_del_event_cb(void *data, int type EINA_UNUSED, void 
*event EINA_UNUSED)
 
evas_object_smart_callback_call(vd->enventor, SIG_LIVE_VIEW_UPDATED,
edj_mgr_obj_get());
+}
+
+static Eina_Bool
+update_edj_file(void *data)
+{
+   view_data *vd = data;
+
+   if (!vd->edj_reload_need)
+ {
+vd->update_edj_timer = NULL;
+return ECORE_CALLBACK_DONE;
+ }
+
+   //wait for whether edj is generated completely.
+   Eina_File *file = eina_file_open(build_edj_path_get(), EINA_FALSE);
+   if (!file) return ECORE_CALLBACK_RENEW;
+   eina_file_close(file);
+
+   //Failed to load edj? I have no idea. Try again.
+   if (!edje_object_file_set(vd->layout, build_edj_path_get(), vd->group_name))
+ return ECORE_CALLBACK_RENEW;
+
+   update_edj_file_internal(vd);
+   vd->update_edj_timer = NULL;
+
+   return ECORE_CALLBACK_DONE;
+}
+
+static Eina_Bool
+exe_del_event_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
+{
+   view_data *vd = data;
+
+   if (!vd->edj_reload_need) return ECORE_CALLBACK_PASS_ON;
+
+   //Failed to load edj? I have no idea. Try again.
+   if (!edje_object_file_set(vd->layout, build_edj_path_get(), vd->group_name))
+ {
+ecore_timer_del(vd->update_edj_timer);
+vd->update_edj_timer = ecore_timer_add(0.25, update_edj_file, vd);
+return ECORE_CALLBACK_PASS_ON;
+ }
+
+   update_edj_file_internal(vd);
 
return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
+edj_monitor_timer_cb(void *data)
+{
+   view_data *vd = data;
+
+   Eina_File *file = eina_file_open(build_edj_path_get(), EINA_FALSE);
+   if (!file) return ECORE_CALLBACK_PASS_ON;
+   

[EGIT] [tools/enventor] master 01/01: remove compile warnings.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=964a31831d0e3fd342fdf0f024647896b1dda375

commit 964a31831d0e3fd342fdf0f024647896b1dda375
Author: Hermet Park 
Date:   Sat Mar 5 11:49:12 2016 +0900

remove compile warnings.

1. unused variable.
2. compare signed and unsigned
3. undelcared function call.
---
 src/bin/edc_navigator.c | 10 ++
 src/include/common.h|  3 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index dcd81bc..bf00cad 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -1,5 +1,8 @@
 #include "common.h"
 
+#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
+#include 
+
 typedef struct edc_navigator_s
 {
Evas_Object *genlist;
@@ -536,10 +539,9 @@ gl_program_content_get_cb(void *data EINA_UNUSED, 
Evas_Object *obj,
 
 
 static void
-gl_program_selected_cb(void *data, Evas_Object *obj EINA_UNUSED,
+gl_program_selected_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
 {
-   navi_data *nd = data;
Elm_Object_Item *it = event_info;
find_program_proc(stats_group_name_get(), elm_object_item_text_get(it));
 }
@@ -826,7 +828,7 @@ edc_navigator_group_update(const char *cur_group)
 
//Find a current group item and select it.
Elm_Object_Item *group_it = NULL;
-   int cur_group_len = strlen(cur_group);
+   unsigned int cur_group_len = strlen(cur_group);
 
EINA_LIST_FOREACH(nd->group_items, l, it)
  {
@@ -878,7 +880,7 @@ edc_navigator_reload(const char *cur_group)
Eina_List *l;
char *name;
Elm_Object_Item *it;
-   int cur_group_len = strlen(cur_group);
+   unsigned int cur_group_len = strlen(cur_group);
 
EINA_LIST_FOREACH(nd->group_list, l, name)
  {
diff --git a/src/include/common.h b/src/include/common.h
index fc319d7..907e280 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -1,9 +1,6 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-typedef struct statusbar_s stats_data;
-
-
 #define ENVENTOR_HELP_EXAMPLES \
 "Examples of Enventor command line usage:\n \
 $ enventor\n \

-- 

[EGIT] [tools/enventor] master 01/01: remove compile warnings.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=6428fd4ede06400d53cbaa2d82f27fd6ef07f158

commit 6428fd4ede06400d53cbaa2d82f27fd6ef07f158
Author: Hermet Park 
Date:   Sat Mar 5 11:40:18 2016 +0900

remove compile warnings.

insert brackets to declare structure initial values clearly.
---
 src/lib/ctxpopup.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c
index 9d3b160..5c7469f 100644
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@@ -43,16 +43,16 @@ typedef struct preset_colors_data_s
 
 static rgba_value preset_cur_color;
 static preset_colors_data preset_colors =
-   { 0,
- 255, 0, 0, 255,
- 0, 255, 0, 255,
- 0, 0, 255, 255,
- 255, 255, 0, 255,
- 255, 0, 255, 255,
- 0, 255, 255, 255,
- 0, 0, 0, 255,
- 255, 255, 255, 255,
- 128, 128, 128, 255};
+   { EINA_FALSE,
+ {{255, 0, 0, 255},
+  {0, 255, 0, 255},
+  {0, 0, 255, 255},
+  {255, 255, 0, 255},
+  {255, 0, 255, 255},
+  {0, 255, 255, 255},
+  {0, 0, 0, 255},
+  {255, 255, 255, 255},
+  {128, 128, 128, 255}}};
 
 /*/
 /* Internal method implementation*/

-- 

[EGIT] [tools/enventor] master 01/01: remove unused compile warnings.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=6d2b4a01b415015e8d14617d8842725b6297bac9

commit 6d2b4a01b415015e8d14617d8842725b6297bac9
Author: Hermet Park 
Date:   Sat Mar 5 11:27:24 2016 +0900

remove unused compile warnings.
---
 src/bin/main.c   | 27 +++
 src/bin/menu.c   |  3 +--
 src/bin/statusbar.c  | 12 
 src/bin/tools.c  |  6 +++---
 src/lib/ctxpopup.c   | 34 ++
 src/lib/edc_parser.c |  1 -
 src/lib/edj_viewer.c |  1 -
 7 files changed, 25 insertions(+), 59 deletions(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index a46459f..64f70b3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -168,9 +168,9 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
 scale = config_view_scale_get();
 enventor_object_live_view_scale_set(ad->enventor, scale);
 
-Evas_Coord w, h;
-config_view_size_get(, );
-enventor_object_live_view_size_set(base_enventor_get(), w, h);
+Evas_Coord ww, hh;
+config_view_size_get(, );
+enventor_object_live_view_size_set(base_enventor_get(), ww, hh);
 
 //Just in live edit mode case.
 live_edit_update();
@@ -211,7 +211,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
 }
 
 static Evas_Object *
-tools_set(Evas_Object *enventor)
+tools_set(void)
 {
Evas_Object *tools = tools_init(base_layout_get());
base_tools_set(tools);
@@ -388,7 +388,8 @@ elm_setup()
 }
 
 static void
-enventor_cursor_line_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+enventor_cursor_line_changed_cb(void *data EINA_UNUSED,
+Evas_Object *obj EINA_UNUSED,
 void *event_info)
 {
Enventor_Cursor_Line *cur_line = (Enventor_Cursor_Line *)event_info;
@@ -456,7 +457,9 @@ enventor_program_run_cb(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
 }
 
 static void
-enventor_ctxpopup_activated_cb(void *data, Evas_Object *obj, void *event_info)
+enventor_ctxpopup_activated_cb(void *data EINA_UNUSED,
+   Evas_Object *obj EINA_UNUSED,
+   void *event_info)
 {
Enventor_Ctxpopup_Type type = (Enventor_Ctxpopup_Type) event_info;
 
@@ -817,7 +820,7 @@ statusbar_set()
 }
 
 static void
-live_edit_set(Evas_Object *enventor, Evas_Object *tools)
+live_edit_set(Evas_Object *tools)
 {
Evas_Object *trigger = tools_live_edit_get(tools);
live_edit_init(trigger);
@@ -903,8 +906,8 @@ init(app_data *ad, int argc, char **argv)
statusbar_set();
enventor_setup(ad);
file_mgr_init();
-   Evas_Object *tools = tools_set(ad->enventor);
-   live_edit_set(ad->enventor, tools);
+   Evas_Object *tools = tools_set();
+   live_edit_set(tools);
 
base_gui_show();
 
@@ -927,7 +930,7 @@ init(app_data *ad, int argc, char **argv)
 }
 
 static void
-term(app_data *ad)
+term(void)
 {
menu_term();
live_edit_term();
@@ -947,13 +950,13 @@ int elm_main(int argc, char **argv)
 
if (!init(, argc, argv))
  {
-term();
+term();
 return 0;
  }
 
elm_run();
 
-   term();
+   term();
 
return 0;
 }
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 3894480..ae20669 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -315,10 +315,9 @@ exit_yes_btn_cb(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED,
 }
 
 static void
-exit_save_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
+exit_save_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
  void *event_info EINA_UNUSED)
 {
-   menu_data *md = data;
enventor_object_save(base_enventor_get(), config_input_path_get());
elm_exit();
 }
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 564c1f8..6d68fcb 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -27,12 +27,9 @@ stats_data *g_sd = NULL;
 /*/
 
 static void
-view_scale_slider_changed_cb(void *data, Evas_Object *obj,
+view_scale_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
  void *event_info EINA_UNUSED)
 {
-
-   stats_data *sd = data;
-
double scale = elm_slider_value_get(obj);
double rounded = ROUNDING(scale, 1);
 
@@ -88,10 +85,9 @@ view_invert_transit_end(void *data, Elm_Transit *transit 
EINA_UNUSED)
 }
 
 static void
-view_invert_btn_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+   void *event_info EINA_UNUSED)
 {
-   stats_data *sd = data;
-
invert_data *id = malloc(sizeof(invert_data));
 
Evas_Coord w, h;
@@ -110,7 +106,7 @@ view_invert_btn_cb(void *data, Evas_Object *obj, void 
*event_info EINA_UNUSED)
 }
 
 static void
-view_resize_slider_changed_cb(void *data, Evas_Object *obj,

[EGIT] [tools/enventor] master 01/01: editor: don't auto save always.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=3a2c08e6c5240f708cf67c208eaee66af7b68463

commit 3a2c08e6c5240f708cf67c208eaee66af7b68463
Author: Hermet Park 
Date:   Sat Mar 5 11:17:15 2016 +0900

editor: don't auto save always.

If save has been accomplished, we can skip a auto save.

This auto save brings enventor unexpected error highlighting twice.
---
 src/lib/edc_editor.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 4eabad7..af96fbc 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1122,8 +1122,13 @@ static Eina_Bool
 auto_save_timer_cb(void *data)
 {
edit_data *ed = data;
-   edit_save(ed, build_edc_path_get());
-   build_edc();
+
+   //Avoid auto save if save has been already accomplished.
+   if (ed->edit_changed)
+ {
+edit_save(ed, build_edc_path_get());
+build_edc();
+ }
ed->auto_save_timer = NULL;
return ECORE_CALLBACK_CANCEL;
 }

-- 

[EGIT] [tools/enventor] master 01/01: editor: restore error underline style.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=5900c6ac379533807789b23bd2e0ba5e26e10400

commit 5900c6ac379533807789b23bd2e0ba5e26e10400
Author: Hermet Park 
Date:   Sat Mar 5 11:13:35 2016 +0900

editor: restore error underline style.
---
 data/themes/default/theme_ext.edc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/themes/default/theme_ext.edc 
b/data/themes/default/theme_ext.edc
index 67362b3..5ad9e0b 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -13,9 +13,11 @@
 
 #define ENABLED_TEXTBLOCK_TAGS\
tag: "hilight" "+ style=glow glow_color=#3388ddaa";\
+   tag: "error" "+ underline=single underline_color=#ff 
underline2_color=#ff"; \
 
 #define DISABLED_TEXTBLOCK_TAGS   \
tag: "hilight" "+ style=glow glow_color=#3399ff20";\
+   tag: "error" "+ underline=single underline_color=#ff 
underline2_color=#ff"; \
 
 group { name: "elm/scroller/base/enventor";
images.image: "inset_shadow.png" COMP;

-- 

[EGIT] [core/elementary] master 01/01: atspi intf: image - fix compilation warnings after eo4 migration changes

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=b613a3d63ac510679c6383308f672c4a993b2fea

commit b613a3d63ac510679c6383308f672c4a993b2fea
Author: Amitesh Singh 
Date:   Sat Mar 5 06:50:34 2016 +0530

atspi intf: image - fix compilation warnings after eo4 migration changes

 ==
  CC   libelementary_la-elm_interface_atspi_value.lo
  elm_interface_atspi_image.c: In function 
'_elm_interface_atspi_image_description_set':
  elm_interface_atspi_image.c:36:9: warning: 'old_descr' may be used 
uninitialized in this function [-Wmaybe-uninitialized]
   eina_stringshare_del(old_descr);
^
==
---
 src/lib/elm_interface_atspi_image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_interface_atspi_image.c 
b/src/lib/elm_interface_atspi_image.c
index a9a253d..7ee1e97 100644
--- a/src/lib/elm_interface_atspi_image.c
+++ b/src/lib/elm_interface_atspi_image.c
@@ -30,8 +30,8 @@ _elm_interface_atspi_image_description_set(Eo *obj, void *sd 
EINA_UNUSED, const
 {
const char *key = "atspi_image_description";
const char *descr = eina_stringshare_add(description);
-   char *old_descr;
-   if (eo_key_data_get(obj, key))
+   char *old_descr = eo_key_data_get(obj, key);
+   if (old_descr)
  {
 eina_stringshare_del(old_descr);
 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _free_desc_cb, 
old_descr);

-- 

[EGIT] [core/efl] master 02/05: edje: return default description depends on RTL when description doesn't exist

[Soohye Shin]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=48461bb94621b7cbc366a00c9f44ccc95d971ba6

commit 48461bb94621b7cbc366a00c9f44ccc95d971ba6
Author: Soohye Shin 
Date:   Fri Mar 4 15:53:53 2016 -0800

edje: return default description depends on RTL when description doesn't 
exist

Summary:
If not found edje part description, edje just set default description in 
spite of RTL status.
This adds to call function for getting the correct description as RTL 
status.

Reviewers: raster, Hermet, cedric

Subscribers: minkyu, sju27, cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D3735

Signed-off-by: Cedric BAIL 
---
 src/lib/edje/edje_calc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index c30efb2..6ea3157 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -721,7 +721,9 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, 
const char *d1, doubl
 
epd1 = _edje_part_description_find(ed, ep, d1, v1, EINA_TRUE);
if (!epd1)
- epd1 = ep->part->default_desc;  /* never NULL */
+ epd1 = _edje_get_description_by_orientation(ed, ep->part->default_desc,
+ >part->default_desc_rtl,
+ep->type); /* never NULL */
 
if (d2)
  epd2 = _edje_part_description_find(ed, ep, d2, v2, EINA_TRUE);

-- 

[EGIT] [core/elementary] master 10/11: map: fix memory leak

[SungTaek Hong]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=f7f362d0417f3cea2f24b20d2a5474e1343136a6

commit f7f362d0417f3cea2f24b20d2a5474e1343136a6
Author: SungTaek Hong 
Date:   Fri Mar 4 16:02:15 2016 -0800

map: fix memory leak

Summary:
- in dump_cb buf is allocated by malloc() ->strdup() -> free.
  This is needless.
- And buf allocated in dump_cb is strdup again.
  This may cause memory leak.

Reviewers: Hermet, woohyun, cedric

Reviewed By: cedric

Differential Revision: https://phab.enlightenment.org/D3752

Signed-off-by: Cedric BAIL 
---
 src/lib/elm_map.c | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index b88edac..3dc 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -2791,11 +2791,9 @@ _xml_route_dump_cb(void *data,
  snprintf(buf, length, "%s", value);
  if (dump->id == ROUTE_XML_DISTANCE) dump->distance = _elm_atof(buf);
  else if (!(dump->description) && (dump->id == ROUTE_XML_DESCRIPTION))
-   dump->description = strdup(buf);
+   dump->description = buf;
  else if (dump->id == ROUTE_XML_COORDINATES)
-   dump->coordinates = strdup(buf);
-
- free(buf);
+   dump->coordinates = buf;
   }
   break;
 
@@ -2844,8 +2842,7 @@ _xml_name_dump_cb(void *data,
 
  if (!buf) return EINA_FALSE;
  snprintf(buf, length + 1, "%s", value);
- if (dump->id == NAME_XML_NAME) dump->address = strdup(buf);
- free(buf);
+ if (dump->id == NAME_XML_NAME) dump->address = buf;
   }
   break;
 
@@ -2871,7 +2868,7 @@ _xml_name_dump_list_cb(void *data,
  {
 name = calloc(1, sizeof(Elm_Map_Name));
 if (!name) return EINA_FALSE;
-name->address = strdup(dump.address);
+name->address = dump.address;
 name->lon = dump.lon;
 name->lat = dump.lat;
 name->wsd = name_list->wsd;
@@ -2941,6 +2938,7 @@ _kml_parse(Elm_Map_Route *r)
   free(str[0]);
   free(str);
}
+ free(dump.description);
   }
 else WRN("description is not found !");
 
@@ -2970,6 +2968,7 @@ _kml_parse(Elm_Map_Route *r)
   free(str[0]);
   free(str);
}
+ free(dump.coordinates);
   }
  }
 }
@@ -3011,7 +3010,7 @@ _name_parse(Elm_Map_Name *n)
 if (dump.address)
   {
  INF("[%lf : %lf] ADDRESS : %s", n->lon, n->lat, dump.address);
- n->address = strdup(dump.address);
+ n->address = dump.address;
   }
 n->lon = dump.lon;
 n->lat = dump.lat;

-- 

[EGIT] [core/efl] master 03/05: evas: fix preload thread deadlock issue

[jiin.moon]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=41b8a320a01aa891cbe8e3b5350eb878f07817cc

commit 41b8a320a01aa891cbe8e3b5350eb878f07817cc
Author: jiin.moon 
Date:   Fri Mar 4 15:57:50 2016 -0800

evas: fix preload thread deadlock issue

Summary: Wrong condition makes deadlock issue.

Reviewers: jpeg, jypark

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D3742

Signed-off-by: Cedric BAIL 
---
 src/lib/evas/cache/evas_cache_image.c  | 4 +++-
 src/lib/evas/include/evas_common_private.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/cache/evas_cache_image.c 
b/src/lib/evas/cache/evas_cache_image.c
index e1f8c69..49b1976 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -330,6 +330,7 @@ _evas_cache_image_async_heavy(void *data)
current = data;
 
SLKL(current->lock);
+   current->flags.load_worked = 0;
pchannel = current->channel;
current->channel++;
cache = current->cache;
@@ -373,6 +374,7 @@ _evas_cache_image_async_heavy(void *data)
 current->flags.preload_done = 0;
  }
SLKU(current->lock_cancel);
+   current->flags.load_worked = 1;
SLKU(current->lock);
 }
 
@@ -1160,7 +1162,7 @@ evas_cache_image_load_data(Image_Entry *im)
 evas_async_events_process();
 
 LKL(wakeup);
-while (im->preload)
+while (!im->flags.load_worked)
   {
  eina_condition_wait(_wakeup);
  LKU(wakeup);
diff --git a/src/lib/evas/include/evas_common_private.h 
b/src/lib/evas/include/evas_common_private.h
index 3409e92..1833d54 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -568,6 +568,7 @@ struct _Image_Entry_Flags
Eina_Bool updated_data  : 1;
Eina_Bool flipped   : 1;
Eina_Bool textured  : 1;
+   Eina_Bool load_worked   : 1;
 };
 
 struct _Image_Entry_Frame

-- 

[EGIT] [core/efl] master 05/05: ecore: better resources use in the glib integration

[Jean Guyomarc'h]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=15ddd174a1f30b26f5cc67ce983bcc6ce0567031

commit 15ddd174a1f30b26f5cc67ce983bcc6ce0567031
Author: Jean Guyomarc'h 
Date:   Fri Mar 4 16:00:58 2016 -0800

ecore: better resources use in the glib integration

Summary:
When glib support is enabled (HAVE_GLIB), _ecore_glib_init()
was always reserving resources. However, its counterpart may not
be called when:
- glib is not always integrated and
- when a user didn't explicitly required the integration.

Calling _ecore_glib_init() within the request code will cause the
resources to be reserved only when the integration with glib is
required and furthermore guarantees that resources always have a
chance to be released.

Reviewers: cedric, raster

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D3749

Signed-off-by: Cedric BAIL 
---
 src/lib/ecore/ecore.c  | 1 -
 src/lib/ecore/ecore_glib.c | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 0a5b1d8..247612b 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -248,7 +248,6 @@ ecore_init(void)
_ecore_exe_init();
 #endif
_ecore_thread_init();
-   _ecore_glib_init();
_ecore_job_init();
_ecore_time_init();
 
diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c
index e2586c1..7232d15 100644
--- a/src/lib/ecore/ecore_glib.c
+++ b/src/lib/ecore/ecore_glib.c
@@ -275,6 +275,9 @@ ecore_main_loop_glib_integrate(void)
_ecore_glib_select_original = func;
ecore_main_loop_select_func_set(_ecore_glib_select);
_ecore_glib_active = EINA_TRUE;
+
+   /* Init only when requested */
+   _ecore_glib_init();
return EINA_TRUE;
 #else
ERR("No glib support");

-- 

[EGIT] [core/elementary] master 08/11: image: fix the wrong return value

[Minkyu Kang]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=23aa206fe1218d1ef060b2bdaf558b1f4a802153

commit 23aa206fe1218d1ef060b2bdaf558b1f4a802153
Author: Minkyu Kang 
Date:   Fri Mar 4 15:55:14 2016 -0800

image: fix the wrong return value

Summary: Signed-off-by: Minkyu Kang 

Reviewers: Hermet, cedric

Reviewed By: cedric

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D3741

Signed-off-by: Cedric BAIL 
---
 src/lib/elm_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 4119004..92aacaa 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -597,7 +597,7 @@ _elm_image_resize_down_set(Eo *obj, Elm_Image_Data *sd, 
Eina_Bool resize_down)
 EOLIAN static Eina_Bool
 _elm_image_resize_down_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
 {
-   return sd->resize_up;
+   return sd->resize_down;
 }
 
 static Eina_Bool

-- 

[EGIT] [core/elementary] master 09/11: config: handle is_mirrored, and translate are not part of EET file, when config flush occurs

[Shinwoo Kim]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5087a8f94f71294a20b567fdc518cfadee13dd46

commit 5087a8f94f71294a20b567fdc518cfadee13dd46
Author: Shinwoo Kim 
Date:   Fri Mar 4 16:00:06 2016 -0800

config: handle is_mirrored, and translate are not part of EET file, when 
config flush occurs

Summary: is_mirrored, and translate value is reset, when config flush 
occurs.

Reviewers: raster, cedric, jpeg, tasn

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D3748

Signed-off-by: Cedric BAIL 
---
 src/lib/elm_config.c | 32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index f958730..185a0ef 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1827,12 +1827,22 @@ _config_load(void)
 static void
 _config_flush_get(void)
 {
+   Eina_Bool is_mirrored;
+   Eina_Bool translate;
+   is_mirrored = _elm_config->is_mirrored;
+   translate = _elm_config->translate;
+
_elm_config_font_overlays_cancel();
_color_overlays_cancel();
_config_free(_elm_config);
_elm_config = NULL;
_config_load();
_env_get();
+
+   /* restore prev value which is not part of the EET file */
+   _elm_config->is_mirrored = is_mirrored;
+   _elm_config->translate = translate;
+
_config_apply();
_config_sub_apply();
evas_font_reinit();
@@ -3673,7 +3683,7 @@ elm_config_all_flush(void)
 }
 
 static void
-_translation_init()
+_translation_init(void)
 {
 #ifdef ENABLE_NLS
const char *cur_dom = textdomain(NULL);
@@ -3929,9 +3939,19 @@ end:
 void
 _elm_config_reload(void)
 {
+   Eina_Bool is_mirrored;
+   Eina_Bool translate;
+   is_mirrored = _elm_config->is_mirrored;
+   translate = _elm_config->translate;
+
_config_free(_elm_config);
_elm_config = NULL;
_config_load();
+
+   /* restore prev value which is not part of the EET file */
+   _elm_config->is_mirrored = is_mirrored;
+   _elm_config->translate = translate;
+
_config_apply();
_elm_config_font_overlay_apply();
_elm_config_color_overlay_apply();
@@ -4100,6 +4120,11 @@ elm_config_transition_duration_factor_get(void)
 void
 _elm_config_profile_set(const char *profile)
 {
+   Eina_Bool is_mirrored;
+   Eina_Bool translate;
+   is_mirrored = _elm_config->is_mirrored;
+   translate = _elm_config->translate;
+
if (!profile) return;
 
if (_elm_profile)
@@ -4116,6 +4141,11 @@ _elm_config_profile_set(const char *profile)
_config_free(_elm_config);
_elm_config = NULL;
_config_load();
+
+   /* restore prev value which is not part of the EET file */
+   _elm_config->is_mirrored = is_mirrored;
+   _elm_config->translate = translate;
+
_config_apply();
_elm_config_font_overlay_apply();
_elm_config_color_overlay_apply();

-- 

[EGIT] [core/elementary] master 03/11: win: add check for focus object before adding new one

[Jee-Yong Um]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=859f31102e9b4d776a144872a4b839cc509a9628

commit 859f31102e9b4d776a144872a4b839cc509a9628
Author: Jee-Yong Um 
Date:   Fri Mar 4 15:37:17 2016 -0800

win: add check for focus object before adding new one

Summary:
Focus object is added repeatedly, when focus is enabled.
This patch checks existing focus object.

Test Plan:
elementary_test -to focus
check/uncheck "Focus Highlight Enable" with spacebar

Reviewers: Jaehyun_Cho, jpeg, cedric

Reviewed By: cedric

Differential Revision: https://phab.enlightenment.org/D3689

Signed-off-by: Cedric BAIL 
---
 src/lib/elm_win.c | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 900a0af..70f5392 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2713,15 +2713,18 @@ _elm_win_focus_highlight_init(Elm_Win_Data *sd)
  }
 
sd->focus_highlight.prev.target = NULL;
-   sd->focus_highlight.fobj = edje_object_add(sd->evas);
sd->focus_highlight.theme_changed = EINA_TRUE;
+   if (!sd->focus_highlight.fobj)
+ {
+sd->focus_highlight.fobj = edje_object_add(sd->evas);
+edje_object_signal_callback_add(sd->focus_highlight.fobj,
+"elm,action,focus,hide,end", "*",
+_elm_win_focus_highlight_hide, NULL);
+edje_object_signal_callback_add(sd->focus_highlight.fobj,
+"elm,action,focus,anim,end", "*",
+_elm_win_focus_highlight_anim_end, 
sd->obj);
+ }
 
-   edje_object_signal_callback_add(sd->focus_highlight.fobj,
-   "elm,action,focus,hide,end", "*",
-   _elm_win_focus_highlight_hide, NULL);
-   edje_object_signal_callback_add(sd->focus_highlight.fobj,
-   "elm,action,focus,anim,end", "*",
-   _elm_win_focus_highlight_anim_end, sd->obj);
_elm_win_focus_highlight_reconfigure_job_start(sd);
 }
 

-- 

[EGIT] [core/elementary] master 01/11: multibuttonentry: add elm.swallow.background part

[Woochan Lee]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=66c1d5694428e2683a8074f5c1ecda5f56f1a387

commit 66c1d5694428e2683a8074f5c1ecda5f56f1a387
Author: Woochan Lee 
Date:   Fri Mar 4 15:29:17 2016 -0800

multibuttonentry: add elm.swallow.background part

Summary: This swallow part is for custom background image.

Reviewers: kimcinoo, Hermet, cedric

Reviewed By: cedric

Differential Revision: https://phab.enlightenment.org/D3659

Signed-off-by: Cedric BAIL 
---
 data/themes/edc/elm/multibuttonentry.edc | 8 
 1 file changed, 8 insertions(+)

diff --git a/data/themes/edc/elm/multibuttonentry.edc 
b/data/themes/edc/elm/multibuttonentry.edc
index 5568b4b..cefb816 100644
--- a/data/themes/edc/elm/multibuttonentry.edc
+++ b/data/themes/edc/elm/multibuttonentry.edc
@@ -10,6 +10,14 @@ group { name: "elm/multibuttonentry/base/default";
 color_class: "multibuttonentry_bg";
  }
   }
+  part { name: "elm.swallow.background";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+rel1.to: "bg";
+rel2.to: "bg";
+ }
+  }
   part { name: "box.swallow"; type: SWALLOW;
  description { state: "default" 0.0;
 rel1.to: "bg";

-- 

[EGIT] [core/elementary] master 07/11: Genlist: fix for an item width calculation issue on item show / scrolling

[godly.talias]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=6785fa01252f0b789d6c93ee6f52afcda4a3aa7a

commit 6785fa01252f0b789d6c93ee6f52afcda4a3aa7a
Author: godly.talias 
Date:   Fri Mar 4 15:46:18 2016 -0800

Genlist: fix for an item width calculation issue on item show / scrolling

Summary:
When item_show / scrolling is happening, _item_block_position will be
called from smart_calculate where item width is set as block width.
If items are not realized _item_realize will be called and if items are
getting realized for first time we set mincalcd as false. So later
item width gets overwritten by min width of item and so issue is happening.

@fix T2603

Signed-off-by: godly.talias 

Test Plan: elementary_test -> Genlist Group -> show 480

Reviewers: prince.dubey, shilpasingh, SanghyeonLee, cedric

Subscribers: rajeshps, seoz, govi

Maniphest Tasks: T2603

Differential Revision: https://phab.enlightenment.org/D3729

Signed-off-by: Cedric BAIL 
---
 src/lib/elm_genlist.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index ebb31f2..fd5e8aa 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1900,6 +1900,8 @@ _item_realize(Elm_Gen_Item *it,
   GL_IT(it)->w = GL_IT(it)->minw = size->minw;
   GL_IT(it)->h = GL_IT(it)->minh = size->minh;
   it->item->mincalcd = EINA_TRUE;
+  if (GL_IT(it)->block->realized)
+GL_IT(it)->w = GL_IT(it)->block->w;
}
  else
{

-- 

[EGIT] [core/enlightenment] master 01/01: delete gadget display object during object deletion

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c13979608219cf7c18b8673bafb9b3b7ff6757a0

commit c13979608219cf7c18b8673bafb9b3b7ff6757a0
Author: Mike Blumenkrantz 
Date:   Fri Mar 4 17:25:21 2016 -0500

delete gadget display object during object deletion

fixes crashing when unloading modules with active gadgets
---
 src/bin/e_gadget.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index a7e22f3..e41f542 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -71,6 +71,7 @@ struct E_Gadget_Config
E_Gadget_Config *orig; //gadget is a copy of the original gadget during a 
move
Eina_Bool moving : 1;
Eina_Bool resizing : 1;
+   Eina_Bool display_del : 1; //deleted using ->display
 };
 
 typedef struct E_Gadget_Sites
@@ -226,10 +227,11 @@ _gadget_popup(void *data, Evas_Object *obj EINA_UNUSED, 
void *event_info)
 }
 
 static void
-_gadget_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, 
void *event_info EINA_UNUSED)
+_gadget_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void 
*event_info EINA_UNUSED)
 {
E_Gadget_Config *zgc = data;
 
+   zgc->display_del = obj == zgc->display;
if (!e_object_is_del(zgc->e_obj_inherit))
  e_object_del(zgc->e_obj_inherit);
 }
@@ -253,16 +255,20 @@ _gadget_object_free(E_Object *eobj)
zgc = evas_object_data_get(g, "__e_gadget");
evas_object_smart_callback_call(zgc->site->layout, "gadget_destroyed", 
zgc->gadget);
evas_object_event_callback_del_full(zgc->gadget, EVAS_CALLBACK_DEL, 
_gadget_del, zgc);
-   if (zgc->gadget == zgc->display)
+   if (zgc->display_del || (zgc->gadget == zgc->display))
  zgc->display = NULL;
else
- evas_object_event_callback_del_full(zgc->display, EVAS_CALLBACK_DEL, 
_gadget_del, zgc);
+ {
+evas_object_event_callback_del_full(zgc->display, EVAS_CALLBACK_DEL, 
_gadget_del, zgc);
+E_FREE_FUNC(zgc->display, evas_object_del);
+ }
E_FREE_FUNC(zgc->gadget, evas_object_del);
E_FREE_FUNC(zgc->cfg_object, evas_object_del);
E_FREE_FUNC(zgc->style.obj, evas_object_del);
_gadget_util_allow_deny_cleanup(zgc);
E_FREE(zgc->e_obj_inherit);
zgc->configure = NULL;
+   zgc->display_del = zgc->moving = zgc->resizing = 0;
 }
 
 static void

-- 

[EGIT] [core/enlightenment] master 05/10: add new wireless module/gadget

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=24fe43d735b26895025f2aa7706819d4a6663104

commit 24fe43d735b26895025f2aa7706819d4a6663104
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 16:58:27 2016 -0500

add new wireless module/gadget

this is the successor to the connman module/gadget. it does not use
or depend on econnman.
---
 configure.ac   |2 +
 src/bin/e_module.c |1 +
 src/modules/Makefile.mk|2 +
 src/modules/Makefile_wireless.mk   |   27 +
 src/modules/wireless/connman.c | 1634 
 src/modules/wireless/e-module-wireless.edj |  Bin 0 -> 21146 bytes
 src/modules/wireless/mod.c |   33 +
 src/modules/wireless/module.desktop.in |8 +
 src/modules/wireless/wireless.c| 1476 +
 src/modules/wireless/wireless.h|  134 +++
 10 files changed, 3317 insertions(+)

diff --git a/configure.ac b/configure.ac
index 917d652..7b286c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -924,6 +924,7 @@ AC_E_OPTIONAL_MODULE([wl_weekeyboard], $have_wayland, 
[CHECK_MODULE_WL_WEEKEYBOA
 AC_E_OPTIONAL_MODULE([policy_mobile], true)
 AC_E_OPTIONAL_MODULE([geolocation], true)
 AC_E_OPTIONAL_MODULE([xwayland], $have_wayland, [CHECK_MODULE_XWAYLAND])
+AC_E_OPTIONAL_MODULE([wireless], true)
 
 if test "x${HAVE_WL_X11}" != "xyes" && test "x${have_wayland}" = "xyes" && 
test "x${HAVE_XWAYLAND}" != "xyes"; then
   AC_DEFINE_UNQUOTED([HAVE_WAYLAND_ONLY],[1],[enable wayland-only version of 
enlightenment])
@@ -1125,6 +1126,7 @@ src/modules/tiling/module.desktop
 src/modules/music-control/module.desktop
 src/modules/packagekit/module.desktop
 src/modules/wl_desktop_shell/module.desktop
+src/modules/wireless/module.desktop
 data/xsession/enlightenment.desktop
 data/etc/sysactions.conf
 data/units/enlightenment.service
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index c211b93..945788d 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -1025,6 +1025,7 @@ _e_module_whitelist_check(void)
   "temperature",
   "tiling",
   "winlist",
+  "wireless",
   "wizard",
   "wl_desktop_shell",
   "wl_x11",
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index f4d5f6a..bb618da 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -127,3 +127,5 @@ include src/modules/Makefile_wl_weekeyboard.mk
 include src/modules/Makefile_policy_mobile.mk
 
 include src/modules/Makefile_geolocation.mk
+
+include src/modules/Makefile_wireless.mk
diff --git a/src/modules/Makefile_wireless.mk b/src/modules/Makefile_wireless.mk
new file mode 100644
index 000..0d28d40
--- /dev/null
+++ b/src/modules/Makefile_wireless.mk
@@ -0,0 +1,27 @@
+EXTRA_DIST += \
+src/modules/wireless/module.desktop.in \
+src/modules/wireless/e-module-wireless.edj
+
+if USE_MODULE_WIRELESS
+wirelessdir = $(MDIR)/wireless
+wireless_DATA = \
+src/modules/wireless/module.desktop \
+src/modules/wireless/e-module-wireless.edj
+
+wirelesspkgdir = $(MDIR)/wireless/$(MODULE_ARCH)
+wirelesspkg_LTLIBRARIES = src/modules/wireless/module.la
+
+src_modules_wireless_module_la_LDFLAGS = $(MOD_LDFLAGS)
+src_modules_wireless_module_la_SOURCES = \
+src/modules/wireless/connman.c \
+src/modules/wireless/mod.c \
+src/modules/wireless/wireless.c \
+src/modules/wireless/wireless.h
+
+src_modules_wireless_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
+src_modules_wireless_module_la_LIBADD = $(MOD_LIBS)
+
+PHONIES += wireless install-wireless
+wireless: $(wirelesspkg_LTLIBRARIES) $(wireless_DATA)
+install-wireless: install-wirelessDATA install-wirelesspkgLTLIBRARIES
+endif
diff --git a/src/modules/wireless/connman.c b/src/modules/wireless/connman.c
new file mode 100644
index 000..662e23a
--- /dev/null
+++ b/src/modules/wireless/connman.c
@@ -0,0 +1,1634 @@
+#include "wireless.h"
+
+#define CONNMAN_BUS_NAME "net.connman"
+#define CONNMAN_MANAGER_IFACE CONNMAN_BUS_NAME ".Manager"
+#define CONNMAN_SERVICE_IFACE CONNMAN_BUS_NAME ".Service"
+#define CONNMAN_TECHNOLOGY_IFACE CONNMAN_BUS_NAME ".Technology"
+#define CONNMAN_TECHNOLOGY_PATH_ETHERNET "/net/connman/technology/ethernet"
+#define CONNMAN_TECHNOLOGY_PATH_WIFI "/net/connman/technology/wifi"
+#define CONNMAN_TECHNOLOGY_PATH_BT "/net/connman/technology/bluetooth"
+#define CONNMAN_TECHNOLOGY_PATH_CELLULAR "/net/connman/technology/cellular"
+#define CONNMAN_AGENT_IFACE "net.connman.Agent"
+#define CONNMAN_AGENT_PATH "/org/enlightenment/wireless/agent"
+
+#define CONNMAN_SERVICE_TYPE_ITER(i) \
+  for ((i) = 0; (i) < CONNMAN_SERVICE_TYPE_LAST; (i)++)
+
+#define MILLI_PER_SEC 1000
+#define CONNMAN_CONNECTION_TIMEOUT 60 * MILLI_PER_SEC
+
+#undef DBG
+#undef INF
+#undef WRN
+#undef ERR
+
+#define DBG(...) EINA_LOG_DOM_DBG(_connman_log_dom, __VA_ARGS__)
+#define INF(...) EINA_LOG_DOM_INFO(_connman_log_dom, 

[EGIT] [core/enlightenment] master 03/10: add bryces: new shelf replacement

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6e032ce35d20a9b3b1adad70c336839d578f9eb3

commit 6e032ce35d20a9b3b1adad70c336839d578f9eb3
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 15:56:16 2016 -0500

add bryces: new shelf replacement

see e_bryce.h
---
 src/bin/Makefile.mk  |3 +
 src/bin/e_bryce.c| 1168 ++
 src/bin/e_bryce.h|   22 +
 src/bin/e_bryce_editor.c |  414 
 src/bin/e_config.c   |2 +
 src/bin/e_includes.h |1 +
 src/bin/e_main.c |7 +
 7 files changed, 1617 insertions(+)

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 8c234c3..9c6ea40 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -69,6 +69,7 @@ src/bin/e_auth.h \
 src/bin/e_backlight.h \
 src/bin/e_bg.h \
 src/bin/e_bindings.h \
+src/bin/e_bryce.h \
 src/bin/e_client.h \
 src/bin/e_client.x \
 src/bin/e_color_dialog.h  \
@@ -236,6 +237,8 @@ src/bin/e_auth.c \
 src/bin/e_backlight.c \
 src/bin/e_bg.c \
 src/bin/e_bindings.c \
+src/bin/e_bryce.c \
+src/bin/e_bryce_editor.c \
 src/bin/e_client.c \
 src/bin/e_color.c \
 src/bin/e_color_dialog.c \
diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
new file mode 100644
index 000..8348063
--- /dev/null
+++ b/src/bin/e_bryce.c
@@ -0,0 +1,1168 @@
+#include "e.h"
+
+#define DEFAULT_LAYER E_LAYER_POPUP
+#define E_BRYCE_TYPE 0xE31338
+
+typedef struct Bryce
+{
+   E_Object *e_obj_inherit;
+   Eina_Stringshare *name;
+
+   Evas_Object *bryce;
+   Evas_Object *layout;
+   Evas_Object *site;
+   Evas_Object *scroller;
+   Evas_Object *autohide_event;
+   Eina_List *zone_obstacles;
+
+   Evas_Object *parent; //comp_object is not an elm widget
+   Eina_Stringshare *style;
+   int size;
+   int x, y;
+   int autohide_size;
+   E_Layer layer;
+   unsigned int zone;
+   E_Gadget_Site_Orient orient;
+   E_Gadget_Site_Anchor anchor;
+
+   Ecore_Job *calc_job;
+   Ecore_Timer *save_timer;
+   Ecore_Timer *autohide_timer;
+   unsigned int autohide_blocked;
+   Eina_List *popups;
+   void *event_info;
+   uint64_t last_timestamp;
+
+   /* config: do not bitfield! */
+   Eina_Bool autosize;
+   Eina_Bool autohide;
+
+   Eina_Bool hidden : 1;
+   Eina_Bool animating : 1;
+   Eina_Bool mouse_in : 1;
+   Eina_Bool noshadow : 1;
+   Eina_Bool size_changed : 1;
+} Bryce;
+
+typedef struct Bryces
+{
+   Eina_List *bryces;
+} Bryces;
+
+static E_Config_DD *edd_bryces;
+static E_Config_DD *edd_bryce;
+static Bryces *bryces;
+static E_Action *resize_act;
+static E_Action *menu_act;
+static Eina_List *handlers;
+
+#define BRYCE_GET(obj) \
+   Bryce *b; \
+   b = evas_object_data_get((obj), "__bryce"); \
+   if (!b) abort()
+
+static void
+_bryce_obstacle_del(void *obs)
+{
+   Bryce *b = e_object_data_get(obs);
+
+   b->zone_obstacles = eina_list_remove(b->zone_obstacles, obs);
+}
+
+static void
+_bryce_autohide_end(void *data, E_Efx_Map_Data *e EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED)
+{
+   Bryce *b = data;
+
+   b->animating = 0;
+}
+
+static void
+_bryce_autohide_coords(Bryce *b, int *x, int *y)
+{
+   int ox, oy, ow, oh;
+   E_Gadget_Site_Anchor an;
+
+   if (b->parent == e_comp->elm)
+ {
+E_Zone *zone;
+
+zone = e_comp_zone_number_get(b->zone);
+ox = zone->x, oy = zone->y, ow = zone->w, oh = zone->h;
+ }
+   else
+ evas_object_geometry_get(b->parent, , , , );
+   an = e_gadget_site_anchor_get(b->site);
+
+   if (b->orient == E_GADGET_SITE_ORIENT_HORIZONTAL)
+ {
+*x = b->x;
+
+if (an & E_GADGET_SITE_ANCHOR_TOP)
+  *y = oy - b->size + b->autohide_size;
+if (an & E_GADGET_SITE_ANCHOR_BOTTOM)
+  *y = oy + oh - b->autohide_size;
+ }
+   else if (b->orient == E_GADGET_SITE_ORIENT_VERTICAL)
+ {
+*y = b->y;
+
+if (an & E_GADGET_SITE_ANCHOR_LEFT)
+  *x = ox - b->size + b->autohide_size;
+if (an & E_GADGET_SITE_ANCHOR_RIGHT)
+  *x = ox + ow - b->autohide_size;
+ }
+}
+
+static void
+_bryce_position(Bryce *b, int w, int h, int *nx, int *ny)
+{
+   int ox, oy, ow, oh;
+   int x, y;
+   E_Gadget_Site_Anchor an;
+
+   if (b->parent == e_comp->elm)
+ {
+E_Zone *zone;
+
+zone = e_comp_zone_number_get(b->zone);
+ox = zone->x, oy = zone->y, ow = zone->w, oh = zone->h;
+e_comp_object_util_center_pos_get(b->bryce, , );
+ }
+   else
+ {
+evas_object_geometry_get(b->parent, , , , );
+x = ox + (ow - w) / 2;
+y = oy + (oh - h) / 2;
+ }
+   an = e_gadget_site_anchor_get(b->site);
+   if (an & E_GADGET_SITE_ANCHOR_LEFT)
+ x = ox;
+   if (an & E_GADGET_SITE_ANCHOR_TOP)
+ y = oy;
+   if (b->orient == E_GADGET_SITE_ORIENT_HORIZONTAL)
+ {
+if (an & E_GADGET_SITE_ANCHOR_RIGHT)
+  x = ox + ow - w;
+if (an & E_GADGET_SITE_ANCHOR_BOTTOM)
+  y = oy + oh - 

[EGIT] [core/enlightenment] master 01/10: add a namespaced version of efx

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d3fe687adabaebc3ba0d662cbcc06746f17fd99e

commit d3fe687adabaebc3ba0d662cbcc06746f17fd99e
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 15:13:16 2016 -0500

add a namespaced version of efx

this will eventually be merged into the efl tree but the current release
cycle is not a good time for it
---
 src/bin/Makefile.mk   |   20 +-
 src/bin/e.h   |1 +
 src/bin/e_fm/Makefile.mk  |1 +
 src/bin/e_main.c  |9 +
 src/bin/efx/e_Efx.h   | 1076 +
 src/bin/efx/e_efx_private.h   |  128 +
 src/bin/efx/efx.c |   65 +++
 src/bin/efx/efx_bumpmapping.c |  186 +++
 src/bin/efx/efx_fade.c|  184 +++
 src/bin/efx/efx_helpers.c |  115 +
 src/bin/efx/efx_move.c|  225 +
 src/bin/efx/efx_pan.c |  390 +++
 src/bin/efx/efx_queue.c   |  301 
 src/bin/efx/efx_resize.c  |  225 +
 src/bin/efx/efx_rotate.c  |  145 ++
 src/bin/efx/efx_spin.c|  148 ++
 src/bin/efx/efx_util.c|  137 ++
 src/bin/efx/efx_zoom.c|  171 +++
 src/modules/Makefile.mk   |1 +
 19 files changed, 3527 insertions(+), 1 deletion(-)

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 6935c62..121dd03 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -1,10 +1,26 @@
 DISTCLEANFILES += src/bin/e_fm_shared_types.h
 
+efx_files = \
+src/bin/efx/efx_bumpmapping.c \
+src/bin/efx/efx.c \
+src/bin/efx/efx_fade.c \
+src/bin/efx/efx_helpers.c \
+src/bin/efx/efx_move.c \
+src/bin/efx/efx_pan.c \
+src/bin/efx/e_efx_private.h \
+src/bin/efx/efx_queue.c \
+src/bin/efx/efx_resize.c \
+src/bin/efx/efx_rotate.c \
+src/bin/efx/efx_spin.c \
+src/bin/efx/efx_util.c \
+src/bin/efx/efx_zoom.c
+
 E_CPPFLAGS = \
 -I$(top_builddir) \
 -I$(top_builddir)/src/bin \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/bin/efx \
 -I$(top_srcdir)/src/bin/generated \
 @e_cflags@ \
 @cf_cflags@ \
@@ -43,6 +59,7 @@ internal_bin_PROGRAMS += src/bin/enlightenment_ckpasswd
 endif
 
 ENLIGHTENMENTHEADERS = \
+src/bin/efx/e_Efx.h \
 src/bin/e_about.h \
 src/bin/e_acpi.h \
 src/bin/e_actions.h \
@@ -359,7 +376,8 @@ src/bin/e_xkb.c \
 src/bin/e_xinerama.c \
 src/bin/e_zoomap.c \
 src/bin/e_zone.c \
-$(ENLIGHTENMENTHEADERS)
+$(ENLIGHTENMENTHEADERS) \
+$(efx_files)
 
 if ! HAVE_WAYLAND_ONLY
 enlightenment_src += \
diff --git a/src/bin/e.h b/src/bin/e.h
index 6b7ea51..34887bc 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -129,6 +129,7 @@ void *alloca (size_t);
 # include 
 # include 
 # include 
+# include "e_Efx.h"
 
 # ifdef HAVE_WAYLAND
 #  include 
diff --git a/src/bin/e_fm/Makefile.mk b/src/bin/e_fm/Makefile.mk
index 0eec4f4..218329f 100644
--- a/src/bin/e_fm/Makefile.mk
+++ b/src/bin/e_fm/Makefile.mk
@@ -3,6 +3,7 @@ EFM_CPPFLAGS = \
 -I$(top_builddir)/src/bin \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/bin/efx \
 @e_cflags@ \
 @cf_cflags@ \
 @VALGRIND_CFLAGS@ \
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 3e36684..2781b86 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -372,6 +372,15 @@ main(int argc, char **argv)
else
  e_first_frame = NULL;
 
+   TS("EFX Init");
+   if (!e_efx_init())
+ {
+e_error_message_show(_("Enlightenment cannot initialize EFX!\n"));
+_e_main_shutdown(-1);
+ }
+   TS("EFX Init Done");
+   _e_main_shutdown_push((void*)e_efx_shutdown);
+
TS("EIO Init");
if (!eio_init())
  {
diff --git a/src/bin/efx/e_Efx.h b/src/bin/efx/e_Efx.h
new file mode 100644
index 000..f668fdb
--- /dev/null
+++ b/src/bin/efx/e_Efx.h
@@ -0,0 +1,1076 @@
+#ifndef E_EFX_H
+#define E_EFX_H
+
+#include 
+#include 
+
+#ifdef EAPI
+# undef EAPI
+#endif /* ifdef EAPI */
+
+#ifdef _WIN32
+# ifdef EFL_E_EFX_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else /* ifdef DLL_EXPORT */
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else /* ifdef EFL_BUILD */
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_BUILD */
+#else /* ifdef _WIN32 */
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else /* if __GNUC__ >= 4 */
+#   define EAPI
+#  endif /* if __GNUC__ >= 4 */
+# else /* ifdef __GNUC__ */
+#  define EAPI
+# endif /* ifdef __GNUC__ */
+#endif /* ! _WIN32 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* ifdef __cplusplus */
+
+/**
+ * @mainpage E_Efx Library Documentation
+ *
+ * @version 1.7.99
+ * @date 2012
+ *
+ * E_Efx is the effects libraries.
+ *
+ * For a better reference, check the following groups:
+ * @li @ref E_Efx
+ * @li @ref E_Efx_Queue
+ * @li @ref E_Efx_Follow
+ * @li @ref E_Efx_Fade
+ * @li @ref E_Efx_Rotation
+ * @li @ref E_Efx_Move
+ * @li @ref E_Efx_Resize
+ *
+ * Please see the @ref authors page for 

[EGIT] [core/enlightenment] master 02/10: add new gadget system

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d26c49b3ce7cfab1296f1b5d942417db04d1e805

commit d26c49b3ce7cfab1296f1b5d942417db04d1e805
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 15:31:29 2016 -0500

add new gadget system

see e_gadget.h
---
 src/bin/Makefile.mk  |2 +
 src/bin/e_config.c   |3 +
 src/bin/e_gadget.c   | 1939 ++
 src/bin/e_gadget.h   |  140 
 src/bin/e_includes.h |1 +
 src/bin/e_main.c |8 +
 6 files changed, 2093 insertions(+)

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 121dd03..8c234c3 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -114,6 +114,7 @@ src/bin/e_focus.h \
 src/bin/e_font.h \
 src/bin/e_gadcon.h \
 src/bin/e_gadcon_popup.h \
+src/bin/e_gadget.h \
 src/bin/e_grabinput.h \
 src/bin/e_grab_dialog.h \
 src/bin/e.h \
@@ -276,6 +277,7 @@ src/bin/e_focus.c \
 src/bin/e_font.c \
 src/bin/e_gadcon.c \
 src/bin/e_gadcon_popup.c \
+src/bin/e_gadget.c \
 src/bin/e_grabinput.c \
 src/bin/e_grab_dialog.c \
 src/bin/e_hints.c \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index c56f45d..d6d3075 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -2147,11 +2147,14 @@ e_config_bindings_free(E_Config_Bindings *ecb)
 static void
 _e_config_save_cb(void *data EINA_UNUSED)
 {
+   EINTERN void e_gadget_save(void);
+
e_config_profile_save();
e_module_save_all();
elm_config_save();
e_config_domain_save("e", _e_config_edd, e_config);
e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
+   e_gadget_save();
_e_config_save_defer = NULL;
 }
 
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
new file mode 100644
index 000..a7e22f3
--- /dev/null
+++ b/src/bin/e_gadget.c
@@ -0,0 +1,1939 @@
+#include "e.h"
+
+#define SNAP_DISTANCE 5
+#define E_GADGET_TYPE 0xE31337
+
+#define IS_HORIZ(orient) \
+  ((orient) == E_GADGET_SITE_ORIENT_HORIZONTAL)
+
+#define IS_VERT(orient) \
+  ((orient) == E_GADGET_SITE_ORIENT_VERTICAL)
+
+#define ZGS_GET(obj) \
+   E_Gadget_Site *zgs; \
+   zgs = evas_object_data_get((obj), "__e_gadget_site"); \
+   if (!zgs) abort()
+
+typedef struct E_Gadget_Config E_Gadget_Config;
+
+typedef struct E_Gadget_Site
+{
+   Eina_Stringshare *name;
+   Eina_Bool autoadd;
+   E_Gadget_Site_Gravity gravity;
+   E_Gadget_Site_Orient orient;
+   E_Gadget_Site_Anchor anchor;
+   Eina_List *gadgets;
+   Eina_Inlist *gadget_list;
+
+   Evas_Object *layout;
+   Evas_Object *events;
+   E_Gadget_Style_Cb style_cb;
+   int cur_size;
+
+   E_Gadget_Config *action;
+   Ecore_Event_Handler *move_handler;
+   Ecore_Event_Handler *mouse_up_handler;
+} E_Gadget_Site;
+
+
+struct E_Gadget_Config
+{
+   EINA_INLIST;
+   int id;
+   Eina_Stringshare *type;
+   E_Object *e_obj_inherit;
+   Evas_Object *display;
+   Evas_Object *gadget;
+   struct
+   {
+  Evas_Object *obj;
+  int minw, minh;
+  Eina_Stringshare *name;
+   } style;
+   E_Gadget_Configure_Cb configure;
+   Evas_Object *cfg_object;
+   E_Gadget_Site *site;
+   E_Menu *menu;
+
+   struct
+   {
+  Evas_Object *popup;
+  Evas_Smart_Cb allow;
+  Evas_Smart_Cb deny;
+  void *data;
+   } allow_deny;
+
+   double x, y; //fixed % positioning
+   double w, h; //fixed % sizing
+   Evas_Point offset; //offset from mouse down
+   Evas_Point down; //coords from mouse down
+   E_Gadget_Config *orig; //gadget is a copy of the original gadget during a 
move
+   Eina_Bool moving : 1;
+   Eina_Bool resizing : 1;
+};
+
+typedef struct E_Gadget_Sites
+{
+   Eina_List *sites;
+} E_Gadget_Sites;
+
+typedef struct E_Gadget_Type
+{
+   E_Gadget_Create_Cb cb;
+   E_Gadget_Wizard_Cb wizard;
+} E_Gadget_Type;
+
+typedef struct Gadget_Item
+{
+   Evas_Object *editor;
+   Evas_Object *gadget;
+   Evas_Object *site;
+} Gadget_Item;
+
+#define DESKLOCK_DEMO_LAYER (E_LAYER_CLIENT_POPUP - 100)
+
+static Eina_List *desklock_handlers;
+static Evas_Object *desklock_rect;
+static Eina_Bool added = 1;
+
+static Evas_Object *pointer_site;
+static Eina_List *handlers;
+
+static Eina_Hash *gadget_types;
+static E_Gadget_Sites *sites;
+static Ecore_Event_Handler *comp_add_handler;
+
+static E_Action *move_act;
+static E_Action *resize_act;
+static E_Action *configure_act;
+static E_Action *menu_act;
+
+static E_Config_DD *edd_sites;
+static E_Config_DD *edd_site;
+static E_Config_DD *edd_gadget;
+
+static void _gadget_object_finalize(E_Gadget_Config *zgc);
+static void _editor_pointer_site_init(E_Gadget_Site_Orient orient, Evas_Object 
*site, Evas_Object *editor, Eina_Bool );
+
+static void
+_gadget_free(E_Gadget_Config *zgc)
+{
+   evas_object_del(zgc->display);
+   eina_stringshare_del(zgc->type);
+   eina_stringshare_del(zgc->style.name);
+   free(zgc);
+}
+
+static E_Gadget_Config *
+_gadget_at_xy(E_Gadget_Site *zgs, int x, int y, E_Gadget_Config *exclude)
+{
+   Eina_List *l;
+   E_Gadget_Config 

[EGIT] [core/enlightenment] master 06/10: add new time module with clock gadgets

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=dad9160ffa748bdf69a45ee7f1f2dfdd23225f4a

commit dad9160ffa748bdf69a45ee7f1f2dfdd23225f4a
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 09:42:11 2016 -0500

add new time module with clock gadgets

this is the successor to the clock module/gadget. it uses separate config 
files
and theme groups from the "clock" module.
---
 configure.ac   |   2 +
 src/bin/e_module.c |   1 +
 src/modules/Makefile.mk|   1 +
 src/modules/Makefile_time.mk   |  25 ++
 src/modules/time/clock.c   | 507 ++
 src/modules/time/clock.h   |  93 ++
 src/modules/time/config.c  | 627 +
 src/modules/time/e-module-time.edj | Bin 0 -> 14062 bytes
 src/modules/time/mod.c | 142 +
 src/modules/time/module.desktop.in |   7 +
 src/modules/time/time.c| 354 +
 11 files changed, 1759 insertions(+)

diff --git a/configure.ac b/configure.ac
index 7b286c6..1ac5831 100644
--- a/configure.ac
+++ b/configure.ac
@@ -925,6 +925,7 @@ AC_E_OPTIONAL_MODULE([policy_mobile], true)
 AC_E_OPTIONAL_MODULE([geolocation], true)
 AC_E_OPTIONAL_MODULE([xwayland], $have_wayland, [CHECK_MODULE_XWAYLAND])
 AC_E_OPTIONAL_MODULE([wireless], true)
+AC_E_OPTIONAL_MODULE([time], true)
 
 if test "x${HAVE_WL_X11}" != "xyes" && test "x${have_wayland}" = "xyes" && 
test "x${HAVE_XWAYLAND}" != "xyes"; then
   AC_DEFINE_UNQUOTED([HAVE_WAYLAND_ONLY],[1],[enable wayland-only version of 
enlightenment])
@@ -1127,6 +1128,7 @@ src/modules/music-control/module.desktop
 src/modules/packagekit/module.desktop
 src/modules/wl_desktop_shell/module.desktop
 src/modules/wireless/module.desktop
+src/modules/time/module.desktop
 data/xsession/enlightenment.desktop
 data/etc/sysactions.conf
 data/units/enlightenment.service
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 945788d..25ec3a7 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -1024,6 +1024,7 @@ _e_module_whitelist_check(void)
   "teamwork",
   "temperature",
   "tiling",
+  "time",
   "winlist",
   "wireless",
   "wizard",
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index bb618da..0962f9e 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -129,3 +129,4 @@ include src/modules/Makefile_policy_mobile.mk
 include src/modules/Makefile_geolocation.mk
 
 include src/modules/Makefile_wireless.mk
+include src/modules/Makefile_time.mk
diff --git a/src/modules/Makefile_time.mk b/src/modules/Makefile_time.mk
new file mode 100644
index 000..14477c1
--- /dev/null
+++ b/src/modules/Makefile_time.mk
@@ -0,0 +1,25 @@
+EXTRA_DIST += src/modules/time/module.desktop.in \
+src/modules/time/e-module-time.edj
+if USE_MODULE_TIME
+timedir = $(MDIR)/time
+time_DATA = src/modules/time/e-module-time.edj \
+src/modules/time/module.desktop
+
+
+timepkgdir = $(MDIR)/time/$(MODULE_ARCH)
+timepkg_LTLIBRARIES = src/modules/time/module.la
+
+src_modules_time_module_la_LIBADD = $(MOD_LIBS)
+src_modules_time_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
+src_modules_time_module_la_LDFLAGS = $(MOD_LDFLAGS)
+src_modules_time_module_la_SOURCES = \
+src/modules/time/clock.c \
+src/modules/time/clock.h \
+src/modules/time/config.c \
+src/modules/time/mod.c \
+src/modules/time/time.c
+
+PHONIES += time install-time
+time: $(timepkg_LTLIBRARIES) $(time_DATA)
+install-time: install-timeDATA install-timepkgLTLIBRARIES
+endif
diff --git a/src/modules/time/clock.c b/src/modules/time/clock.c
new file mode 100644
index 000..1952413
--- /dev/null
+++ b/src/modules/time/clock.c
@@ -0,0 +1,507 @@
+#include "clock.h"
+
+EINTERN Config *time_config = NULL;
+EINTERN Eina_List *clock_instances = NULL;
+static Ecore_Timer *clock_timer;
+
+static void
+_clock_calendar_month_update(Instance *inst)
+{
+   Evas_Object *od, *oi;
+   int x, y;
+
+   oi = elm_layout_edje_get(inst->o_cal);
+   edje_object_part_text_set(oi, "e.text.month", inst->month);
+   edje_object_part_text_set(oi, "e.text.year", inst->year);
+   for (x = 0; x < 7; x++)
+ {
+od = edje_object_part_table_child_get(oi, "e.table.daynames", x, 0);
+edje_object_part_text_set(od, "e.text.label", inst->daynames[x]);
+edje_object_message_signal_process(od);
+if (inst->dayweekends[x][0])
+  edje_object_signal_emit(od, "e,state,weekend", "e");
+else
+  edje_object_signal_emit(od, "e,state,weekday", "e");
+ }
+
+   for (y = 0; y < 6; y++)
+ {
+for (x = 0; x < 7; x++)
+  {
+ char buf[32];
+
+ od = edje_object_part_table_child_get(oi, "e.table.days", x, y);
+ snprintf(buf, sizeof(buf), "%i", (int)inst->daynums[x][y]);
+ edje_object_part_text_set(od, "e.text.label", buf);
+ 

[EGIT] [core/enlightenment] master 08/10: bump config version, add mouse/wheel bindings for manipulating gadgets/bryces

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=863a50acbb4423713725822411fd9c43d100c557

commit 863a50acbb4423713725822411fd9c43d100c557
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 10:30:23 2016 -0500

bump config version, add mouse/wheel bindings for manipulating 
gadgets/bryces

this copies the user's current bindings for moving/resizing/menu on a window
and applies them to gadget-related objects for UX coherency
---
 src/bin/e_config.c | 81 ++
 src/bin/e_config.h |  2 +-
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index eb0c013..2181fda 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -65,6 +65,37 @@ typedef struct _E_Color_Class
int   r3, g3, b3, a3;
 } E_Color_Class;
 
+static void
+_e_config_binding_mouse_add(E_Binding_Context ctxt, int button, 
E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
+{
+   E_Config_Binding_Mouse *binding;
+
+   binding = calloc(1, sizeof(E_Config_Binding_Mouse));
+   binding->context = ctxt;
+   binding->button = button;
+   binding->modifiers = mod;
+   binding->any_mod = any_mod;
+   binding->action = eina_stringshare_add(action);
+   binding->params = eina_stringshare_add(params);
+   e_bindings->mouse_bindings = eina_list_append(e_bindings->mouse_bindings, 
binding);
+}
+
+static void
+_e_config_binding_wheel_add(E_Binding_Context ctxt, int direction, int z, 
E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
+{
+   E_Config_Binding_Wheel *binding;
+
+   binding = calloc(1, sizeof(E_Config_Binding_Wheel));
+   binding->context = ctxt;
+   binding->direction = direction;
+   binding->z = z;
+   binding->modifiers = mod;
+   binding->any_mod = any_mod;
+   binding->action = eina_stringshare_add(action);
+   binding->params = eina_stringshare_add(params);
+   e_bindings->wheel_bindings = eina_list_append(e_bindings->wheel_bindings, 
binding);
+}
+
 static Eina_Bool
 _e_config_cb_efreet_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, 
void *ev EINA_UNUSED)
 {
@@ -1351,6 +1382,56 @@ e_config_load(void)
  e_config->keyboard.repeat_delay = 400;
  e_config->keyboard.repeat_rate = 25;
   }
+CONFIG_VERSION_CHECK(20)
+  {
+ Eina_List *l;
+ E_Config_Binding_Mouse *ebm;
+ E_Config_Module *em, *module;
+
+ CONFIG_VERSION_UPDATE_INFO(20);
+
+ EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm)
+   {
+  if (eina_streq(ebm->action, "window_move"))
+{
+   _e_config_binding_mouse_add(E_BINDING_CONTEXT_ANY, 
ebm->button, ebm->modifiers,
+ebm->any_mod, "gadget_move", NULL);
+}
+  else if (eina_streq(ebm->action, "window_resize"))
+{
+   _e_config_binding_mouse_add(E_BINDING_CONTEXT_ANY, 
ebm->button, ebm->modifiers,
+ebm->any_mod, "gadget_resize", 
NULL);
+}
+  else if (eina_streq(ebm->action, "window_menu"))
+{
+   _e_config_binding_mouse_add(E_BINDING_CONTEXT_ANY, 
ebm->button, ebm->modifiers,
+ebm->any_mod, "gadget_menu", NULL);
+   _e_config_binding_mouse_add(E_BINDING_CONTEXT_ANY, 
ebm->button, ebm->modifiers,
+ebm->any_mod, "bryce_menu", NULL);
+}
+   }
+ _e_config_binding_wheel_add(E_BINDING_CONTEXT_ANY, 0, 1, 
E_BINDING_MODIFIER_CTRL, 0, "bryce_resize", NULL);
+ _e_config_binding_wheel_add(E_BINDING_CONTEXT_ANY, 0, -1, 
E_BINDING_MODIFIER_CTRL, 0, "bryce_resize", NULL);
+
+ EINA_LIST_FOREACH(e_config->modules, l, em)
+   {
+  if (!em->enabled) continue;
+  if (eina_streq(em->name, "connman"))
+{
+   module = E_NEW(E_Config_Module, 1);
+   module->name = eina_stringshare_add("wireless");
+   module->enabled = 1;
+   e_config->modules = eina_list_append(e_config->modules, 
module);
+}
+  else if (eina_streq(em->name, "clock"))
+{
+   module = E_NEW(E_Config_Module, 1);
+   module->name = eina_stringshare_add("time");
+   module->enabled = 1;
+   e_config->modules = eina_list_append(e_config->modules, 
module);
+}
+   }
+  }
  }
if (!e_config->remember_internal_fm_windows)
  

[EGIT] [core/enlightenment] master 04/10: add new start gadget

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=f527e6c8fb16965cd8fe5cec8bdfcc96d1200afb

commit f527e6c8fb16965cd8fe5cec8bdfcc96d1200afb
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 16:14:19 2016 -0500

add new start gadget

this is identical to the old one so it will just be merged into the 
existing module
---
 src/modules/Makefile_start.mk  |   4 +-
 src/modules/start/e_mod_main.c |   4 +
 src/modules/start/start.c  | 220 +
 3 files changed, 227 insertions(+), 1 deletion(-)

diff --git a/src/modules/Makefile_start.mk b/src/modules/Makefile_start.mk
index 1f72bf4..4d2b6fa 100644
--- a/src/modules/Makefile_start.mk
+++ b/src/modules/Makefile_start.mk
@@ -12,7 +12,9 @@ startpkg_LTLIBRARIES = src/modules/start/module.la
 src_modules_start_module_la_LIBADD = $(MOD_LIBS)
 src_modules_start_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_start_module_la_LDFLAGS = $(MOD_LDFLAGS)
-src_modules_start_module_la_SOURCES = src/modules/start/e_mod_main.c
+src_modules_start_module_la_SOURCES = \
+src/modules/start/e_mod_main.c \
+src/modules/start/start.c
 
 PHONIES += start install-start
 start: $(startpkg_LTLIBRARIES) $(start_DATA)
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index ba4f8e3..52e9268 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -320,8 +320,11 @@ E_API E_Module_Api e_modapi =
 E_API void *
 e_modapi_init(E_Module *m)
 {
+   EINTERN Evas_Object *start_create(Evas_Object *parent, int *id, 
E_Gadget_Site_Orient orient);
+
start_module = m;
e_gadcon_provider_register(&_gadcon_class);
+   e_gadget_type_add("Start", start_create, NULL);
return m;
 }
 
@@ -330,6 +333,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
start_module = NULL;
e_gadcon_provider_unregister(&_gadcon_class);
+   e_gadget_type_del("Start");
return 1;
 }
 
diff --git a/src/modules/start/start.c b/src/modules/start/start.c
new file mode 100644
index 000..8bdea5b
--- /dev/null
+++ b/src/modules/start/start.c
@@ -0,0 +1,220 @@
+#include "e.h"
+
+/* actual module specifics */
+typedef struct _Instance Instance;
+
+struct _Instance
+{
+   Evas_Object *o_button;
+   E_Menu  *main_menu;
+};
+
+static void
+do_orient(Instance *inst, E_Gadget_Site_Orient orient, E_Gadget_Site_Anchor 
anchor)
+{
+   char buf[4096];
+   const char *s = "float";
+
+   if (anchor & E_GADGET_SITE_ANCHOR_LEFT)
+ {
+if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+  {
+ switch (orient)
+   {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+  s = "top_left";
+  break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+  s = "left_top";
+  break;
+case E_GADGET_SITE_ORIENT_NONE:
+  s = "left_top";
+  break;
+   }
+  }
+else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+  {
+ switch (orient)
+   {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+  s = "bottom_left";
+  break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+  s = "left_bottom";
+  break;
+case E_GADGET_SITE_ORIENT_NONE:
+  s = "left_bottom";
+  break;
+   }
+  }
+else
+  s = "left";
+ }
+   else if (anchor & E_GADGET_SITE_ANCHOR_RIGHT)
+ {
+if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+  {
+ switch (orient)
+   {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+  s = "top_right";
+  break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+  s = "right_top";
+  break;
+case E_GADGET_SITE_ORIENT_NONE:
+  s = "right_top";
+  break;
+   }
+  }
+else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+  {
+ switch (orient)
+   {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+  s = "bottom_right";
+  break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+  s = "right_bottom";
+  break;
+case E_GADGET_SITE_ORIENT_NONE:
+  s = "right_bottom";
+  break;
+   }
+  }
+else
+  s = "right";
+ }
+   else if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ s = "top";
+   else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ s = "bottom";
+   else
+ {
+switch (orient)
+  {
+   case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ s = "horizontal";
+ break;
+   case 

[EGIT] [core/enlightenment] master 09/10: add bryce editor to Desktop item in main menu

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=f87020189c8592de8af4bb6572b6e987e46b2da4

commit f87020189c8592de8af4bb6572b6e987e46b2da4
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 14:39:33 2016 -0500

add bryce editor to Desktop item in main menu
---
 src/bin/e_int_menus.c | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 0c1c228..21c6f95 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -86,6 +86,12 @@ _e_int_menus_augmentation_find(const char *key)
return eina_hash_find(_e_int_menus_augmentation, key);
 }
 
+static void
+_e_int_menus_bryce_cb()
+{
+   e_bryce_edit(NULL);
+}
+
 #ifdef ISCOMFITOR
 static void
 _TEST_ADD(void *data, E_Dialog *dia EINA_UNUSED)
@@ -333,6 +339,11 @@ e_int_menus_desktops_new(void)
e_menu_item_submenu_set(mi, subm);
 
mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Add Bryce"));
+   e_util_menu_item_theme_icon_set(mi, "list-add");
+   e_menu_item_callback_set(mi, _e_int_menus_bryce_cb, NULL);
+
+   mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
 
mi = e_menu_item_new(m);

-- 

[EGIT] [core/enlightenment] master 07/10: add button to desklock config dialog for configuring gadgets

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=21a6a600c34226cb05a27442bdd441e3aca1353c

commit 21a6a600c34226cb05a27442bdd441e3aca1353c
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 10:25:47 2016 -0500

add button to desklock config dialog for configuring gadgets

the current security policy for this is based on two points:
1) don't add gadgets to your lockscreen that you don't want on your 
lockscreen
2) see #1

future improvements here will probably add gadget info to show what risks a 
gadget
may incur when placed on the lockscreen
---
 src/bin/e_gadget.h   |  1 +
 src/modules/conf_display/e_int_config_desklock.c | 10 ++
 2 files changed, 11 insertions(+)

diff --git a/src/bin/e_gadget.h b/src/bin/e_gadget.h
index f0bf2a5..863828a 100644
--- a/src/bin/e_gadget.h
+++ b/src/bin/e_gadget.h
@@ -136,5 +136,6 @@ E_API void e_gadget_util_allow_deny_ctxpopup(Evas_Object 
*g, const char *text, E
 
 E_API Evas_Object *e_gadget_editor_add(Evas_Object *parent, Evas_Object *site);
 E_API Evas_Object *e_gadget_site_edit(Evas_Object *site);
+E_API void e_gadget_site_desklock_edit(void);
 #endif
 #endif
diff --git a/src/modules/conf_display/e_int_config_desklock.c 
b/src/modules/conf_display/e_int_config_desklock.c
index 8e96d9e..12733ec 100644
--- a/src/modules/conf_display/e_int_config_desklock.c
+++ b/src/modules/conf_display/e_int_config_desklock.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_mod_main.h"
 
+
 static void*_create_data(E_Config_Dialog *cfd);
 static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data 
*cfdata);
 static void _fill_data(E_Config_Dialog_Data *cfdata);
@@ -210,6 +211,12 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, 
E_Config_Dialog_Data *cfdata)
free(cfdata);
 }
 
+static void
+_cb_lockscreen_gadgets()
+{
+   e_gadget_site_desklock_edit();
+}
+
 static Evas_Object *
 _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
@@ -273,6 +280,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, 
E_Config_Dialog_Data *cfdata)
  (cfdata->desklock_auth_method != E_DESKLOCK_AUTH_METHOD_EXTERNAL));
 
e_widget_list_object_append(ol, of, 1, 1, 0.5);
+   ow = e_widget_button_add(evas, _("Configure Lockscreen Gadgets"), 
"configure", _cb_lockscreen_gadgets, NULL, NULL);
+
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Locking"), ol,
  1, 0, 1, 0, 0.5, 0.0);
 

-- 

[EGIT] [core/enlightenment] master 10/10: require >= efl 1.17.1 for gadget theme stuff

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=57dca735861b71aa6c8d9bc56dbb4e4d6ed41253

commit 57dca735861b71aa6c8d9bc56dbb4e4d6ed41253
Author: Mike Blumenkrantz 
Date:   Fri Mar 4 14:23:23 2016 -0500

require >= efl 1.17.1 for gadget theme stuff
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1ac5831..07c1d79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ extern char **environ;
 AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
 ])
 
-efl_version="1.17"
+efl_version="1.17.1"
 AC_SUBST(efl_version)
 
 AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])

-- 

[EGIT] [core/elementary] master 03/05: theme: add new wireless gadget theme

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=0a368a4b1f8f1db66ed1c5809e495c7368776b99

commit 0a368a4b1f8f1db66ed1c5809e495c7368776b99
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 16:55:04 2016 -0500

theme: add new wireless gadget theme
---
 data/themes/Makefile.am   |   4 +
 data/themes/default.edc   |   1 +
 data/themes/edc/wireless.edc  | 954 ++
 data/themes/img/lock_insecure.png | Bin 0 -> 8014 bytes
 data/themes/img/lock_locked.png   | Bin 0 -> 7054 bytes
 data/themes/img/wifi_shadow.png   | Bin 0 -> 3932 bytes
 6 files changed, 959 insertions(+)

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 655b55a..1a7627c 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -90,6 +90,7 @@ edc/toolbar.edc \
 edc/transitions.edc \
 edc/wallpaper.edc \
 edc/winlist.edc \
+edc/wireless.edc \
 edc/wizard.edc \
 edc/xkbswitch.edc \
 \
@@ -528,6 +529,8 @@ img/led_strobe.png \
 img/led_tiny_blue.png \
 img/led_tiny_green.png \
 img/led_tiny_orange.png \
+img/lock_insecure.png \
+img/lock_locked.png \
 img/logo_blue_bottom.png \
 img/logo_blue_small_glow.png \
 img/logo_blue_small.png \
@@ -662,6 +665,7 @@ img/vgrad_shadow_bi.png \
 img/vgrad_tall.png \
 img/white_bar_vert_glow.png \
 img/wifi_base.png \
+img/wifi_shadow.png \
 img/wifi_sig_1.png \
 img/wifi_sig_2.png \
 img/wifi_sig_3.png \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 3ef5518..bab92ba 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -142,6 +142,7 @@ collections {
 #include "edc/illume.edc"
 #include "edc/bluez4.edc"
 #include "edc/packagekit.edc"
+#include "edc/wireless.edc"
 
 // icons
 #include "edc/icons.edc"
diff --git a/data/themes/edc/wireless.edc b/data/themes/edc/wireless.edc
new file mode 100644
index 000..6923ffe
--- /dev/null
+++ b/data/themes/edc/wireless.edc
@@ -0,0 +1,954 @@
+group { name: "e/gadget/wireless/ethernet"; nomouse;
+   images.image: "slot_horiz_top.png" COMP;
+   images.image: "slot_horiz_bottom.png" COMP;
+   images.image: "eth.png" COMP;
+   images.image: "exlclam.png" COMP;
+   images.image: "hole_tiny.png" COMP;
+   images.image: "led_tiny_orange.png" COMP;
+   images.image: "led_tiny_green.png" COMP;
+   images.image: "lock_locked.png" COMP;
+   images.image: "lock_insecure.png" COMP;
+
+   script {
+  public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_INT_SET) && (id == 1)) {
+new state = getarg(2);
+if ((state == 1)) {
+   set_state(PART:"led", "default", 0.0);
+   run_program(PROGRAM:"connecting");
+   return;
+}
+else if ((state == 2)) { set_state(PART:"led", "connected", 0.0); }
+else if ((state == 3)) { set_state(PART:"led", "online", 0.0); }
+else { set_state(PART:"led", "default", 0.0); }
+ }
+  }
+   }
+   parts {
+  part { name: "slot_bottom";
+ description { state: "default" 0.0;
+rel1.to: "slot";
+rel2.relative: 1.0 0.5;
+rel2.to: "slot";
+min: 0 3;
+image.normal: "slot_horiz_bottom.png";
+fixed: 0 1;
+ }
+  }
+///
+  part { name: "exclam_base";
+ clip_to: "clip_exclam";
+ description { state: "default" 0.0;
+aspect: (71/144) (71/144); aspect_preference: BOTH;
+align: 0.5 1.0;
+rel2.relative: 1.0 0.5;
+rel2.to_y: "slot";
+image.normal: "exlclam.png";
+ }
+  }
+///
+  part { name: "eth_base";
+ clip_to: "clip_eth";
+ description { state: "default" 0.0;
+aspect: (60/144) (60/144); aspect_preference: BOTH;
+align: 0.5 1.0;
+rel2.relative: 1.0 0.5;
+rel2.to_y: "slot";
+image.normal: "eth.png";
+ }
+  }
+  part { name: "slot";
+ description { state: "default" 0.0;
+rel1.offset: 0 -1;
+rel1.relative: (21/160) 1.0;
+rel2.offset: -1 -1;
+rel2.relative: (140/160) 1.0;
+align: 0.5 1.0;
+min: 0 6;
+image.normal: "slot_horiz_top.png";
+fixed: 0 1;
+ }
+  }
+  part { name: "hole";
+ description { state: "default" 0.0;
+rel1.offset: -4 -4;
+rel1.relative: 1.0 1.0;
+rel2.offset: -4 -4;
+align: 1.0 1.0;
+min: 4 4;
+max: 4 4;
+image.normal: "hole_tiny.png";
+fixed: 1 1;
+ }
+  }
+  part { name: "clip_exclam"; type: RECT;
+ description { state: "default" 0.0;
+visible: 1;
+ }
+ description { state: "eth" 0.0;
+visible: 0;
+ }
+  }
+  part { 

[EGIT] [core/elementary] master 04/05: theme: move digit* images to O/

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=da6f1644bf32c2704155f3dda8c8cd474e4e3464

commit da6f1644bf32c2704155f3dda8c8cd474e4e3464
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 08:43:53 2016 -0500

theme: move digit* images to O/
---
 data/themes/Makefile.am  |  28 -
 data/themes/edc/clock.edc|  50 +++---
 data/themes/edc/elm/clock.edc|  58 +--
 data/themes/img/{ => O}/digit_0.png  | Bin
 data/themes/img/{ => O}/digit_1.png  | Bin
 data/themes/img/{ => O}/digit_2.png  | Bin
 data/themes/img/{ => O}/digit_3.png  | Bin
 data/themes/img/{ => O}/digit_4.png  | Bin
 data/themes/img/{ => O}/digit_5.png  | Bin
 data/themes/img/{ => O}/digit_6.png  | Bin
 data/themes/img/{ => O}/digit_7.png  | Bin
 data/themes/img/{ => O}/digit_8.png  | Bin
 data/themes/img/{ => O}/digit_9.png  | Bin
 data/themes/img/{ => O}/digit_am.png | Bin
 data/themes/img/{ => O}/digit_na.png | Bin
 data/themes/img/{ => O}/digit_nm.png | Bin
 data/themes/img/{ => O}/digit_pm.png | Bin
 17 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 1a7627c..c026ac4 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -237,20 +237,20 @@ img/day_single_normal.png \
 img/day_single_press.png \
 img/day_single_selected.png \
 img/diagonal_stripes.png \
-img/digit_0.png \
-img/digit_1.png \
-img/digit_2.png \
-img/digit_3.png \
-img/digit_4.png \
-img/digit_5.png \
-img/digit_6.png \
-img/digit_7.png \
-img/digit_8.png \
-img/digit_9.png \
-img/digit_am.png \
-img/digit_na.png \
-img/digit_nm.png \
-img/digit_pm.png \
+img/O/digit_0.png \
+img/O/digit_1.png \
+img/O/digit_2.png \
+img/O/digit_3.png \
+img/O/digit_4.png \
+img/O/digit_5.png \
+img/O/digit_6.png \
+img/O/digit_7.png \
+img/O/digit_8.png \
+img/O/digit_9.png \
+img/O/digit_am.png \
+img/O/digit_na.png \
+img/O/digit_nm.png \
+img/O/digit_pm.png \
 img/dot_pattern.png \
 img/downlight_glow_left.png \
 img/downlight_glow.png \
diff --git a/data/themes/edc/clock.edc b/data/themes/edc/clock.edc
index 730861c..a6ccdaa 100644
--- a/data/themes/edc/clock.edc
+++ b/data/themes/edc/clock.edc
@@ -1,20 +1,20 @@
 group { name: "e/modules/clock/digital";
min: 64 16;
max: 512 128;
-   images.image: "digit_na.png" COMP;
-   images.image: "digit_nm.png" COMP;
-   images.image: "digit_0.png" COMP;
-   images.image: "digit_1.png" COMP;
-   images.image: "digit_2.png" COMP;
-   images.image: "digit_3.png" COMP;
-   images.image: "digit_4.png" COMP;
-   images.image: "digit_5.png" COMP;
-   images.image: "digit_6.png" COMP;
-   images.image: "digit_7.png" COMP;
-   images.image: "digit_8.png" COMP;
-   images.image: "digit_9.png" COMP;
-   images.image: "digit_am.png" COMP;
-   images.image: "digit_pm.png" COMP;
+   images.image: "O/digit_na.png" COMP;
+   images.image: "O/digit_nm.png" COMP;
+   images.image: "O/digit_0.png" COMP;
+   images.image: "O/digit_1.png" COMP;
+   images.image: "O/digit_2.png" COMP;
+   images.image: "O/digit_3.png" COMP;
+   images.image: "O/digit_4.png" COMP;
+   images.image: "O/digit_5.png" COMP;
+   images.image: "O/digit_6.png" COMP;
+   images.image: "O/digit_7.png" COMP;
+   images.image: "O/digit_8.png" COMP;
+   images.image: "O/digit_9.png" COMP;
+   images.image: "O/digit_am.png" COMP;
+   images.image: "O/digit_pm.png" COMP;
images.image: "hole_tiny.png" COMP;
script {
   public do_seconds, do_24h, do_date, tick_timer;
@@ -305,7 +305,7 @@ group { name: "e/modules/clock/digital";
   description { state: "default" 0.0; \
  rel1.to: _TO; rel2.to: _TO; \
  aspect: (52/72) (52/72); aspect_preference: BOTH; \
- image.normal: "digit_"_DIGIT".png"; \
+ image.normal: "O/digit_"_DIGIT".png"; \
  visible: 0; \
  color: 255 255 255 0; \
   } \
@@ -332,7 +332,7 @@ group { name: "e/modules/clock/digital";
   description { state: "default" 0.0; \
  rel1.to: _TO; rel2.to: _TO; \
  aspect: (52/72) (52/72); aspect_preference: BOTH; \
- image.normal: "digit_"_DIGIT".png"; \
+ image.normal: "O/digit_"_DIGIT".png"; \
  visible: 0; \
  color: 255 255 255 0; \
   } \
@@ -360,11 +360,11 @@ group { name: "e/modules/clock/digital";
   description { state: "default" 0.0; \
  rel1.to: _TO; rel2.to: _TO; \
  aspect: (48/31) (48/31); aspect_preference: BOTH; \
- image.normal: "digit_am.png"; \
+ image.normal: "O/digit_am.png"; \
   } \
   description { state: "active" 0.0; \
  inherit: "default" 0.0; \
- image.normal: "digit_pm.png"; \
+ image.normal: "O/digit_pm.png"; \
   } \
}
 #define BASE(_NAME, _BASE, _IMG) \
@@ -387,14 +387,14 @@ group { name: "e/modules/clock/digital";
   } \
}
   
-  BASE ("ha", 

[EGIT] [core/elementary] master 01/05: theme: add bryce edcs

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=d11193d5f61ba46bd99cf4b284629d4cfe28e591

commit d11193d5f61ba46bd99cf4b284629d4cfe28e591
Author: Mike Blumenkrantz 
Date:   Wed Mar 2 15:49:51 2016 -0500

theme: add bryce edcs
---
 data/themes/Makefile.am  |   2 +
 data/themes/default.edc  |   2 +
 data/themes/edc/bryce.edc| 371 +++
 data/themes/edc/bryce_editor.edc | 404 +++
 4 files changed, 779 insertions(+)

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 3f664dd..655b55a 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -33,6 +33,8 @@ edc/battery.edc \
 edc/bluez4.edc \
 edc/border.edc \
 edc/border-icons.edc \
+edc/bryce.edc \
+edc/bryce_editor.edc \
 edc/button.edc \
 edc/check.edc \
 edc/clock.edc \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index b7903e4..3ef5518 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -77,6 +77,8 @@ collections {
 #include "edc/comp_compat.edc"
 #include "edc/comp_effects.edc"
 #include "edc/background.edc"
+#include "edc/bryce.edc"
+#include "edc/bryce_editor.edc"
 #include "edc/shelf.edc"
 #include "edc/border.edc"
 #include "edc/dialog.edc"
diff --git a/data/themes/edc/bryce.edc b/data/themes/edc/bryce.edc
new file mode 100644
index 000..f265d3d
--- /dev/null
+++ b/data/themes/edc/bryce.edc
@@ -0,0 +1,371 @@
+group { name: "e/bryce/default/base"; nomouse;
+   data {
+  /* this tells e the number of pixels of the bryce to leave "exposed"
+   * when auto-hiding the bryce */
+  item: "hidden_state_size" "2";
+   }
+   images.image: "vgrad_med.png" COMP;
+   images.image: "vgrad_tall.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "holes_vert.png" COMP;
+   images.image: "holes_horiz.png" COMP;
+   images.image: "shine.png" COMP;
+   parts {
+  rect { "mouse"; mouse;
+ desc { color: 0 0 0 0; }
+  }
+  part { name: "bg";
+ description { state: "default" 0.0;
+image.normal: "vgrad_med.png";
+fill.smooth: 0;
+TILED_HORIZ(120)
+color_class: "bryce_base";
+ }
+ description { state: "vert" 0.0;
+image.normal: "vgrad_tall.png";
+fill.smooth: 0;
+TILED_HORIZ(40)
+color_class: "bryce_base";
+ }
+  }
+  part { name: "bevel";
+ description { state: "default" 0.0;
+image.normal: "bevel_out.png";
+image.border: 1 1 1 1;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "dots_start";
+ description { state: "default" 0.0;
+image.normal: "holes_vert.png";
+rel1.offset: 2 2;
+rel2.relative: 0.0 1.0;
+rel2.offset: 5 -3;
+FIXED_SIZE(4, 14)
+ }
+ description { state: "vert" 0.0;
+image.normal: "holes_horiz.png";
+rel1.offset: 2 2;
+rel2.relative: 1.0 0.0;
+rel2.offset: -3 5;
+FIXED_SIZE(14, 4)
+ }
+  }
+  part { name: "dots_end";
+ description { state: "default" 0.0;
+image.normal: "holes_vert.png";
+rel1.relative: 1.0 0.0;
+rel1.offset: -6 2;
+rel2.offset: -3 -3;
+FIXED_SIZE(4, 14)
+ }
+ description { state: "vert" 0.0;
+image.normal: "holes_horiz.png";
+rel1.relative: 0.0 1.0;
+rel1.offset: 2 -6;
+rel2.offset: -3 -3;
+FIXED_SIZE(14, 4)
+ }
+  }
+  spacer { "sizer";
+ description { state: "default" 0.0;
+rel1.offset: 1 0;
+rel1.relative: 1.0 0.0;
+rel1.to_x: "dots_start";
+rel2.offset: -2 -1;
+rel2.to_x: "dots_end";
+rel2.relative: 0.0 1.0;
+ }
+ description { state: "vert" 0.0;
+rel1.offset: 0 1;
+rel1.relative: 0.0 1.0;
+rel1.to_y: "dots_start";
+rel2.offset: -1 -2;
+rel2.to_y: "dots_end";
+rel2.relative: 1.0 0.0;
+ }
+  }
+  part { name: "e.swallow.content"; type: SWALLOW; mouse;
+ desc {
+rel.to: "sizer";
+link.base: "e,state,visible" "e";
+ }
+ desc { "hidden"; hid;
+rel.to: "sizer";
+link.base: "e,state,hidden" "e";
+ }
+  }
+  part { name: "shine";
+ description { state: "default" 0.0;
+image.normal: "shine.png";
+rel1.offset: 0 -2;
+rel2.relative: 1.0 0.0;
+rel2.offset: -1 2;
+FIXED_SIZE(69, 5)
+ }
+  }
+  rect { "text_fader"; mouse;
+ desc { hid;
+color: 0 0 0 0;
+ }

[EGIT] [core/elementary] master 05/05: theme: add new time gadget themes

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=f65d5d6b3f784f14583e126a9ecf48da819067f8

commit f65d5d6b3f784f14583e126a9ecf48da819067f8
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 09:52:38 2016 -0500

theme: add new time gadget themes
---
 data/themes/Makefile.am  |   15 +
 data/themes/default.edc  |1 +
 data/themes/edc/time.edc | 1379 ++
 data/themes/img/digit_0.png  |  Bin 0 -> 2526 bytes
 data/themes/img/digit_1.png  |  Bin 0 -> 577 bytes
 data/themes/img/digit_2.png  |  Bin 0 -> 2443 bytes
 data/themes/img/digit_3.png  |  Bin 0 -> 2236 bytes
 data/themes/img/digit_4.png  |  Bin 0 -> 1563 bytes
 data/themes/img/digit_5.png  |  Bin 0 -> 2335 bytes
 data/themes/img/digit_6.png  |  Bin 0 -> 2588 bytes
 data/themes/img/digit_7.png  |  Bin 0 -> 1542 bytes
 data/themes/img/digit_8.png  |  Bin 0 -> 2669 bytes
 data/themes/img/digit_9.png  |  Bin 0 -> 2663 bytes
 data/themes/img/digit_am.png |  Bin 0 -> 1347 bytes
 data/themes/img/digit_na.png |  Bin 0 -> 2014 bytes
 data/themes/img/digit_nm.png |  Bin 0 -> 533 bytes
 data/themes/img/digit_pm.png |  Bin 0 -> 1224 bytes
 17 files changed, 1395 insertions(+)

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index c026ac4..3191256 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -86,6 +86,7 @@ edc/systray.edc \
 edc/tasks.edc \
 edc/temperature.edc \
 edc/textblock.edc \
+edc/time.edc \
 edc/toolbar.edc \
 edc/transitions.edc \
 edc/wallpaper.edc \
@@ -237,6 +238,20 @@ img/day_single_normal.png \
 img/day_single_press.png \
 img/day_single_selected.png \
 img/diagonal_stripes.png \
+img/digit_0.png \
+img/digit_1.png \
+img/digit_2.png \
+img/digit_3.png \
+img/digit_4.png \
+img/digit_5.png \
+img/digit_6.png \
+img/digit_7.png \
+img/digit_8.png \
+img/digit_9.png \
+img/digit_am.png \
+img/digit_na.png \
+img/digit_nm.png \
+img/digit_pm.png \
 img/O/digit_0.png \
 img/O/digit_1.png \
 img/O/digit_2.png \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index bab92ba..2ba757d 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -143,6 +143,7 @@ collections {
 #include "edc/bluez4.edc"
 #include "edc/packagekit.edc"
 #include "edc/wireless.edc"
+#include "edc/time.edc"
 
 // icons
 #include "edc/icons.edc"
diff --git a/data/themes/edc/time.edc b/data/themes/edc/time.edc
new file mode 100644
index 000..31852f3
--- /dev/null
+++ b/data/themes/edc/time.edc
@@ -0,0 +1,1379 @@
+color_classes {
+color_class { "e.clock_color_fg";
+   color: FN_COL_HIGHLIGHT;
+   desc: "Foreground color of the digital clock";
+}
+color_class { "e.clock_color_bg";
+   color: 31 31 31 255;
+   desc: "Backgound color of the digital clock";
+}
+}
+
+group { "e/gadget/clock/digital/advanced"; nomouse;
+   script {
+  public message(Msg_Type:type, id, ...) {
+#define CUSTOM(NAME) \
+custom_state(PART:NAME, "default", 0.0); \
+set_state_val(PART:NAME, STATE_COLOR_CLASS, str); \
+set_state(PART:NAME, "custom", 0.0)
+
+ if ((type == MSG_STRING_INT) && (id == 3)) {
+new str[128];
+new on;
+
+getsarg(2, str, sizeof(str));
+on = getarg(3);
+if (on) {
+CUSTOM("clip");
+} else {
+set_state(PART:"clip", "default", 0.0);
+}
+#undef CUSTOM
+ }
+  }
+   }
+   parts {
+  rect { "clip";
+ desc {
+ color_class: "e.clock_color_fg";
+ }
+  }
+  text { "e.text"; scale; clip: "clip";
+  effect: GLOW;
+  desc { "default";
+  align: 0.5 0;
+  rel1.offset: 2 0;
+  rel2.relative: 1 0;
+  rel2.offset: -3 -1;
+  color: FN_COL_DEFAULT_BASIC;
+  text {
+  font: FN;
+  size: 12;
+  min: 1 1;
+  text_class: "module_normal";
+  ellipsis: -1;
+  }
+  }
+  desc { "only"; inherit;
+ align: 0.5 0.5;
+ rel2.relative: 1 1;
+ text.fit: 0 1;
+ text.font: FNBD;
+ text.text_class: "module_large";
+  }
+  }
+  text { "e.text.sub"; scale; clip: "clip";
+  effect: GLOW;
+  desc { "default";
+  align: 0.5 0;
+  rel1.relative: 0 1;
+  rel1.offset: 2 0;
+  rel1.to_y: "e.text";
+  rel2.offset: -3 -1;
+  color: FN_COL_DEFAULT_BASIC;
+  text {
+  font: FN;
+  size: 9;
+  min: 1 1;
+  text_class: "module_small";
+  ellipsis: -1;
+  }
+  }
+  desc { "only"; hid;
+ max: 0 0;
+  }
+  

[EGIT] [core/enlightenment] master 02/02: trigger mouse binding end callbacks on mouse up

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d4996e2db38ddaff1d01707b5a881b149e9ff9e7

commit d4996e2db38ddaff1d01707b5a881b149e9ff9e7
Author: Mike Blumenkrantz 
Date:   Thu Mar 3 14:54:50 2016 -0500

trigger mouse binding end callbacks on mouse up

broken by copy/paste errors last month

ref fe5d2e6e61747e27292339b01c8b5f9193ecad62
---
 src/bin/e_bindings.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index eceb12c..c47101b 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -507,13 +507,13 @@ e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, 
E_Object *obj, E_Bindin
  {
 act = e_bindings_mouse_button_find(ctxt, ev, );
 if (!act) break;
-if (act->func.go_mouse)
+if (act->func.end_mouse)
   {
- if (!act->func.go_mouse(obj, binding->params, ev))
+ if (!act->func.end_mouse(obj, binding->params, ev))
continue;
   }
-else if (act->func.go)
-  act->func.go(obj, binding->params);
+else if (act->func.end)
+  act->func.end(obj, binding->params);
 break;
  }
return act;

-- 

[EGIT] [tools/enventor] master 01/01: editor: reset cursor position when edc is loaded.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=332bbeda4f4fca9c0857fae9bf1b3be94baf0c2b

commit 332bbeda4f4fca9c0857fae9bf1b3be94baf0c2b
Author: Hermet Park 
Date:   Sat Mar 5 00:30:52 2016 +0900

editor: reset cursor position when edc is loaded.

edc editor needs to reset cursor position when a edc is newly loaded.

People granted this behavior.
---
 src/lib/edc_editor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 999400b..4eabad7 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1078,6 +1078,7 @@ edit_edc_load(edit_data *ed, const char *file_path)
elm_entry_entry_append(ed->en_line, markup_line);
free(markup_line);
 
+   ed->cur_line = 1;
ed->line_max = line_num;
 
group_name = parser_first_group_name_get(ed->pd, ed->en_edit);
@@ -1104,6 +1105,8 @@ err:
 
eina_stringshare_del(group_name);
 
+   elm_entry_cursor_pos_set(ed->en_edit, 0);
+
return ret;
 }
 

-- 

[EGIT] [tools/enventor] master 01/01: editor: fix initial max line 0 issue.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=7795dbe1012864d5d1d9efbaa86195f5c249bd27

commit 7795dbe1012864d5d1d9efbaa86195f5c249bd27
Author: Hermet Park 
Date:   Sat Mar 5 00:26:41 2016 +0900

editor: fix initial max line 0 issue.

Update max line correctly of the statusbar.
This fix brought Enventor_Max_Line passed away
because Enventor_Cursor_Line can be used instead.

@fix
---
 src/bin/main.c|  4 +++-
 src/lib/Enventor_Legacy.h |  8 ++--
 src/lib/edc_editor.c  | 25 ++---
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index 2b5c558..a46459f 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -392,7 +392,7 @@ enventor_cursor_line_changed_cb(void *data EINA_UNUSED, 
Evas_Object *obj,
 void *event_info)
 {
Enventor_Cursor_Line *cur_line = (Enventor_Cursor_Line *)event_info;
-   stats_line_num_update(cur_line->line, enventor_object_max_line_get(obj));
+   stats_line_num_update(cur_line->cur_line, cur_line->max_line);
 }
 
 static void
@@ -520,6 +520,8 @@ static void
 enventor_setup(app_data *ad)
 {
Evas_Object *enventor = enventor_object_add(base_layout_get());
+   evas_object_smart_callback_add(enventor, "max_line,changed",
+  enventor_cursor_line_changed_cb, ad);
evas_object_smart_callback_add(enventor, "cursor,line,changed",
   enventor_cursor_line_changed_cb, ad);
evas_object_smart_callback_add(enventor, "cursor,group,changed",
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index 829f93c..3e1b54d 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -50,16 +50,12 @@ typedef struct
 
 typedef struct
 {
-   int line;
+   int cur_line;
+   int max_line;
 } Enventor_Cursor_Line;
 
 typedef struct
 {
-   int line;
-} Enventor_Max_Line;
-
-typedef struct
-{
Eina_Bool self_changed : 1;
 } Enventor_EDC_Modified;
 
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index e08aa16..999400b 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -800,7 +800,8 @@ cur_line_pos_set(edit_data *ed, Eina_Bool force)
ed->cur_line = line;
 
Enventor_Cursor_Line cur_line;
-   cur_line.line = line;
+   cur_line.cur_line = line;
+   cur_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_CURSOR_LINE_CHANGED,
_line);
 }
@@ -1008,7 +1009,6 @@ static Eina_Bool
 edit_edc_load(edit_data *ed, const char *file_path)
 {
char buf[MAX_LINE_DIGIT_CNT];
-
Eina_File *file = NULL;
Eina_Strbuf *strbuf_line = NULL;
Eina_Stringshare *group_name = NULL;
@@ -1093,10 +1093,11 @@ err:
if (utf8_edit) eina_file_map_free(file, utf8_edit);
if (file) eina_file_close(file);
 
-   Enventor_Max_Line max_line;
-   max_line.line = ed->line_max;
+   Enventor_Cursor_Line cursor_line;
+   cursor_line.cur_line = ed->cur_line;
+   cursor_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_MAX_LINE_CHANGED,
-   _line);
+   _line);
 
if (ed->view_sync_cb)
  ed->view_sync_cb(ed->view_sync_cb_data, NULL, 0.0, NULL, group_name);
@@ -1737,10 +1738,11 @@ edit_line_increase(edit_data *ed, int cnt)
  }
elm_entry_calc_force(ed->en_line);
 
-   Enventor_Max_Line max_line;
-   max_line.line = ed->line_max;
+   Enventor_Cursor_Line cur_line;
+   cur_line.cur_line = ed->cur_line;
+   cur_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_MAX_LINE_CHANGED,
-   _line);
+   _line);
 }
 
 void
@@ -1771,10 +1773,11 @@ edit_line_decrease(edit_data *ed, int cnt)
 
if (ed->line_max < 1) line_init(ed);
 
-   Enventor_Max_Line max_line;
-   max_line.line = ed->line_max;
+   Enventor_Cursor_Line cur_line;
+   cur_line.cur_line = ed->cur_line;
+   cur_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_MAX_LINE_CHANGED,
-   _line);
+   _line);
 }
 
 void

-- 

[EGIT] [tools/enventor] master 01/01: status: update line ui.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=da5134a165471a95e86f350341d244d4f0ffe1d0

commit da5134a165471a95e86f350341d244d4f0ffe1d0
Author: Hermet Park 
Date:   Sat Mar 5 00:06:35 2016 +0900

status: update line ui.
---
 data/themes/default/layout_common.edc | 27 +++
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/data/themes/default/layout_common.edc 
b/data/themes/default/layout_common.edc
index 7372723..5c8712e 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2406,7 +2406,7 @@ group { name: "statusbar_layout";
 fixed: 1 0;
 color: COL_NM;
 text {
-   text: "Line [";
+   text: "Line  ";
size: 11;
align: 1 0.5;
min: 1 0;
@@ -2463,10 +2463,8 @@ group { name: "statusbar_layout";
  scale: 1;
  effect: GLOW;
  description { state: "default" 0.0;
-rel1.to_x: "elm.text.line]";
-rel2.to_x: "elm.text.line]";
-rel1.relative: 0.0 0.0;
-rel2.relative: 0.0 1.0;
+rel1.relative: 1.0 0.0;
+rel2.relative: 1.0 1.0;
 align: 1 0.5;
 fixed: 1 0;
 color: COL_HI;
@@ -2478,25 +2476,6 @@ group { name: "statusbar_layout";
 }
  }
   }
-  part { name: "elm.text.line]";
- type: TEXT;
- clip_to: "base_clip";
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
-rel1.relative: 1 0;
-align: 1 0.5;
-fixed: 1 0;
-color: COL_NM;
-text {
-   text: "]";
-   size: 11;
-   align: 1 0.5;
-   min: 1 0;
-   ellipsis: -1;
-}
- }
-  }
   part { name: "elm.text.info_msg";
  type: TEXT;
  scale: 1;

-- 

[EGIT] [tools/enventor] master 01/01: update status cursor image.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=683e13de47615bee387758bd3e11c52b7ce847c8

commit 683e13de47615bee387758bd3e11c52b7ce847c8
Author: Hermet Park 
Date:   Sat Mar 5 00:02:54 2016 +0900

update status cursor image.
---
 data/themes/default/images/cursor_arrow.png | Bin 325 -> 264 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/themes/default/images/cursor_arrow.png 
b/data/themes/default/images/cursor_arrow.png
index d02f5b0..c58b971 100644
Binary files a/data/themes/default/images/cursor_arrow.png and 
b/data/themes/default/images/cursor_arrow.png differ

-- 

[EGIT] [core/efl] master 01/01: tests: disable loading of the scim module as this can causes hangs of the tests

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d32aa995e021c49ed585329a3ed9b9ca0f4a2586

commit d32aa995e021c49ed585329a3ed9b9ca0f4a2586
Author: Stefan Schmidt 
Date:   Fri Mar 4 15:36:01 2016 +0100

tests: disable loading of the scim module as this can causes hangs of the 
tests

With scim installed we can run into hangs of the test suite when the 
ecore_imf
scim module tries to connect to the scim on the system. This has happened 
again
and again on different installations and made the test suite really fragile.

We would need to make sure that scim is configured on the host before we 
could
run this test. It might be a candidate for skipped tests where we check if 
the
env has all we need to run the test and if not skip it. We don not have all 
the
needed pieces in place for this so the best we can do to make the test runs 
less
fragile is disabling scim module loading for now.
---
 src/tests/ecore/ecore_test_ecore_imf.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tests/ecore/ecore_test_ecore_imf.c 
b/src/tests/ecore/ecore_test_ecore_imf.c
index f1ca873..486aa46 100644
--- a/src/tests/ecore/ecore_test_ecore_imf.c
+++ b/src/tests/ecore/ecore_test_ecore_imf.c
@@ -21,7 +21,10 @@ static const char *built_modules[] = {
   "ibus",
 #endif
 #ifdef BUILD_ECORE_IMF_SCIM
-  "scim",
+/* The scim module needs some configuration on the host or it might just block
+ * the whole test suite when it tries to load the module. Disabling it as we
+ * do not have control over the host.
+  "scim", */
 #endif
   NULL
 };

-- 

[EGIT] [tools/enventor] master 01/01: statusbar: replace a group guide text with a group icon.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=e78aec8ef67e4b2ef7d7761d3fca7fccdfa70cef

commit e78aec8ef67e4b2ef7d7761d3fca7fccdfa70cef
Author: Hermet Park 
Date:   Fri Mar 4 23:58:13 2016 +0900

statusbar: replace a group guide text with a group icon.
---
 data/themes/default/layout_common.edc | 57 +--
 1 file changed, 8 insertions(+), 49 deletions(-)

diff --git a/data/themes/default/layout_common.edc 
b/data/themes/default/layout_common.edc
index 2daf59b..7372723 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -10,6 +10,7 @@ images {
image: "pm_fill.png" COMP;
image: "full_logo.png" COMP;
image: "cursor_arrow.png" COMP;
+   image: "navi_group.png" COMP;
 }
 
 group { name: "about_layout";
@@ -2333,39 +2334,19 @@ group { name: "statusbar_layout";
 align: 1 0.5;
  }
   }
-  swallow { "group_btn";
+  image { "group_icon";
  clip_to: "base_clip";
  scale: 1;
- description { state: "default" 0.0;
-rel1.to_x: "elm.text.group[";
-rel2.to_x: "elm.text.group[";
-rel1.relative: 0.0 0.0;
-rel2.relative: 0.0 1.0;
-align: 1 0.5;
-min: 18 18;
-fixed: 1 0;
- }
-  }
-  part { name: "elm.text.group[";
- type: TEXT;
- clip_to: "base_clip";
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
+ desc { "default";
 rel1.to_x: "cursor_spacer";
 rel2.to_x: "elm.text.group_name";
 rel1.relative: 1.0 0.0;
 rel2.relative: 0.0 1.0;
+rel1.offset: 0 1;
+min: 15 15;
+max: 15 15;
 align: 1 0.5;
-color: COL_NM;
-text {
-   text: "Group [";
-   size: 11;
-   align: 1 0.5;
-   min: 1 0;
-   max: 1 0;
-   ellipsis: -1;
-}
+image.normal: "navi_group.png";
  }
   }
   part { name: "elm.text.group_name";
@@ -2375,7 +2356,7 @@ group { name: "statusbar_layout";
  effect: GLOW;
  description { state: "default" 0.0;
 rel1.to_x: "group_spacer";
-rel2.to_x: "elm.text.group]";
+rel2.to_x: "line_spacer";
 rel1.relative: 0.0 0.0;
 rel2.relative: 0.0 1.0;
 align: 1 0.5;
@@ -2389,28 +2370,6 @@ group { name: "statusbar_layout";
 }
  }
   }
-  part { name: "elm.text.group]";
- type: TEXT;
- scale: 1;
- effect: SHADOW BOTTOM;
- clip_to: "base_clip";
- description {
-rel1.to_x: "line_spacer";
-rel1.relative: 0 0.0;
-rel2.to_x: "line_spacer";
-rel2.relative: 0 1.0;
-align: 1 0.5;
-fixed: 1 0;
-color: COL_NM;
-text {
-   text: "]";
-   size: 11;
-   align: 1 0.5;
-   min: 1 0;
-   ellipsis: -1;
-}
- }
-  }
   part { name: "line_spacer";
  type: SPACER;
  scale: 1;

-- 

[EGIT] [apps/terminology] master 01/01: Allow user to set the title of the each tab

[José Roberto de Souza]

zehortigoza pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=ae7e96633a74324d0a41ad58e71ef6e88acdf959

commit ae7e96633a74324d0a41ad58e71ef6e88acdf959
Author: José Roberto de Souza 
Date:   Wed Mar 2 11:37:02 2016 -0300

Allow user to set the title of the each tab
---
 AUTHORS  |  2 +-
 src/bin/controls.c   | 12 
 src/bin/termio.c | 16 
 src/bin/termio.h |  1 +
 src/bin/termpty.c|  1 +
 src/bin/termpty.h|  2 +-
 src/bin/termptyesc.c |  3 ++-
 src/bin/win.c| 54 
 src/bin/win.h|  1 +
 9 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 97d20c3..b159de5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,7 +23,7 @@ Kai Huuhko 
 Mike McCormack 
 Iván Briano 
 Jerome Pinot 
-José Roberto de Souza 
+José Roberto de Souza 
 Leandro Pereira 
 Leif Middelschulte 
 Markus Törnqvist 
diff --git a/src/bin/controls.c b/src/bin/controls.c
index d75041a..c9a62b3 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -92,6 +92,12 @@ _cb_ct_miniview(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *even
 }
 
 static void
+_cb_ct_set_title(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void 
*event EINA_UNUSED)
+{
+term_set_title(termio_term_get(ct_term));
+}
+
+static void
 _cb_ct_close(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event 
EINA_UNUSED)
 {
term_close(ct_win, ct_term, EINA_FALSE);
@@ -277,6 +283,12 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, 
Evas_Object *term,
 o = _button_add(win, _("Miniview"), "mini-view", _cb_ct_miniview, 
NULL);
 elm_box_pack_end(ct_box, o);
 
+o = _sep_add_h(win);
+elm_box_pack_end(ct_box, o);
+
+o = _button_add(win, _("Set title"), "document-edit", 
_cb_ct_set_title, NULL);
+elm_box_pack_end(ct_box, o);
+
 o = _sep_add_v(win);
 elm_box_pack_end(ct_boxh, o);
 
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 20d5759..2d3a941 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -348,9 +348,25 @@ termio_title_get(Evas_Object *obj)
 {
Termio *sd = evas_object_smart_data_get(obj);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, NULL);
+   if (sd->pty->prop.user_title)
+ return sd->pty->prop.user_title;
return sd->pty->prop.title;
 }
 
+void
+termio_user_title_set(Evas_Object *obj, const char *title)
+{
+Termio *sd = evas_object_smart_data_get(obj);
+EINA_SAFETY_ON_NULL_RETURN(sd);
+
+if (sd->pty->prop.user_title)
+  eina_stringshare_del(sd->pty->prop.user_title);
+
+sd->pty->prop.user_title = eina_stringshare_add(title);
+if (sd->pty->cb.set_title.func)
+  sd->pty->cb.set_title.func(sd->pty->cb.set_title.data);
+}
+
 const char *
 termio_icon_name_get(Evas_Object *obj)
 {
diff --git a/src/bin/termio.h b/src/bin/termio.h
index e4d8df6..3b660e9 100644
--- a/src/bin/termio.h
+++ b/src/bin/termio.h
@@ -35,6 +35,7 @@ Eina_Booltermio_cwd_get(const Evas_Object *obj, char 
*buf, size_t size);
 Evas_Object *termio_textgrid_get(Evas_Object *obj);
 Evas_Object *termio_win_get(Evas_Object *obj);
 const char  *termio_title_get(Evas_Object *obj);
+void termio_user_title_set(Evas_Object *obj, const char *title);
 const char  *termio_icon_name_get(Evas_Object *obj);
 void termio_media_mute_set(Evas_Object *obj, Eina_Bool mute);
 void termio_media_visualize_set(Evas_Object *obj, Eina_Bool visualize);
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 612c0e9..d9373ae 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -603,6 +603,7 @@ termpty_free(Termpty *ty)
if (ty->hand_exe_exit) ecore_event_handler_del(ty->hand_exe_exit);
if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd);
if (ty->prop.title) eina_stringshare_del(ty->prop.title);
+   if (ty->prop.user_title) eina_stringshare_del(ty->prop.user_title);
if (ty->prop.icon) eina_stringshare_del(ty->prop.icon);
if (ty->back)
  {
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index e841245..ac1f553 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -85,7 +85,7 @@ struct _Termpty
   } change, set_title, set_icon, cancel_sel, exited, bell, command;
} cb;
struct {
-  const char *title, *icon;
+  const char *title, *icon, *user_title;
} prop;
const char *cur_cmd;
Termcell *screen, *screen2;
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 3b0552f..0daeda4 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -1326,7 +1326,8 @@ _handle_esc_xterm(Termpty *ty, const Eina_Unicode *c, 
Eina_Unicode *ce)
   ty->prop.title = NULL;
 

[EGIT] [tools/enventor] master 02/02: goto: add null checking about the return value of elm_entry_entry_get

[taehyub]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=c8f5d743cbb6add2b766a812f43fbcc6ee5aec24

commit c8f5d743cbb6add2b766a812f43fbcc6ee5aec24
Author: taehyub 
Date:   Fri Mar 4 23:39:35 2016 +0900

goto: add null checking about the return value of elm_entry_entry_get

Summary:
there is no null checking condition,
so I added the null checking condition about the return value of 
elm_entry_entry_get.
@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3763
---
 src/bin/goto.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/bin/goto.c b/src/bin/goto.c
index fb1245e..3fdaafa 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -78,6 +78,9 @@ entry_changed_cb(void *data, Evas_Object *obj, void* 
event_info EINA_UNUSED)
 {
goto_data *gd = data;
const char *txt = elm_entry_entry_get(obj);
+
+   if (!txt) return;
+
if (txt[0] == 0) return;
 
int line = atoi(txt);

-- 

[EGIT] [tools/enventor] master 01/02: edc_editor: add null checking in error_line_num_highlight function

[taehyub]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=a512a80782a1f4aa0793d236bcfb33a0d7a4f888

commit a512a80782a1f4aa0793d236bcfb33a0d7a4f888
Author: taehyub 
Date:   Fri Mar 4 23:39:14 2016 +0900

edc_editor: add null checking in error_line_num_highlight function

Summary:
in error_line_num_highlight, utf8 can be null.
so, I added null checking about it.

@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3764
---
 src/lib/edc_editor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 65809aa..e08aa16 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1696,6 +1696,9 @@ error_line_num_highlight(edit_data *ed)
char *utf8 = (char *)color_cancel(syntax_color_data_get(ed->sh), text,
  strlen(text), from_line, to_line, ,
  );
+
+   if (!utf8) return;
+
if (ed->error_line == -1)
  {
 evas_object_textblock_text_markup_set(tb, utf8);

-- 

[EGIT] [tools/enventor] master 01/01: base_gui: fix the wrong condition

[taehyub]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=20b99c0d4818cb6386fdfed451715d27a2ba7f7d

commit 20b99c0d4818cb6386fdfed451715d27a2ba7f7d
Author: taehyub 
Date:   Fri Mar 4 23:38:41 2016 +0900

base_gui: fix the wrong condition

Summary:
There is a wrong condition in base_gui.c like if ((w>0) && (w>0)).
The condition compares to same rule.

@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3767
---
 src/bin/base_gui.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 776febc..6146d69 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -295,7 +295,7 @@ base_gui_init(void)
 
Evas_Coord w, h;
config_win_size_get(, );
-   if ((w > 0) && (w > 0))
+   if ((w > 0) && (h > 0))
  evas_object_resize(win, w, h);
 
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, win_resize_cb,

-- 

[EGIT] [tools/enventor] master 01/01: edc_navigator: add return value

[taehyub]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=04415c8d70d4c0fd3374758dccfa87f5f3f06157

commit 04415c8d70d4c0fd3374758dccfa87f5f3f06157
Author: taehyub 
Date:   Fri Mar 4 23:36:27 2016 +0900

edc_navigator: add return value

Summary:
There is a missing return value in edc_navigator.c

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3768
---
 src/bin/edc_navigator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index b7ce624..982c34c 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -307,7 +307,7 @@ static char*
 find_programs_proc_internal(char *utf8, char *utf8_end, const char *group_name)
 {
char *p = find_group_proc_internal(utf8, utf8_end, group_name);
-   if (!p) return;
+   if (!p) return NULL;
 
p = strstr(p, "\"");
if (!p) return NULL;

-- 

[EGIT] [core/efl] master 01/07: Eo tests: Increase coverage for children iterator tests.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b5b843bcdec508a24726ff62524dc26d8c21ebf6

commit b5b843bcdec508a24726ff62524dc26d8c21ebf6
Author: Tom Hacohen 
Date:   Fri Mar 4 14:16:30 2016 +

Eo tests: Increase coverage for children iterator tests.
---
 src/tests/eo/children/children_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/eo/children/children_main.c 
b/src/tests/eo/children/children_main.c
index 8935228..9d30277 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -36,6 +36,8 @@ main(int argc, char *argv[])
CHECK_ITER_DATA(iter, chld, child3);
fail_if(eina_iterator_next(iter, ));
 
+   fail_if(eina_iterator_container_get(iter) != parent);
+
eina_iterator_free(iter);
 
eo_del(child2);

-- 

[EGIT] [core/efl] master 04/07: Eo: remove the long deprecated eo_data_get.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b55ec7a34e12e36ca54541ee0b250e802ab0a13f

commit b55ec7a34e12e36ca54541ee0b250e802ab0a13f
Author: Tom Hacohen 
Date:   Fri Mar 4 14:23:02 2016 +

Eo: remove the long deprecated eo_data_get.

It has been deprecated for a while, and now it's time to actually stop
using it.
---
 src/lib/eo/Eo.h  | 9 -
 src/lib/eo/eo.c  | 6 --
 src/tests/eo/suite/eo_test_general.c | 1 -
 3 files changed, 16 deletions(-)

diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index a0b817c..57d1c12 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -652,15 +652,6 @@ EAPI Eo * _eo_add_internal_start(const char *file, int 
line, const Eo_Class *kla
 
 /**
  * @brief Get a pointer to the data of an object for a specific class.
- * @param obj the object to work on.
- * @param klass the klass associated with the data.
- * @return a pointer to the data.
- * @deprecated use eo_data_scope_get or eo_data_ref instead.
- */
-EAPI void *eo_data_get(const Eo *obj, const Eo_Class *klass) EINA_DEPRECATED;
-
-/**
- * @brief Get a pointer to the data of an object for a specific class.
  * The data reference count is not incremented. The pointer must be used only
  * in the scope of the function and its callees.
  * @param obj the object to work on.
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index cc0c978..996b961 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -1454,12 +1454,6 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, 
const _Eo_Object *ref_obj)
 }
 
 EAPI void *
-eo_data_get(const Eo *obj_id, const Eo_Class *klass_id)
-{
-   return eo_data_scope_get(obj_id, klass_id);
-}
-
-EAPI void *
 eo_data_scope_get(const Eo *obj_id, const Eo_Class *klass_id)
 {
void *ret;
diff --git a/src/tests/eo/suite/eo_test_general.c 
b/src/tests/eo/suite/eo_test_general.c
index cfe5767..c01a621 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -200,7 +200,6 @@ START_TEST(eo_data_fetch)
 
obj = eo_add(klass, NULL);
fail_if(!obj);
-   fail_if(eo_data_get(obj, klass));
fail_if(eo_data_scope_get(obj, klass));
fail_if(!eo_data_scope_get(obj, EO_BASE_CLASS));
eo_unref(obj);

-- 

[EGIT] [core/efl] master 03/07: Eo tests: Test more cases with legacy events.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=70e900db10473638ddb1d8e55e58d5fd14497142

commit 70e900db10473638ddb1d8e55e58d5fd14497142
Author: Tom Hacohen 
Date:   Fri Mar 4 14:21:08 2016 +

Eo tests: Test more cases with legacy events.
---
 src/tests/eo/suite/eo_test_general.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/tests/eo/suite/eo_test_general.c 
b/src/tests/eo/suite/eo_test_general.c
index c6514cc..cfe5767 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -134,6 +134,11 @@ START_TEST(eo_signals)
 ck_assert_str_eq(a_desc->name, "a,changed");
 fail_if(a_desc == EV_A_CHANGED);
 
+/* Check that when calling again we still get the same event. */
+const Eo_Event_Description *a_desc2 = 
eo_base_legacy_only_event_description_get("a,changed");
+fail_if(!a_desc2);
+fail_if(a_desc2 != a_desc);
+
 const Eo_Event_Description *bad_desc = 
eo_base_legacy_only_event_description_get("bad");
 fail_if(!bad_desc);
 ck_assert_str_eq(bad_desc->name, "bad");

-- 

[EGIT] [core/efl] master 02/07: Eo legacy events: remove pointless string copies.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=912f03d6e2cc71b82676a0a73a1df4551eb1d7ab

commit 912f03d6e2cc71b82676a0a73a1df4551eb1d7ab
Author: Tom Hacohen 
Date:   Fri Mar 4 14:17:55 2016 +

Eo legacy events: remove pointless string copies.

This was there because the old code modified the string. It is no
longer needed now that we just stringshare it.
---
 src/lib/eo/eo_base_class.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 665f684..0740b39 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -404,10 +404,7 @@ static Eina_Hash *_legacy_events_hash = NULL;
 EAPI const Eo_Event_Description *
 eo_base_legacy_only_event_description_get(const char *_event_name)
 {
-   char buf[1024];
-   strncpy(buf, _event_name, sizeof(buf) - 1);
-   buf[sizeof(buf) - 1] = '\0';
-   Eina_Stringshare *event_name = eina_stringshare_add(buf);
+   Eina_Stringshare *event_name = eina_stringshare_add(_event_name);
Eo_Event_Description *event_desc = eina_hash_find(_legacy_events_hash, 
event_name);
if (!event_desc)
  {

-- 

[EGIT] [core/efl] master 06/07: Eo: unmark Eo_Class as deprecated.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8e437300069c22eb1200721db5f39c6063c82dd3

commit 8e437300069c22eb1200721db5f39c6063c82dd3
Author: Tom Hacohen 
Date:   Fri Mar 4 14:25:28 2016 +

Eo: unmark Eo_Class as deprecated.

It's not deprecated, it's actually a useful alias.
---
 src/lib/eo/Eo.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index de129fc..ab920ee 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -110,7 +110,6 @@ typedef struct _Eo_Opaque Eo;
 /**
  * @typedef Eo_Class
  * The basic class type - should be removed, just for compat.
- * @deprecated
  */
 typedef Eo Eo_Class;
 

-- 

[EGIT] [core/efl] master 02/02: Eo: Remove useless safety checks.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d2f799e4cb9a31d645fb95ff0b7de95a9b0f9900

commit d2f799e4cb9a31d645fb95ff0b7de95a9b0f9900
Author: Tom Hacohen 
Date:   Fri Mar 4 14:05:57 2016 +

Eo: Remove useless safety checks.

Those can never happen, ever.
---
 src/lib/eo/eo.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 7408f41..cc0c978 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -747,9 +747,7 @@ eo_class_get(const Eo *eo_id)
 
EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL);
 
-   if (obj->klass)
-  return _eo_class_id_get(obj->klass);
-   return NULL;
+   return _eo_class_id_get(obj->klass);
 }
 
 EAPI const char *
@@ -908,9 +906,6 @@ _eo_class_mro_init(const Eo_Class_Description *desc, const 
_Eo_Class *parent, Ei
 static void
 _eo_class_constructor(_Eo_Class *klass)
 {
-   if (klass->constructed)
- return;
-
klass->constructed = EINA_TRUE;
 
if (klass->desc->class_constructor)

-- 

[EGIT] [core/efl] master 01/02: Eo tests: add more eo_data_get tests.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d72b336f6963afebbfbd75905a0083a250ad1c53

commit d72b336f6963afebbfbd75905a0083a250ad1c53
Author: Tom Hacohen 
Date:   Fri Mar 4 14:03:41 2016 +

Eo tests: add more eo_data_get tests.
---
 src/tests/eo/suite/eo_test_general.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/eo/suite/eo_test_general.c 
b/src/tests/eo/suite/eo_test_general.c
index b87f37a..c6514cc 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -195,7 +195,9 @@ START_TEST(eo_data_fetch)
 
obj = eo_add(klass, NULL);
fail_if(!obj);
+   fail_if(eo_data_get(obj, klass));
fail_if(eo_data_scope_get(obj, klass));
+   fail_if(!eo_data_scope_get(obj, EO_BASE_CLASS));
eo_unref(obj);
 
eo_shutdown();

-- 

[EGIT] [core/efl] master 01/01: Eo: fix oversight for key_data

[Daniel Zaoui]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=457c6e43fc056d4da22d0c5329b8a694ba0deab9

commit 457c6e43fc056d4da22d0c5329b8a694ba0deab9
Author: Daniel Zaoui 
Date:   Fri Mar 4 14:01:48 2016 +0200

Eo: fix oversight for key_data
---
 src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c 
b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index ff35a98..04747dc 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -96,7 +96,7 @@ _ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, 
Ecore_Audio_In_Tone_Data *
 }
 
 EOLIAN static void*
-_ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data 
*obj, const char *key)
+_ecore_audio_in_tone_eo_base_key_data_get(const Eo *eo_obj, 
Ecore_Audio_In_Tone_Data *obj, const char *key)
 {
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
   return (void *) (intptr_t) obj->freq;

-- 

[EGIT] [core/efl] master 01/01: Eo: set object as const for key_data_get

[Daniel Zaoui]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=66256028d5d6c8775338cfd0201a9b56d9bdbf6a

commit 66256028d5d6c8775338cfd0201a9b56d9bdbf6a
Author: Daniel Zaoui 
Date:   Fri Mar 4 13:48:56 2016 +0200

Eo: set object as const for key_data_get

Due to Eo4 changes, const is now important for this function.
---
 src/lib/eo/eo_base.eo  | 2 +-
 src/lib/eo/eo_base_class.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 29a1531..2dfd6ab 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -140,7 +140,7 @@ abstract Eo.Base ()
 @in data: const(void)*; [[the data to set]]
  }
   }
-  key_data_get {
+  key_data_get @const {
  [[Get generic data from object.]]
  params {
 @in key: const(char)*; [[the key associated with the data]]
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 065c77e..665f684 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -77,7 +77,7 @@ _eo_base_key_data_set(Eo *obj, Eo_Base_Data *pd,
 }
 
 EOLIAN static void *
-_eo_base_key_data_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key)
+_eo_base_key_data_get(const Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char 
*key)
 {
/* We don't really change it... */
Eo_Generic_Data_Node *node;

-- 

[EGIT] [core/efl] master 01/01: build: finally enable branch coverage in our lcov-check target

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0dca76798ef83672f3c1f90ed024de55086d346e

commit 0dca76798ef83672f3c1f90ed024de55086d346e
Author: Stefan Schmidt 
Date:   Fri Mar 4 12:25:19 2016 +0100

build: finally enable branch coverage in our lcov-check target

This has been a long standing issue and I finally figured out the details to
get this working. Since we started with coverage there always have been some
problems to get branch coverage work (problems with older gcc versions, lcov
not taking them into account, etc)
The last detail that made me go nuts was that in my lcov version (1.10) 
there
is a bug which leads to geninfo not applying the config file and thus not
enabling the branch coverage like I defined in the config. I added the
--rc option to work around this case.

In my local run I get this now from lcov-check:
Overall coverage rate:
  lines..: 35.5% (65814 of 185169 lines)
  functions..: 44.6% (7661 of 17195 functions)
  branches...: 22.7% (31492 of 138942 branches)

So we have 22.7% branch coverage right now.

The vivid followers of my QA mails will also see the difference in numbers 
for
line and function coverage if one comapres my local results and the one on
Jenkins. This is another long standing issue and I need to figure out these
details next. :)
---
 .lcov-config |  4 +++-
 Makefile.am  | 10 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.lcov-config b/.lcov-config
index bb631ac..ef201f5 100644
--- a/.lcov-config
+++ b/.lcov-config
@@ -1 +1,3 @@
-geninfo_auto_base = 1
+geninfo_auto_base=1
+lcov_branch_coverage=1
+genhtml_branch_coverage=1
diff --git a/Makefile.am b/Makefile.am
index 08d8701..9aecc45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -430,11 +430,11 @@ lcov-reset:
 
 lcov-report:
$(MKDIR_P) $(top_builddir)/coverage
-   lcov --capture --compat-libtool --no-external --config-file 
.lcov-config --output-file $(top_builddir)/coverage/coverage.info --directory 
$(top_builddir)
-   lcov --remove $(top_builddir)/coverage/coverage.info '*.h' 
--output-file $(top_builddir)/coverage/coverage.cleaned.info
-   lcov --remove $(top_builddir)/coverage/coverage.cleaned.info 
'*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info
-   lcov --remove $(top_builddir)/coverage/coverage.cleaned2.info '*NONE*' 
--output-file $(top_builddir)/coverage/coverage.cleaned3.info
-   genhtml --legend -t "$(PACKAGE_STRING)" -o 
$(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned3.info
+   lcov --capture --compat-libtool --no-external --output-file 
$(top_builddir)/coverage/coverage.info --directory $(top_builddir) 
--config-file .lcov-config --rc lcov_branch_coverage=1
+   lcov --remove $(top_builddir)/coverage/coverage.info '*.h' 
--output-file $(top_builddir)/coverage/coverage.cleaned.info --config-file 
.lcov-config --rc lcov_branch_coverage=1
+   lcov --remove $(top_builddir)/coverage/coverage.cleaned.info 
'*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info 
--config-file .lcov-config --rc lcov_branch_coverage=1
+   lcov --remove $(top_builddir)/coverage/coverage.cleaned2.info '*NONE*' 
--output-file $(top_builddir)/coverage/coverage.cleaned3.info --config-file 
.lcov-config --rc lcov_branch_coverage=1
+   genhtml --config-file .lcov-config --legend -t "$(PACKAGE_STRING)" -o 
$(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned3.info
@echo "Coverage Report at $(top_builddir)/coverage/html"
 
 endif

-- 

[EGIT] [core/elementary] master 01/01: combobox: store eo_constructor() return value into obj

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=e90e85cedc072f00b6b9561f45bd7190c29242a2

commit e90e85cedc072f00b6b9561f45bd7190c29242a2
Author: Amitesh Singh 
Date:   Fri Mar 4 14:57:39 2016 +0530

combobox: store eo_constructor() return value into obj

This is what we do in every widget's base constructor.

@fix
---
 src/lib/elc_combobox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index 408b590..af79c72 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -320,7 +320,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, 
Elm_Combobox_Data *sd)
Evas_Object *entry;
char buf[128];
 
-   eo_constructor(eo_super(obj, MY_CLASS));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
 
sd->first_filter = EINA_TRUE;
 

-- 

[EGIT] [bindings/python/python-efl] master 01/01: Follow changes in Eo

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=05c19962dc966f4ca1d64435ad29c7f9d49ef170

commit 05c19962dc966f4ca1d64435ad29c7f9d49ef170
Author: Kai Huuhko 
Date:   Fri Mar 4 11:07:51 2016 +0200

Follow changes in Eo

- version 4 (eo_add changes coming later)
- events
---
 efl/elementary/elementary_cdef.pxi |   2 +-
 efl/elementary/systray.pxi | 130 -
 efl/elementary/systray_cdef.pxi|  34 +-
 efl/eo/efl.eo.pyx  |  62 +++---
 efl/evas/efl.evas_object_smart.pxi |  28 
 include/efl.c_eo.pxd   |  54 ---
 6 files changed, 128 insertions(+), 182 deletions(-)

diff --git a/efl/elementary/elementary_cdef.pxi 
b/efl/elementary/elementary_cdef.pxi
index 2e3c1cc..bf56d09 100644
--- a/efl/elementary/elementary_cdef.pxi
+++ b/efl/elementary/elementary_cdef.pxi
@@ -1,4 +1,4 @@
-from efl.c_eo cimport Eo as cEo, Eo_Class, eo_add, eo_do, eo_do_ret
+from efl.c_eo cimport Eo as cEo, Eo_Class, eo_add
 from efl.eina cimport Eina_Rectangle, Eina_Compare_Cb, \
 eina_list_free, eina_list_append, eina_stringshare_del
 from efl.evas cimport Eina_List, Eina_Bool, Evas_Object, Evas_Font_Size, \
diff --git a/efl/elementary/systray.pxi b/efl/elementary/systray.pxi
index 7bf021b..e08cd80 100644
--- a/efl/elementary/systray.pxi
+++ b/efl/elementary/systray.pxi
@@ -37,27 +37,21 @@ cdef class Systray(Eo):
 """
 def __set__(self, value):
 if isinstance(value, unicode): value = 
PyUnicode_AsUTF8String(value)
-eo_do(self.obj, elm_obj_systray_id_set(
-value if value is not None else NULL
+elm_obj_systray_id_set(
+self.obj, value if value is not None else NULL
 )
-)
 
 def __get__(self):
-cdef const char *value = ""
-eo_do_ret(self.obj, value, elm_obj_systray_id_get())
-return _ctouni(value)
+return _ctouni(elm_obj_systray_id_get(self.obj))
 
 def id_set(self, value):
 if isinstance(value, unicode): value = PyUnicode_AsUTF8String(value)
-eo_do(self.obj, elm_obj_systray_id_set(
-value if value is not None else NULL
+elm_obj_systray_id_set(
+self.obj, value if value is not None else NULL
 )
-)
 
 def id_get(self):
-cdef const char *value = ""
-eo_do_ret(self.obj, value, elm_obj_systray_id_get())
-return _ctouni(value)
+return _ctouni(elm_obj_systray_id_get(self.obj))
 
 property category:
 """
@@ -68,20 +62,16 @@ cdef class Systray(Eo):
 
 """
 def __set__(self, Elm_Systray_Category value):
-eo_do(self.obj, elm_obj_systray_category_set(value))
+elm_obj_systray_category_set(self.obj, value)
 
 def __get__(self):
-cdef Elm_Systray_Category value = ELM_SYSTRAY_CATEGORY_APP_STATUS
-eo_do_ret(self.obj, value, elm_obj_systray_category_get())
-return value
+return elm_obj_systray_category_get(self.obj)
 
 def category_set(self, Elm_Systray_Category value):
-eo_do(self.obj, elm_obj_systray_category_set(value))
+elm_obj_systray_category_set(self.obj, value)
 
 def category_get(self):
-cdef Elm_Systray_Category value = ELM_SYSTRAY_CATEGORY_APP_STATUS
-eo_do_ret(self.obj, value, elm_obj_systray_category_get())
-return value
+return elm_obj_systray_category_get(self.obj)
 
 property icon_theme_path:
 """The path to the theme where the icons can be found.
@@ -92,27 +82,21 @@ cdef class Systray(Eo):
 """
 def __set__(self, value):
 if isinstance(value, unicode): value = 
PyUnicode_AsUTF8String(value)
-eo_do(self.obj, elm_obj_systray_icon_theme_path_set(
-value if value is not None else NULL
+elm_obj_systray_icon_theme_path_set(
+self.obj, value if value is not None else NULL
 )
-)
 
 def __get__(self):
-cdef const char *value = ""
-eo_do_ret(self.obj, value, elm_obj_systray_icon_theme_path_get())
-return _ctouni(value)
+return _ctouni(elm_obj_systray_icon_theme_path_get(self.obj))
 
 def icon_theme_path_set(self, value):
 if isinstance(value, unicode): value = PyUnicode_AsUTF8String(value)
-eo_do(self.obj, elm_obj_systray_icon_theme_path_set(
-value if value is not None else NULL
+elm_obj_systray_icon_theme_path_set(
+self.obj, value if value is not None else NULL
 )
-)
 
 def icon_theme_path_get(self):
-cdef const char *value = ""
-eo_do_ret(self.obj, value, elm_obj_systray_icon_theme_path_get())
-return _ctouni(value)
+