[EGIT] [tools/enventor] master 01/01: Editor zoom: Ctrl + wheel should work even with numlock

[Jean-Philippe Andre]

jpeg pushed a commit to branch master.

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

commit 83012a0a045c9394794aa18dee913d6116185fc4
Author: Jean-Philippe Andre jp.an...@samsung.com
Date:   Wed Jun 24 14:53:27 2015 +0900

Editor zoom: Ctrl + wheel should work even with numlock

When checking the modifiers, only ALT, CTRL, WIN and SHIFT make
sense in this context.
---
 src/bin/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index 2c710a9..9232106 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -151,7 +151,9 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
app_data *ad = data;
Evas_Coord x, y, w, h;
 
-   if (event-modifiers != ECORE_EVENT_MODIFIER_CTRL)
+   if ((event-modifiers  (ECORE_EVENT_MODIFIER_SHIFT | 
ECORE_EVENT_MODIFIER_CTRL
+| ECORE_EVENT_MODIFIER_ALT | 
ECORE_EVENT_MODIFIER_WIN))
+   != ECORE_EVENT_MODIFIER_CTRL)
  return ECORE_CALLBACK_PASS_ON;
 
//View Scale

-- 

[EGIT] [tools/enventor] master 01/01: updated NEWS

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit b94d20ec05f0b83087d33da73962b39cbba543fe
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:26:50 2015 +0900

updated NEWS
---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index c48ec15..eea2b2b 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ Fixes:
* Close auto completion popup if the line is deleted.
* Fix focus highlight remaining issue when live edit item is selected.
* Zoom up/down properly on live edit mode.
+   * Cancel live edit if the about(F1) is activated.
 
 Changes since Enventor 0.4.0:
 -

-- 

[EGIT] [tools/enventor] master 01/01: updatd command line help message.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 460e6dc97be5b5606a527ffd7287ae6d111db9e5
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:50:20 2015 +0900

updatd command line help message.
---
 src/include/common.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/include/common.h b/src/include/common.h
index 0217277..81bb8ea 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -7,12 +7,12 @@ typedef struct statusbar_s stats_data;
 #define ENVENTOR_HELP_EXAMPLES \
 Examples of Enventor command line usage:\n \
 $ enventor\n \
-$ enventor --to\n \
-$ enventor newfile.edc --to\n \
-$ enventor sample.edc output.edj --id ./images --sd ./sounds\n
+$ enventor -t\n \
+$ enventor newfile.edc -t\n \
+$ enventor sample.edc output.edj -i ./images -s ./sounds\n
 
 #define ENVENTOR_USAGE \
-%prog [input file] [output file] [--to] [--id image path] [--sd sound path] 
[--fd font path] [--dd data path]
+%prog [input file] [output file] [-t] [-i image path] [-s sound path] [-f 
font path] [-d data path]
 
 #define ENVENTOR_INFO \
 This is an EDC editor with some convenient functions.\n \

-- 

[EGIT] [tools/enventor] enventor-0.6 01/01: updatd command line help message.

[ChunEon Park]

hermet pushed a commit to branch enventor-0.6.

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

commit db63cc7736d1f77dafd8c32958159118cf75970d
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:50:20 2015 +0900

updatd command line help message.
---
 src/include/common.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/include/common.h b/src/include/common.h
index 0217277..81bb8ea 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -7,12 +7,12 @@ typedef struct statusbar_s stats_data;
 #define ENVENTOR_HELP_EXAMPLES \
 Examples of Enventor command line usage:\n \
 $ enventor\n \
-$ enventor --to\n \
-$ enventor newfile.edc --to\n \
-$ enventor sample.edc output.edj --id ./images --sd ./sounds\n
+$ enventor -t\n \
+$ enventor newfile.edc -t\n \
+$ enventor sample.edc output.edj -i ./images -s ./sounds\n
 
 #define ENVENTOR_USAGE \
-%prog [input file] [output file] [--to] [--id image path] [--sd sound path] 
[--fd font path] [--dd data path]
+%prog [input file] [output file] [-t] [-i image path] [-s sound path] [-f 
font path] [-d data path]
 
 #define ENVENTOR_INFO \
 This is an EDC editor with some convenient functions.\n \

-- 

[EGIT] [tools/enventor] master 01/01: updated NEWS.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit a604cfcae47c30b69e0ad5bb4f853f9ce2e944b0
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:36:47 2015 +0900

updated NEWS.
---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index eea2b2b..8b3ced9 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,7 @@ Fixes:
* Fix focus highlight remaining issue when live edit item is selected.
* Zoom up/down properly on live edit mode.
* Cancel live edit if the about(F1) is activated.
+   * Ctrl + wheel works even with numlock.
 
 Changes since Enventor 0.4.0:
 -

-- 

[EGIT] [website/www-content] master 01/01: bump up enventor version

[ChunEon Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=e7540c84377b87d982d3c607ffb7fe796214ff86

commit e7540c84377b87d982d3c607ffb7fe796214ff86
Author: ChunEon Park chuneon.p...@samsung.com
Date:   Wed Jun 24 17:03:55 2015 +0900

bump up enventor version
---
 pages/download-latest.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/download-latest.txt b/pages/download-latest.txt
index 8b0d39a..e163c64 100644
--- a/pages/download-latest.txt
+++ b/pages/download-latest.txt
@@ -11,7 +11,7 @@ rage_v= 0.1.4
 econnman_v= 1.1
 epour_v   = 0.6.0
 
-enventor_v= 0.5.1
+enventor_v= 0.6.0
 
 extn  = .tar.gz
 dlbase= http://download.enlightenment.org/rel/

-- 

[EGIT] [tools/enventor] master 01/01: edj_viewer: fix wrong spacer highlight position.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 2a7ebec75b55308ae1cc3a0fa30033da71961e91
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:06:48 2015 +0900

edj_viewer: fix wrong spacer highlight position.

spacer position just need to relative to the it's layout.
this is much simpler way to support zooming as well as it's nature behavior.
---
 src/lib/edj_viewer.c | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index dcd2aa8..e45eaf6 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -98,25 +98,22 @@ part_obj_geom_cb(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj,
Evas_Coord x, y, w , h;
if (edje_edit_part_type_get(vd-layout, vd-part_name) == 
EDJE_PART_TYPE_SPACER)
  {
-Evas_Coord scroller_x, scroller_y;
-Evas_Coord scroller_region_x, scroller_region_y;
 Evas_Object *scroller_edje = elm_layout_edje_get(vd-scroller);
 // Clipper need, to clip the highlight object for the  part SPACER,
 // because position of the highlight object is calculated here,
 // not in edje. In case, when  the SPACER is placed outside of
 // scroller region view, the highlight should be hided.
 Evas_Object *clipper =
-   (Evas_Object *)edje_object_part_object_get(scroller_edje, 
clipper);
+   (Evas_Object *)edje_object_part_object_get(scroller_edje,
+  clipper);
 
-elm_scroller_region_get(vd-scroller, scroller_region_x,
-scroller_region_y, NULL, NULL);
-evas_object_geometry_get(vd-scroller, scroller_x, scroller_y,
- NULL, NULL);
 evas_object_smart_member_add(part_highlight, vd-scroller);
-edje_object_part_geometry_get(vd-layout, vd-part_name, x, y, w, 
h);
+edje_object_part_geometry_get(vd-layout, vd-part_name,
+  x, y, w, h);
+Evas_Coord lx, ly;
+evas_object_geometry_get(vd-layout, lx, ly, NULL, NULL);
 
-evas_object_move(part_highlight, x + scroller_x - scroller_region_x + 
1,
- y + scroller_y - scroller_region_y + 1);
+evas_object_move(part_highlight, (x + lx), (y + ly));
 evas_object_resize(part_highlight, w, h);
 evas_object_clip_set(part_highlight, clipper);
  }

-- 

[EGIT] [tools/enventor] master 01/01: tools: update tooltip message

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 3c31b1661e1e6c9eb4e34b93f1727f0da1cd84e9
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:38:20 2015 +0900

tools: update tooltip message
---
 src/bin/tools.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/tools.c b/src/bin/tools.c
index 56d7729..d251d06 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -262,7 +262,7 @@ tools_init(Evas_Object *parent, Evas_Object *enventor)
evas_object_show(sp);
elm_box_pack_end(box, sp);
 
-   btn = tools_btn_create(box, console, Console Box (Ctrl + Down),
+   btn = tools_btn_create(box, console, Console Box (Alt + Down),
   console_cb, NULL);
elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT);
evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND);

-- 

[EGIT] [tools/enventor] master 01/01: live edit: don't clip by symbol layout but live view.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 56816ab1f4760780df58c8810ea8b9458ffdc2d5
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:11:44 2015 +0900

live edit: don't clip by symbol layout but live view.

texts/control points don't need to be clipped by symbol layout.
if the zoom level is enoughly small and there is enough space to
display the control points and text, then we can display them.
---
 src/bin/live_edit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 79c9396..f9b58c8 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -637,7 +637,7 @@ ctrl_pt_init(live_data *ld)
for (i = 0; i  Ctrl_Pt_Cnt; i++)
  {
 Evas_Object *layout = elm_layout_add(ld-layout);
-evas_object_smart_member_add(layout, ld-layout);
+evas_object_smart_member_add(layout, ld-live_view);
 elm_layout_file_set(layout, EDJE_PATH,  ctrl_pt);
 evas_object_resize(layout, ctrl_size, ctrl_size);
 evas_object_show(layout);
@@ -836,7 +836,7 @@ info_text_init(live_data *ld)
for (i = 0; i  Info_Text_Cnt; i++)
  {
 Evas_Object *text = evas_object_text_add(e);
-evas_object_smart_member_add(text, ld-layout);
+evas_object_smart_member_add(text, ld-live_view);
 evas_object_pass_events_set(text, EINA_TRUE);
 evas_object_layer_set(text, INFO_TEXT_LAYER);
 evas_object_text_font_set(text, LIVE_EDIT_FONT,

-- 

[EGIT] [tools/enventor] master 01/01: live_edit: update live edit on scrolling.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 9342835f3df3fd52a5512456d674631f4735f656
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:24:32 2015 +0900

live_edit: update live edit on scrolling.
---
 src/bin/live_edit.c | 31 ++-
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index f9b58c8..d9ef509 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -84,15 +84,29 @@ static const ctxpopup_it_data CTXPOPUP_ITEMS[] =
 static live_data *g_ld = NULL;
 
 static Evas_Object *
+view_scroller_get(live_data *ld)
+{
+   //This is a trick! we got the actual view object from the live edit.
+   if (!ld-live_view) return NULL;
+   return elm_object_part_content_get(ld-live_view,
+  elm.swallow.content);
+}
+
+static Evas_Object *
 view_obj_get(live_data *ld)
 {
//This is a trick! we got the actual view object from the live edit.
-   Evas_Object *o, *o2, *o3;
-   o = elm_object_part_content_get(ld-live_view, elm.swallow.content);
-   o2 = elm_object_content_get(o);
-   o3 = elm_object_part_content_get(o2, elm.swallow.content);
+   Evas_Object *o = view_scroller_get(ld);
+   Evas_Object *o2 = elm_object_content_get(o);
+   return elm_object_part_content_get(o2, elm.swallow.content);
+}
 
-   return o3;
+static void
+view_scroll_cb(void *data, Evas_Object *obj EINA_UNUSED,
+   void *event_info EINA_UNUSED)
+{
+   live_data *ld = data;
+   live_edit_update_internal(ld);
 }
 
 static void
@@ -875,6 +889,9 @@ live_edit_layer_set(live_data *ld)
 
ld-layout = layout;
 
+   evas_object_smart_callback_add(view_scroller_get(ld), scroll,
+  view_scroll_cb, ld);
+
//Initial Layout Geometry
ld-part_info.rel1_x = LIVE_EDIT_REL1;
ld-part_info.rel1_y = LIVE_EDIT_REL1;
@@ -1001,6 +1018,10 @@ live_edit_cancel(void)
   live_view_geom_cb);
evas_object_event_callback_del(ld-live_view, EVAS_CALLBACK_MOVE,
   live_view_geom_cb);
+
+   evas_object_smart_callback_del(view_scroller_get(ld),
+  scroll,
+  view_scroll_cb);
ld-live_view = NULL;
 
evas_object_del(ld-layout);

-- 

[EGIT] [tools/enventor] enventor-0.6 01/03: Revert eo: sync with eolian syntax changes.

[ChunEon Park]

hermet pushed a commit to branch enventor-0.6.

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

commit 7cf5c822ce7e2dcf161ada6473dccf2842204630
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:59:45 2015 +0900

Revert eo: sync with eolian syntax changes.

This reverts commit a81a0d23ee29f37338e142de6acc755a1542fd97.
---
 src/lib/enventor_object.eo | 98 +++---
 src/lib/enventor_smart.c   |  6 +--
 2 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index e059a7b..060ee96 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -18,7 +18,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-part_highlight: bool; /*@ ... */
+Eina_Bool part_highlight; /*@ ... */
  }
   }
   @property live_view_scale {
@@ -38,7 +38,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-scale: double; /*@ ... */
+double scale; /*@ ... */
  }
   }
   @property dummy_swallow {
@@ -58,7 +58,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-dummy_swallow: bool; /*@ ... */
+Eina_Bool dummy_swallow; /*@ ... */
  }
   }
   @property auto_complete {
@@ -78,7 +78,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-auto_complete: bool; /*@ ... */
+Eina_Bool auto_complete; /*@ ... */
  }
   }
   @property auto_indent {
@@ -98,7 +98,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-auto_indent: bool; /*@ ... */
+Eina_Bool auto_indent; /*@ ... */
  }
   }
   @property ctxpopup {
@@ -118,9 +118,9 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-ctxpopup: bool; /*@ ... */
+Eina_Bool ctxpopup; /*@ ... */
  }
-  }
+   }
   @property focus {
  set {
 /*@
@@ -138,7 +138,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-focus: bool; /*@ ... */
+Eina_Bool focus; /*@ ... */
  }
   }
   @property modified {
@@ -158,7 +158,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-modified: bool; /*@ ... */
+Eina_Bool modified; /*@ ... */
  }
   }
   @property font_scale {
@@ -178,7 +178,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-font_scale: double; /*@ ... */
+double font_scale; /*@ ... */
  }
   }
   @property linenumber {
@@ -198,7 +198,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 @ingroup Enventor */
  }
  values {
-linenumber: bool; /*@ ... */
+bool linenumber; /*@ ... */
  }
   }
   path_set {
@@ -210,8 +210,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
  @ingroup Enventor */
  return: Eina_Bool;
  params {
-@in type: Enventor_Path_Type; /*@ ... */
-@in pathes: const(Eina_List) *; /*@ ... */
+@in Enventor_Path_Type type; /*@ ... */
+@in const(Eina_List) *pathes; /*@ ... */
  }
   }
   path_get {
@@ -223,7 +223,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
  @ingroup Enventor */
  return: const(Eina_List) *;
  params {
-@in type: Enventor_Path_Type; /*@ ... */
+@in Enventor_Path_Type type; /*@ ... */
  }
   }
   max_line_get {
@@ -251,7 +251,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
  @see
  @ingroup Enventor */
  params {
-@in text: const(char) *; /*@ ... */
+@in const(char) *text; /*@ ... */
  }
   }
   selection_get {
@@ -280,7 +280,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
  @see
  @ingroup Enventor */
  params {
-@in position: int; /*@ ... */
+@in int position; /*@ ... */
  }
   }
   select_none {
@@ -297,8 +297,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
  @see
  @ingroup Enventor */
  params {
-@in start: int; /*@ ... */
-@in end: int; /*@ ... */
+@in int start; /*@ ... */
+@in int end; /*@ ... */
  

[EGIT] [tools/enventor] enventor-0.6 02/03: Revert lib/enventor: Use the new Eolian property syntax.

[ChunEon Park]

hermet pushed a commit to branch enventor-0.6.

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

commit 2bae53cbc5183a66d11562e8d813d083003e7f97
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:59:59 2015 +0900

Revert lib/enventor: Use the new Eolian property syntax.

This reverts commit d66139a1aafdc4db31025dc4fc211ddea592c607.
---
 src/lib/enventor_object.eo | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index 060ee96..1e0fa2e 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -1,7 +1,7 @@
 class Enventor.Object (Elm.Widget, Efl.File) {
eo_prefix: enventor_obj;
-   methods {
-  @property part_highlight {
+   properties {
+  part_highlight {
  set {
 /*@
 @brief
@@ -21,7 +21,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool part_highlight; /*@ ... */
  }
   }
-  @property live_view_scale {
+  live_view_scale {
  set {
 /*@
 @brief
@@ -41,7 +41,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 double scale; /*@ ... */
  }
   }
-  @property dummy_swallow {
+  dummy_swallow {
  set {
 /*@
 @brief
@@ -61,7 +61,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool dummy_swallow; /*@ ... */
  }
   }
-  @property auto_complete {
+  auto_complete {
  set {
 /*@
 @brief
@@ -81,7 +81,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool auto_complete; /*@ ... */
  }
   }
-  @property auto_indent {
+  auto_indent {
  set {
 /*@
 @brief
@@ -101,7 +101,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool auto_indent; /*@ ... */
  }
   }
-  @property ctxpopup {
+  ctxpopup {
  set {
 /*@
 @brief
@@ -121,7 +121,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool ctxpopup; /*@ ... */
  }
}
-  @property focus {
+  focus {
  set {
 /*@
 @brief
@@ -141,7 +141,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool focus; /*@ ... */
  }
   }
-  @property modified {
+  modified {
  set {
 /*@
 @brief
@@ -161,7 +161,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 Eina_Bool modified; /*@ ... */
  }
   }
-  @property font_scale {
+  font_scale {
  set {
 /*@
 @brief
@@ -181,7 +181,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 double font_scale; /*@ ... */
  }
   }
-  @property linenumber {
+  linenumber {
  set {
 /*@
 @brief
@@ -201,6 +201,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
 bool linenumber; /*@ ... */
  }
   }
+   }
+   methods {
   path_set {
  /*@
  @brief

-- 

[EGIT] [tools/enventor] master 01/01: cancel live edit if the about is activated.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 786fef138cf1bf7bd57c981530bfb8de514719bf
Author: ChunEon Park her...@hermet.pe.kr
Date:   Wed Jun 24 15:26:00 2015 +0900

cancel live edit if the about is activated.
---
 src/bin/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/main.c b/src/bin/main.c
index fb6f2e0..2c710a9 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -730,6 +730,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event-key, F1))
  {
 enventor_object_ctxpopup_dismiss(ad-enventor);
+live_edit_cancel();
 menu_about();
 return ECORE_CALLBACK_DONE;
  }

-- 

[EGIT] [website/www-content] master 01/01: Wiki page start-release changed with summary [] by Raster

[Raster]

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=80998a5e5eee0c99456a1e4ed473eb8e61d0304b

commit 80998a5e5eee0c99456a1e4ed473eb8e61d0304b
Author: Raster ras...@rasterman.com
Date:   Wed Jun 24 03:34:33 2015 -0700

Wiki page start-release changed with summary [] by Raster
---
 pages/start-release.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/start-release.txt b/pages/start-release.txt
index 5ea39e5..a8730ee 100644
--- a/pages/start-release.txt
+++ b/pages/start-release.txt
@@ -1 +1,3 @@
-//EFL 1.14 and Enlightenment 0.19.5 are out - go to our [[download]] page.//
+note
+EFL 1.14 and Enlightenment 0.19.5 are out - go to our [[download]] page.
+/note
\ No newline at end of file

-- 

[EGIT] [core/efl] master 03/03: efl - efreetd service move from dbus session bus to ecore ipc

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 5abfefe99ea290191ef59f840b11c64fb9792edb
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Wed Jun 24 19:24:21 2015 +0900

efl - efreetd service move from dbus session bus to ecore ipc

this fixes warnings about no efreet dbus session bus in non session
environments as brought up on the mailing lists with:

Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: unset
efreet cache update flag to prevent dbus connections

this moves all of efreetd client and server to ecore ipc, with client
auto-launching efreetd if not found as a service and trying for up to
500ms to connect. efreetd times out on last connection or no
connections after 10sec so it wont hang around forever if not in use.
it seems to work in my testing, so let me know if there is an issue.

@fix
---
 Makefile.am   |   2 -
 configure.ac  |   8 +-
 dbus-services/org.enlightenment.Efreet.service.in |   4 -
 src/Makefile_Efreet.am|   7 +-
 src/bin/efreet/efreetd.c  |  10 +-
 src/bin/efreet/efreetd_cache.c|   2 +-
 src/bin/efreet/efreetd_dbus.c | 262 --
 src/bin/efreet/efreetd_ipc.c  | 226 
 src/bin/efreet/{efreetd_dbus.h = efreetd_ipc.h}  |   8 +-
 src/lib/efreet/efreet_cache.c | 415 --
 systemd-services/efreet.service.in|   7 -
 11 files changed, 461 insertions(+), 490 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d02db5e..e172405 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -383,13 +383,11 @@ cmakeconfig/EmileConfigVersion.cmake
 
 servicedir = @dbusservicedir@
 service_DATA = \
-dbus-services/org.enlightenment.Efreet.service \
 dbus-services/org.enlightenment.Ethumb.service
 
 if HAVE_SYSTEMD_USER_SESSION
 systemdunitsdir = @USER_SESSION_DIR@
 systemdunits_DATA = \
-systemd-services/efreet.service \
 systemd-services/ethumb.service
 endif
 EXTRA_DIST += $(systemdunits_DATA)
diff --git a/configure.ac b/configure.ac
index 1673471..8ed4d1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4121,10 +4121,10 @@ EFL_PLATFORM_DEPEND([EFREET], [evil])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
-EFL_INTERNAL_DEPEND_PKG([EFREET], [eldbus])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [emile])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-ipc])
 
 ### Checks for header files
 
@@ -4755,9 +4755,7 @@ pc/ethumb.pc
 pc/ethumb_client.pc
 pc/elocation.pc
 pc/elua.pc
-dbus-services/org.enlightenment.Efreet.service
 dbus-services/org.enlightenment.Ethumb.service
-systemd-services/efreet.service
 systemd-services/ethumb.service
 $po_makefile_in
 cmakeconfig/EflConfig.cmake
@@ -5261,25 +5259,21 @@ if test x$prefix != x/usr; then
   echo 
   echo System-wide installation:
   echo   ln -s 
${resolved_dbusservicedir}/org.enlightenment.Ethumb.service 
/usr/share/dbus-1/services/org.enlightenment.Ethumb.service
-  echo   ln -s 
${resolved_dbusservicedir}/org.enlightenment.Efreet.service 
/usr/share/dbus-1/services/org.enlightenment.Efreet.service
   echo 
   echo   or add \${resolved_datadir}\ to \$XDG_DATA_DIRS
   echo 
   echo User installation:
   echo   ln -s 
${resolved_dbusservicedir}/org.enlightenment.Ethumb.service 
~/.local/share/dbus-1/services/org.enlightenment.Ethumb.service
-  echo   ln -s 
${resolved_dbusservicedir}/org.enlightenment.Efreet.service 
~/.local/share/dbus-1/services/org.enlightenment.Efreet.service
 fi
 if test $needs_alert_systemd -eq 1; then
   echo 
   echo System-wide installation:
   echo   ln -s ${resolved_USER_SESSION_DIR}/ethumb.service 
/usr/lib/systemd/user/ethumb.service
-  echo   ln -s ${resolved_USER_SESSION_DIR}/efreet.service 
/usr/lib/systemd/user/efreet.service
   echo 
   echo   or add \${base_USER_SESSION_DIR}\ to \$XDG_DATA_DIRS or 
\$XDG_CONFIG_DIRS
   echo 
   echo User installation:
   echo   ln -s ${resolved_USER_SESSION_DIR}/ethumb.service 
~/.config/systemd/user/ethumb.service
-  echo   ln -s ${resolved_USER_SESSION_DIR}/efreet.service 
~/.config/systemd/user/efreet.service
 fi
 echo 
 echo 
#---#
diff --git a/dbus-services/org.enlightenment.Efreet.service.in 
b/dbus-services/org.enlightenment.Efreet.service.in
deleted file mode 100644
index 5eb5d53..000
--- a/dbus-services/org.enlightenment.Efreet.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.enlightenment.Efreet

[EGIT] [core/efl] master 02/03: eo - silence ERR logs on constructor fail - this is valid behavior

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit c6011926bad960136af132a97b54cb38199638fe
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Wed Jun 24 18:35:46 2015 +0900

eo - silence ERR logs on constructor fail - this is valid behavior

@fix

XXX: Given EFL usage of objects, construction is a perfectly valid thing
to do. we shouldn't complain about it as handling a NULL obj creation is
the job of the caller. a perfect example here is ecore_con and ecore_ipc
where you create a con or ipc obj then set up type/destination/port and
the finalize of the constructor does the actual connect and thus this
fails or succeeds based on if service is there.

until there is a better solution - don't complain here.
---
 src/lib/eo/eo.c | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 9609138..b5e24a9 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -974,8 +974,17 @@ _eo_add_internal_end(Eo *eo_id)
 
 if (!eo_id)
   {
- ERR(Object of class '%s' - Finalizing the object failed.,
-   klass-desc-name);
+// XXX: Given EFL usage of objects, construction is a perfectly valid thing
+// to do. we shouldn't complain about it as handling a NULL obj creation is
+// the job of the caller. a perfect example here is ecore_con and ecore_ipc
+// where you create a con or ipc obj then set up type/destination/port and
+// the finalize of the constructor does the actual connect and thus this
+// fails or succeeds based on if service is there.
+//
+// until there is a better solution - don't complain here.
+// 
+// ERR(Object of class '%s' - Finalizing the object failed.,
+//   klass-desc-name);
  goto cleanup;
   }
  }

-- 

[EGIT] [core/efl] master 01/03: more evas render 2 work - should not affect normal behavior or code paths unless turned on at runtime

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 7bb28711023254a023bc7578da5f52fd8f7479c4
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Thu Jun 18 20:48:37 2015 +0900

more evas render 2 work - should not affect normal behavior or code
paths unless turned on at runtime
---
 src/lib/evas/canvas/evas_object_rectangle.c|  6 +++---
 src/lib/evas/canvas/render2/evas_render2_th_main.c | 18 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_rectangle.c 
b/src/lib/evas/canvas/evas_object_rectangle.c
index 0de959c..7b0c00f 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -137,7 +137,7 @@ evas_object_rectangle_render2_walk(Evas_Object *eo_obj,
// just became visible or invisible
if (visible_is != visible_was)
  {
-printf(   UP1 %p - %i %i %ix%i\n, eo_obj,
+printf(   UP1 %p - %4i %4i %4ix%4i\n, eo_obj,
obj-cur-cache.clip.x, obj-cur-cache.clip.y,
obj-cur-cache.clip.w, obj-cur-cache.clip.h);
 evas_common_tilebuf_add_redraw
@@ -160,7 +160,7 @@ evas_object_rectangle_render2_walk(Evas_Object *eo_obj,
(obj-restack)
   )
  {
-printf(   UP2 %p - %i %i %ix%i\n, eo_obj,
+printf(   UP2 %p - %4i %4i %4ix%4i\n, eo_obj,
obj-prev-cache.clip.x, obj-prev-cache.clip.y,
obj-prev-cache.clip.w, obj-prev-cache.clip.h);
 evas_common_tilebuf_add_redraw
@@ -177,7 +177,7 @@ nochange:
// object hasn't really changed
if ((visible_is)  (evas_object_is_opaque(eo_obj, obj)))
  {
-printf(   NO- %p - %i %i %ix%i\n, eo_obj,
+printf(   NO- %p - %4i %4i %4ix%4i\n, eo_obj,
obj-cur-cache.clip.x, obj-cur-cache.clip.y,
obj-cur-cache.clip.w, obj-cur-cache.clip.h);
 evas_common_tilebuf_del_redraw
diff --git a/src/lib/evas/canvas/render2/evas_render2_th_main.c 
b/src/lib/evas/canvas/render2/evas_render2_th_main.c
index 54b3428..6f66929 100644
--- a/src/lib/evas/canvas/render2/evas_render2_th_main.c
+++ b/src/lib/evas/canvas/render2/evas_render2_th_main.c
@@ -142,7 +142,6 @@ _evas_render2_th_main_obj_process(Evas_Public_Data *e,
Evas_Object *eo_obj = obj-object;
const Eina_Inlist *il;
 
-   if (!obj-changed) return;
il = evas_object_smart_members_get_direct(eo_obj);
if (il)
  {
@@ -177,7 +176,7 @@ _evas_render2_th_main_do(Eo *eo_e, Evas_Public_Data *e)
double t;
Tilebuf *updates = NULL;
Tilebuf_Rect *rects, *r;
-   Eina_List *updates_list = NULL;
+   Eina_List *updates_list = NULL, *l;
Eina_Rectangle *rect;
 
updates = evas_common_tilebuf_new(e-output.w, e-output.h);
@@ -195,6 +194,19 @@ _evas_render2_th_main_do(Eo *eo_e, Evas_Public_Data *e)
0);
   }
  }
+   // add explicitly exposed/damaged regions of the canvas
+   EINA_LIST_FREE(e-damages, rect)
+ {
+evas_common_tilebuf_add_redraw(updates, rect-x, rect-y,
+   rect-w, rect-h);
+eina_rectangle_free(rect);
+ }
+   // build obscure objects list of active objects that obscure
+   EINA_LIST_FOREACH(e-obscures, l, rect)
+ {
+evas_common_tilebuf_del_redraw(updates, rect-x, rect-y,
+   rect-w, rect-h);
+ }
t = get_time() - t;
printf(T: update generation: ); out_time(t);
 
@@ -204,7 +216,7 @@ _evas_render2_th_main_do(Eo *eo_e, Evas_Public_Data *e)
 rect = malloc(sizeof(Eina_Rectangle));
 if (rect)
   {
- printf( %i %i %ix%i\n, r-x, r-y, r-w, r-h);
+ printf( Render Region [ %4i %4i %4ix%4i ]\n, r-x, r-y, r-w, 
r-h);
  rect-x = r-x; rect-y = r-y;
  rect-w = r-w; rect-h = r-h;
  updates_list = eina_list_append(updates_list, rect);

-- 

[EGIT] [core/efl] master 01/01: ecore_evas: fix forgotten call to post render callback.

[Cedric BAIL]

cedric pushed a commit to branch master.

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

commit e50b3e75e436e6697c0e90fa00ef23d0b2411260
Author: Cedric BAIL ced...@osg.samsung.com
Date:   Wed Jun 24 22:46:30 2015 +0200

ecore_evas: fix forgotten call to post render callback.

This fix using expedite with buffer backend.
---
 src/lib/ecore_evas/ecore_evas_buffer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c 
b/src/lib/ecore_evas/ecore_evas_buffer.c
index 70a64ac..a9d5dff 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -157,6 +157,8 @@ _ecore_evas_buffer_render(Ecore_Evas *ee)
 _ecore_evas_idle_timeout_update(ee);
  }
 
+   if (ee-func.fn_post_render) ee-func.fn_post_render(ee);
+
return updates ? 1 : rend;
 }
 

-- 

[EGIT] [core/efl] master 01/01: ecore-buffer: fix that installing pkgconfig when ecore_buffer is enabled.

[Seunghun Lee]

stefan pushed a commit to branch master.

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

commit eff0e37947d939dc26a2a9997ca79d3d8b5effae
Author: Seunghun Lee shiin@samsung.com
Date:   Wed Jun 24 15:18:11 2015 +0200

ecore-buffer: fix that installing pkgconfig when ecore_buffer is enabled.

Summary: ecore-buffer.pc file should be installed when ecore_buffer is 
enabled.

Reviewers: gwanglim, devilhorns

Reviewed By: devilhorns

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2761
---
 Makefile.am | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index e172405..8d2425b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,7 +140,6 @@ pc/ecore-imf.pc \
 pc/ecore-imf-evas.pc \
 pc/ecore-evas.pc \
 pc/ecore-avahi.pc \
-pc/ecore-buffer.pc \
 pc/ector.pc \
 pc/embryo.pc \
 pc/eio.pc \
@@ -263,6 +262,10 @@ if HAVE_ECORE_AUDIO
 pkgconfig_DATA += pc/ecore-audio.pc pc/ecore-audio-cxx.pc
 endif
 
+if HAVE_ECORE_BUFFER
+pkgconfig_DATA += pc/ecore-buffer.pc
+endif
+
 # Cmake configs:
 efl_cmakeconfigdir = $(libdir)/cmake/Efl/
 efl_cmakeconfig_DATA = \

-- 

[EGIT] [core/efl] master 01/01: efl - fix possible null deref in efreetd ipc

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit a149ff6d79e77411c509635c9c469c4b0b5a4989
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Thu Jun 25 11:32:58 2015 +0900

efl - fix possible null deref in efreetd ipc

this fixes CID 1308358
---
 src/bin/efreet/efreetd_ipc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/efreet/efreetd_ipc.c b/src/bin/efreet/efreetd_ipc.c
index 7b918d4..15aa03d 100644
--- a/src/bin/efreet/efreetd_ipc.c
+++ b/src/bin/efreet/efreetd_ipc.c
@@ -63,7 +63,7 @@ _parse_strs(void *data, int size)
   p1 = e;
}
   }
-if (!*p)
+if ((!*p)  (p0))
   {
  p1 = strdup(p0);
  if (p1) list = eina_list_append(list, p1);

-- 

[EGIT] [core/elementary] elementary-1.14 01/01: release: Update NEWS and bump version for 1.14.2 release

[Stefan Schmidt]

stefan pushed a commit to branch elementary-1.14.

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

commit 19e7b5e424728817c5c3e1b125c1e686323df8e6
Author: Stefan Schmidt ste...@datenfreihafen.org
Date:   Wed Jun 24 15:41:24 2015 +0200

release: Update NEWS and bump version for 1.14.2 release
---
 NEWS | 13 -
 configure.ac |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index fd12806..8bbc367 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,18 @@
 =
-Elementary 1.14.1
+Elementary 1.14.2
 =
 
+Changes since 1.14.1:
+-
+
+Fixes:
+
+   * interface scrollerable: modify the loop_v condition in 
_elm_scroll_momentum_animator() function
+   * fix list item mode change on elm list
+   * win: only trigger del trap if win type is not FAKE
+   * win: do not use deferred ecore evas deletion for FAKE wins
+   * genlist: fix resize of items when added after elm_genlist_clear(). (T2367)
+
 Changes since 1.14.0:
 -
 
diff --git a/configure.ac b/configure.ac
index c5ed9ee..e87d7f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-EFL_VERSION([1], [14], [1], [release])
+EFL_VERSION([1], [14], [2], [release])
 AC_INIT([elementary], [efl_version], 
[enlightenment-de...@lists.sourceforge.net])
 
 AC_PREREQ(2.63)

-- 

[EGIT] [core/elementary] master 01/02: Genlist: Test case added in Genlist Focus example.

[Umesh Tanwar]

hermet pushed a commit to branch master.

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

commit 2113cafeac7b032526ce0df072467259354948bf
Author: Umesh Tanwar umesh.tan...@samsung.com
Date:   Thu Jun 25 13:24:21 2015 +0900

Genlist: Test case added in Genlist Focus example.

Summary:
Added test case to enable/disable mouse wheel. Mouse Wheel is
used to scroll the genlist up/down.

Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com

Test Plan: elementary_test - Genlist Focus - Wheel Disabled

Reviewers: raster, Hermet, cedric

Subscribers: sachin.dev, singh.amitesh, SanghyeonLee, eagleeye

Differential Revision: https://phab.enlightenment.org/D2757
---
 src/bin/test_genlist.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 770905b..e519681 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -4273,6 +4273,13 @@ _gl_first_item_focus_on_first_focus_in_cb(void *data 
EINA_UNUSED, Evas_Object *o
 {
elm_config_first_item_focus_on_first_focusin_set(elm_check_state_get(obj));
 }
+
+static void
+_gl_wheel_disabled_cb(void *data, Evas_Object *obj, void *event_info 
EINA_UNUSED)
+{
+   elm_scroller_wheel_disabled_set(data, elm_check_state_get(obj));
+}
+
 static Eina_Bool
 _focus_timer_cb(void *data)
 {
@@ -4493,6 +4500,14 @@ _test_genlist_focus_option_panel_create(Evas_Object 
*win, Evas_Object *bx,
elm_box_pack_end(bx_opt, chk);
evas_object_show(chk);
 
+   chk = elm_check_add(bx_opt);
+   elm_object_text_set(chk, Wheel Disabled);
+   elm_check_state_set(chk, elm_scroller_wheel_disabled_get(gl));
+   evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0);
+   evas_object_smart_callback_add(chk, changed, _gl_wheel_disabled_cb, gl);
+   elm_box_pack_end(bx_opt, chk);
+   evas_object_show(chk);
+
// Focus Autoscroll Mode
fr = _focus_autoscroll_mode_frame_create(bx);
elm_box_pack_end(bx, fr);

-- 

[EGIT] [core/elementary] master 02/02: Scroller: Remove white-spaces in scroller.edc file

[Umesh Tanwar]

hermet pushed a commit to branch master.

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

commit 175ca45813ef7749551568e9f1518403892ae68b
Author: Umesh Tanwar umesh.tan...@samsung.com
Date:   Thu Jun 25 13:44:46 2015 +0900

Scroller: Remove white-spaces in scroller.edc file

Summary: Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com

Reviewers: cedric, raster, seoz

Differential Revision: https://phab.enlightenment.org/D2744
---
 data/themes/edc/elm/scroller.edc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index 4e19b0b..f1a57f6 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -58,7 +58,7 @@ group { name: elm/scroller/base/default;
  get_geometry(PART:y_vbar_down, x,y,w, h);
  get_geometry(PART:y_vbar_down_mapper, x1,y1,w1, h1);
 
- if((y+h) == (y1+h1) )
+ if((y+h) == (y1+h1))
  {
 set_state(PART:arrow2_vbar, hidden, 0.0);
 set_state(PART:sb_vbar_a2, hidden, 0.0);
@@ -69,7 +69,7 @@ group { name: elm/scroller/base/default;
 set_state(PART:sb_vbar_a2, default, 0.0);
  }
 
- if( val  10)
+ if(val  10)
 timer(0.1,action_on_pos_vbar, val+1);
   }
 
@@ -104,7 +104,7 @@ group { name: elm/scroller/base/default;
 set_state(PART:sb_hbar_a2, default, 0.0);
  }
 
- if( val  10)
+ if(val  10)
 timer(0.1,action_on_pos_hbar, val+1);
   }
}

-- 

[EGIT] [core/efl] master 03/03: ecore con - fix object data referencing for deleted objects

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 6483dc3ce91f94dd147bda1080b0e923d16f4653
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Thu Jun 25 13:18:22 2015 +0900

ecore con - fix object data referencing for deleted objects

if the object has been deleted already, scope data is null. handle it
correctly. this fixes a segv in the new efreetd when it starts and
there is an existing efreet running thus owning the socket fails.

@fix
---
 src/lib/ecore_con/ecore_con.c | 210 +-
 1 file changed, 124 insertions(+), 86 deletions(-)

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 941dc11..1582c26 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -271,6 +271,7 @@ ecore_con_shutdown(void)
 Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, 
ECORE_CON_SERVER_CLASS);
 Ecore_Con_Event_Server_Add *ev;
 
+if (!svr) continue;
 svr-delete_me = EINA_TRUE;
 INF(svr %p is dead, svr);
 /* some pointer hacks here to prevent double frees if people are being 
stupid */
@@ -1373,8 +1374,10 @@ _ecore_con_server_eo_base_destructor(Eo *obj, 
Ecore_Con_Server_Data *svr)
 
ecore_con_ssl_server_shutdown(obj);
free(svr-name);
+   svr-name = NULL;
 
free(svr-path);
+   svr-path = NULL;
 
eina_stringshare_del(svr-ip);
eina_stringshare_del(svr-verify_name);
@@ -1394,8 +1397,9 @@ _ecore_con_server_eo_base_destructor(Eo *obj, 
Ecore_Con_Server_Data *svr)
servers = eina_list_remove(servers, obj);
svr-data = NULL;
 
-end:
eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_destructor());
+end:
+   return;
 }
 
 static void
@@ -2675,21 +2679,25 @@ _ecore_con_event_client_add_free(Ecore_Con_Server *obj,
 Ecore_Con_Client_Data *cl = eo_data_scope_get(e-client, 
ECORE_CON_CLIENT_CLASS);
 Eina_Bool svrfreed = EINA_FALSE;
 
-cl-event_count = eina_list_remove(cl-event_count, e);
-if (cl-host_server)
+if ((svr)  (cl))
   {
- Ecore_Con_Server_Data *host_server = 
eo_data_scope_get(cl-host_server, ECORE_CON_SERVER_CLASS);
- host_server-event_count = 
eina_list_remove(host_server-event_count, ev);
- if ((!svr-event_count)  (svr-delete_me))
+ cl-event_count = eina_list_remove(cl-event_count, e);
+ if (cl-host_server)
{
-  _ecore_con_server_free(obj);
-  svrfreed = EINA_TRUE;
+  Ecore_Con_Server_Data *host_server = 
eo_data_scope_get(cl-host_server, ECORE_CON_SERVER_CLASS);
+  if (host_server)
+host_server-event_count = 
eina_list_remove(host_server-event_count, ev);
+  if ((!svr-event_count)  (svr-delete_me))
+{
+   _ecore_con_server_free(obj);
+   svrfreed = EINA_TRUE;
+}
+   }
+ if (!svrfreed)
+   {
+  if ((!cl-event_count)  (cl-delete_me))
+ecore_con_client_del(e-client);
}
-  }
-if (!svrfreed)
-  {
- if ((!cl-event_count)  (cl-delete_me))
-   ecore_con_client_del(e-client);
   }
  }
 
@@ -2712,21 +2720,25 @@ _ecore_con_event_client_del_free(Ecore_Con_Server *obj,
 Ecore_Con_Client_Data *cl = eo_data_scope_get(e-client, 
ECORE_CON_CLIENT_CLASS);
 Eina_Bool svrfreed = EINA_FALSE;
 
-cl-event_count = eina_list_remove(cl-event_count, e);
-if (cl-host_server)
+if ((svr)  (cl))
   {
- Ecore_Con_Server_Data *host_server = 
eo_data_scope_get(cl-host_server, ECORE_CON_SERVER_CLASS);
- host_server-event_count = 
eina_list_remove(host_server-event_count, ev);
- if ((!svr-event_count)  (svr-delete_me))
+ cl-event_count = eina_list_remove(cl-event_count, e);
+ if (cl-host_server)
{
-  _ecore_con_server_free(obj);
-  svrfreed = EINA_TRUE;
+  Ecore_Con_Server_Data *host_server = 
eo_data_scope_get(cl-host_server, ECORE_CON_SERVER_CLASS);
+  if (host_server)
+host_server-event_count = 
eina_list_remove(host_server-event_count, ev);
+  if ((!svr-event_count)  (svr-delete_me))
+{
+   _ecore_con_server_free(obj);
+   svrfreed = EINA_TRUE;
+}
+   }
+ if (!svrfreed)
+   {
+  if (!cl-event_count)
+_ecore_con_client_free(e-client);
}
-  }
-if (!svrfreed)
-  {
- if (!cl-event_count)
-  

[EGIT] [core/efl] master 02/03: ecore con dns - a failed dns lookup is not an err log event

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit b68853fd7dda0f3532dcac3192a2b92af7cc2101
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Thu Jun 25 13:17:04 2015 +0900

ecore con dns - a failed dns lookup is not an err log event

spewing out errors for a failed dns lookup is not somehting to ERR out
in logs all the time. it is at best a debug log. the caller handles
the failed connect itself.

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

diff --git a/src/lib/ecore_con/ecore_con_dns.c 
b/src/lib/ecore_con/ecore_con_dns.c
index b88cb11..3e4f14a 100644
--- a/src/lib/ecore_con/ecore_con_dns.c
+++ b/src/lib/ecore_con/ecore_con_dns.c
@@ -96,7 +96,7 @@ _ecore_con_dns_check(Ecore_Con_DNS *dns)
 return 1;
 
   default:
-ERR(resolve failed: %s, dns_strerror(error));
+DBG(resolve failed: %s, dns_strerror(error));
 goto error;
  }
 

-- 

[EGIT] [core/efl] master 01/03: eina module - it is not an error to ERR log to not load a .so

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 0f4d1d6186bf53d03971a09eab2b286e36f487da
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Thu Jun 25 13:15:31 2015 +0900

eina module - it is not an error to ERR log to not load a .so

it is not an error. eina_module may be used on files that don't exist
and the caller may handle that as a does not exist error. it is not
good to go spewing out errors for this. it's debug at best.

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

diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 9bc73b6..7c421e3 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -330,7 +330,7 @@ EAPI Eina_Bool eina_module_load(Eina_Module *m)
 
if (!dl_handle)
  {
-ERR(could not dlopen(\%s\, %s): %s, m-file, dlerror(),
+DBG(could not dlopen(\%s\, %s): %s, m-file, dlerror(),
 (flag == RTLD_NOW) ? RTLD_NOW : RTLD_LAZY);
 return EINA_FALSE;
  }

-- 

[EGIT] [core/elementary] master 01/01: Scroller : Remove white-spaces in header file.

[Umesh Tanwar]

hermet pushed a commit to branch master.

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

commit 47b380a1d979b4d0c0ce5718272c80bb492aeb01
Author: Umesh Tanwar umesh.tan...@samsung.com
Date:   Thu Jun 25 13:47:17 2015 +0900

Scroller : Remove white-spaces in header file.

Summary: Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com

Reviewers: cedric, raster, seoz, Hermet

Subscribers: sachin.dev, singh.amitesh

Differential Revision: https://phab.enlightenment.org/D2741
---
 src/lib/elm_scroller_legacy.h | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/elm_scroller_legacy.h b/src/lib/elm_scroller_legacy.h
index 576ea6c..ed70cb4 100644
--- a/src/lib/elm_scroller_legacy.h
+++ b/src/lib/elm_scroller_legacy.h
@@ -531,7 +531,7 @@ EAPI void  
elm_scroller_loop_get(const Evas_Object *obj,
  *
  * @param obj The scroller object
  * @param disabled The mouse wheel disabled over the scroller.
- * 
+ *
  * Mouse wheel can be used to scroll up and down the scroller.
  * Wheel is enabled by default.
  *
@@ -539,11 +539,11 @@ EAPI void  
elm_scroller_loop_get(const Evas_Object *obj,
  *
  * @see elm_scroller_wheel_disabled_get()
  *
- * @ingroup Scroller 
+ * @ingroup Scroller
  */
- EAPI void  
elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+EAPI void  elm_scroller_wheel_disabled_set(Evas_Object 
*obj, Eina_Bool disabled);
 
- /**
+/**
  * @brief Get a value whether mouse wheel is enabled or not over the scroller.
  *
  * @param obj The scroller object
@@ -555,6 +555,6 @@ EAPI void  
elm_scroller_loop_get(const Evas_Object *obj,
  *
  * @see elm_scroller_wheel_disabled_set()
  *
- * @ingroup Scroller 
+ * @ingroup Scroller
  */
- EAPI Eina_Bool elm_scroller_wheel_disabled_get(const 
Evas_Object *obj);
+EAPI Eina_Bool elm_scroller_wheel_disabled_get(const 
Evas_Object *obj);

--