[EGIT] [apps/terminology] master 01/01: shift-selection: reduce timeout to 15s. Closes T2254

[Boris Faure]

billiob pushed a commit to branch master.

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

commit 6bf21162060ebf9db57fc556bf705ec49a06e8bd
Author: Boris Faure 
Date:   Sat Mar 10 21:10:34 2018 +0100

shift-selection: reduce timeout to 15s. Closes T2254
---
 src/bin/termio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/termio.c b/src/bin/termio.c
index 1be8f3a..f01ff60 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -3964,7 +3964,7 @@ _handle_mouse_down_single_click(Termio *sd,
 return;
  }
else if (shift &&
-(time(NULL) - sd->pty->selection.last_click) <= 60)
+(time(NULL) - sd->pty->selection.last_click) <= 15)
  {
 sd->pty->selection.is_box = ctrl;
 _sel_to(sd, cx, cy - sd->scroll, EINA_FALSE);

-- 

[EGIT] [tools/examples] master 01/01: update examples to match args change

[Carsten Haitzler (Rasterman)]

raster pushed a commit to branch master.

http://git.enlightenment.org/tools/examples.git/commit/?id=bc7793f138e6c84f5692be98ca70c9d9a3306ada

commit bc7793f138e6c84f5692be98ca70c9d9a3306ada
Author: Carsten Haitzler (Rasterman) 
Date:   Sun Mar 11 04:46:47 2018 +0900

update examples to match args change
---
 tutorial/c/hello-cmdline/src/cmdline_main.c | 4 ++--
 tutorial/c/lib/src/test/runner.c| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tutorial/c/hello-cmdline/src/cmdline_main.c 
b/tutorial/c/hello-cmdline/src/cmdline_main.c
index 335c89f..35816d7 100644
--- a/tutorial/c/hello-cmdline/src/cmdline_main.c
+++ b/tutorial/c/hello-cmdline/src/cmdline_main.c
@@ -9,13 +9,13 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
 {
Efl_Loop_Arguments *args = ev->info;
 
-   if (eina_array_count(args->argv) == 0)
+   if (eina_array_count(args->argv) == 1)
  {
 printf("Hello World!\n");
  }
else
  {
-printf("Hello %s!\n", (char *) eina_array_data_get(args->argv, 0));
+printf("Hello %s!\n", (char *) eina_array_data_get(args->argv, 1));
  }
 
efl_exit(0);
diff --git a/tutorial/c/lib/src/test/runner.c b/tutorial/c/lib/src/test/runner.c
index e140ad0..39fc920 100644
--- a/tutorial/c/lib/src/test/runner.c
+++ b/tutorial/c/lib/src/test/runner.c
@@ -18,9 +18,9 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
unsigned int i;
int failed_count = -1;
 
-   if (eina_array_count(args->argv) > 0)
+   if (eina_array_count(args->argv) > 1)
  {
-test = eina_array_data_get(args->argv, 0);
+test = eina_array_data_get(args->argv, 1);
 
 if (!strcmp(test, "--list"))
   {

-- 

[EGIT] [legacy/imlib2] master 02/05: Warning fixes in imlib2_... programs

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=b8ef1561c595419e937e52f0655d4f4af51e4ed8

commit b8ef1561c595419e937e52f0655d4f4af51e4ed8
Author: Kim Woelders 
Date:   Sat Mar 10 16:29:21 2018 +0100

Warning fixes in imlib2_... programs

Use CFLAGS_WARNINGS here too and clean up the warnings (mostly shadow).
---
 src/bin/Makefile.am   |  1 +
 src/bin/imlib2_grab.c |  4 +--
 src/bin/imlib2_show.c | 93 ---
 3 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 111c24a..a6fb67e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+AM_CFLAGS   = $(CFLAGS_WARNINGS)
 AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -I$(top_srcdir)/src/lib \
diff --git a/src/bin/imlib2_grab.c b/src/bin/imlib2_grab.c
index 86e6173..eb1f91b 100644
--- a/src/bin/imlib2_grab.c
+++ b/src/bin/imlib2_grab.c
@@ -17,7 +17,7 @@
 Display*disp;
 Visual *vis;
 Colormapcm;
-int depth;
+unsigned intdepth;
 int image_width = 0, image_height = 0;
 
 static void
@@ -38,7 +38,7 @@ main(int argc, char **argv)
const char *display_name = getenv("DISPLAY");
Drawabledraw;
int x, y;
-   unsigned intw, h, bw, depth;
+   unsigned intw, h, bw;
unsigned intwo, ho;
Window  rr;
 
diff --git a/src/bin/imlib2_show.c b/src/bin/imlib2_show.c
index 803657e..5f2d3f7 100644
--- a/src/bin/imlib2_show.c
+++ b/src/bin/imlib2_show.c
@@ -54,14 +54,14 @@ progress(Imlib_Image * im, char percent,
 int
 main(int argc, char **argv)
 {
-   int i;
+   int i, j;
Imlib_Image*im = NULL;
int sec1, usec1, sec2, usec2;
int pixels = 0;
struct timeval  timev;
double  sec;
-   char   *file = NULL;
-   char   *fon = NULL, *str = NULL;
+   const char *file = NULL;
+   const char *fon = NULL, *str = NULL;
 
int root = 0;
int scale = 0;
@@ -180,7 +180,6 @@ main(int argc, char **argv)
   {
  DATA8   rt[256], gt[256], bt[256], at[256];
  double  rm, gm, bm, am;
- int j;
 
  /*\ Setup color mod tables \ */
  if (!colormod)
@@ -379,9 +378,8 @@ main(int argc, char **argv)
 #define A90 (3.141592654 / 2)
if (pol)
  {
-Imlib_Image im_bg, im;
-int w, h;
-int i;
+Imlib_Image im_bg, im_tmp;
+int ww, hh;
 double  a, points[8][2];
 
 if (file)
@@ -389,31 +387,31 @@ main(int argc, char **argv)
 else
im_bg = imlib_load_image(PACKAGE_DATA_DIR "/data/images/bg.png");
 imlib_context_set_image(im_bg);
-w = imlib_image_get_width();
-h = imlib_image_get_height();
-XResizeWindow(disp, win, w, h);
+ww = imlib_image_get_width();
+hh = imlib_image_get_height();
+XResizeWindow(disp, win, ww, hh);
 XSync(disp, False);
-im = imlib_create_image(w, h);
+im_tmp = imlib_create_image(ww, hh);
 srand(time(NULL));
 for (i = 0; i < 8; i++)
   {
- points[i][0] = (rand() % w) - (w / 2);
- points[i][1] = (rand() % h) - (h / 2);
+ points[i][0] = (rand() % ww) - (ww / 2);
+ points[i][1] = (rand() % hh) - (hh / 2);
   }
 a = 0.0;
 for (;;)
   {
- imlib_context_set_image(im);
- imlib_blend_image_onto_image(im_bg, 0, 0, 0, w, h, 0, 0, w, h);
+ imlib_context_set_image(im_tmp);
+ imlib_blend_image_onto_image(im_bg, 0, 0, 0, ww, hh, 0, 0, ww, 
hh);
 
  poly = imlib_polygon_new();
  for (i = 0; i < 8; i++)
{
   double  xx, yy;
 
-  xx = (w / 2) +
+  xx = (ww / 2) +
  (cos(a) * points[i][0]) + (cos(a + A90) * points[i][1]);
-  yy = (h / 2) +
+  yy = (hh / 2) +
  (sin(a) * points[i][0]) + (sin(a + A90) * points[i][1]);
   imlib_polygon_add_point(poly, xx, yy);
}
@@ -641,8 +639,7 @@ main(int argc, char **argv)
  }
else if (rottest)
  {
-int w, h;
-double  i;
+double  id;
 
 imlib_context_set_image(im);
 imlib_render_image_on_drawable(0, 0);
@@ -653,51 +650,51 @@ main(int argc, char **argv)
 
 imlib_context_set_blend(1);
 

[EGIT] [legacy/imlib2] master 01/05: Add missing const to imlib_apply_filter() script argument

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=1c55ef577d6f2fb5ba3e23b1889a91a16450702f

commit 1c55ef577d6f2fb5ba3e23b1889a91a16450702f
Author: Kim Woelders 
Date:   Sat Mar 10 17:20:59 2018 +0100

Add missing const to imlib_apply_filter() script argument
---
 src/lib/Imlib2.h | 2 +-
 src/lib/api.c| 2 +-
 src/lib/script.c | 8 
 src/lib/script.h | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/Imlib2.h b/src/lib/Imlib2.h
index 4291951..eefd514 100644
--- a/src/lib/Imlib2.h
+++ b/src/lib/Imlib2.h
@@ -589,7 +589,7 @@ EAPI void   imlib_filter_set_blue(int xoff, int 
yoff,
 EAPI void   imlib_filter_constants(int a, int r, int g, int b);
 EAPI void   imlib_filter_divisors(int a, int r, int g, int b);
 
-EAPI void   imlib_apply_filter(char *script, ...);
+EAPI void   imlib_apply_filter(const char *script, ...);
 
 EAPI void   imlib_image_clear(void);
 EAPI void   imlib_image_clear_color(int r, int g, int b, int a);
diff --git a/src/lib/api.c b/src/lib/api.c
index 92f059b..b189027 100644
--- a/src/lib/api.c
+++ b/src/lib/api.c
@@ -5172,7 +5172,7 @@ imlib_filter_divisors(int a, int r, int g, int b)
 }
 
 EAPI void
-imlib_apply_filter(char *script, ...)
+imlib_apply_filter(const char *script, ...)
 {
va_list param_list;
ImlibImage *im;
diff --git a/src/lib/script.c b/src/lib/script.c
index 08c9751..40ba2c6 100644
--- a/src/lib/script.c
+++ b/src/lib/script.c
@@ -63,7 +63,7 @@ __imlib_stripwhitespace(char *str)
 }
 
 static char*
-__imlib_copystr(char *str, int start, int end)
+__imlib_copystr(const char *str, int start, int end)
 {
int i = 0;
char   *rstr = calloc(1024, sizeof(char));
@@ -125,7 +125,7 @@ __imlib_script_add_var(void *ptr)
 }
 
 IFunctionParam *
-__imlib_script_parse_parameters(ImlibImage * im, char *parameters)
+__imlib_script_parse_parameters(ImlibImage * im, const char *parameters)
 {
int i = 0, in_quote = 0, depth = 0, start = 0, value_start =
   0;
@@ -199,7 +199,7 @@ __imlib_script_parse_parameters(ImlibImage * im, char 
*parameters)
 }
 
 ImlibImage *
-__imlib_script_parse_function(ImlibImage * im, char *function)
+__imlib_script_parse_function(ImlibImage * im, const char *function)
 {
char   *funcname, *funcparams;
IFunctionParam *params;
@@ -244,7 +244,7 @@ __imlib_script_parse_function(ImlibImage * im, char 
*function)
 }
 
 ImlibImage *
-__imlib_script_parse(ImlibImage * im, char *script, va_list param_list)
+__imlib_script_parse(ImlibImage * im, const char *script, va_list param_list)
 {
int i = 0, in_quote = 0, start = 0, depth = 0;
int script_len;
diff --git a/src/lib/script.h b/src/lib/script.h
index c706a5a..eb94754 100644
--- a/src/lib/script.h
+++ b/src/lib/script.h
@@ -57,12 +57,12 @@ typedef struct _imlib_variable {
struct _imlib_variable *next;
 } IVariable;
 
-ImlibImage *__imlib_script_parse(ImlibImage * im, char *script,
+ImlibImage *__imlib_script_parse(ImlibImage * im, const char *script,
  va_list);
 IFunctionParam *__imlib_script_parse_parameters(ImlibImage * im,
-char *parameters);
+const char *parameters);
 ImlibImage *__imlib_script_parse_function(ImlibImage * im,
-  char *function);
+  const char *function);
 void__imlib_script_tidyup(void);
 void   *__imlib_script_get_next_var(void);
 void__imlib_script_add_var(void *ptr);

-- 

[EGIT] [legacy/imlib2] master 04/05: grab.c: Fix gcc8 warning

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=4d6ff056ef1e463498c0873cae6345e8262195c3

commit 4d6ff056ef1e463498c0873cae6345e8262195c3
Author: Kim Woelders 
Date:   Sat Mar 10 18:54:19 2018 +0100

grab.c: Fix gcc8 warning

grab.c: In function ‘__imlib_GrabDrawableToRGBA’:
grab.c:543:32: error: cast between incompatible function types from ‘void 
(*)(Display *, XErrorEvent *)’ {aka ‘void (*)(struct _XDisplay *, struct 
 *)’} to ‘int (*)(Display *, XErrorEvent *)’ {aka ‘int (*)(struct 
_XDisplay *, struct  *)’} [-Werror=cast-function-type]
prev_erh = XSetErrorHandler((XErrorHandler) Tmp_HandleXError);
^
---
 src/lib/grab.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/grab.c b/src/lib/grab.c
index b9b8ec8..a7a41bb 100644
--- a/src/lib/grab.c
+++ b/src/lib/grab.c
@@ -13,10 +13,11 @@
 static char _x_err = 0;
 static DATA8rtab[256], gtab[256], btab[256];
 
-static void
+static int
 Tmp_HandleXError(Display * d, XErrorEvent * ev)
 {
_x_err = 1;
+   return 0;
 }
 
 void
@@ -540,7 +541,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data, int ox, int oy, 
int ow, int oh,
if (grab)
   XGrabServer(d);
XSync(d, False);
-   prev_erh = XSetErrorHandler((XErrorHandler) Tmp_HandleXError);
+   prev_erh = XSetErrorHandler(Tmp_HandleXError);
_x_err = 0;
/* lets see if its a pixmap or not */
XGetWindowAttributes(d, p, );

-- 

[EGIT] [legacy/imlib2] master 02/02: PNG loader: Correct various error handling cases

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=bb09d7844e5ec06f64e1e586f519c4706d94a7f6

commit bb09d7844e5ec06f64e1e586f519c4706d94a7f6
Author: Kim Woelders 
Date:   Sat Mar 10 13:40:11 2018 +0100

PNG loader: Correct various error handling cases

Under various error conditions the image width would not be set to 0
which is currently required for the loader code to behave properly.

In particular, png_read_end() should not be called in error cases.
This would cause a longjump which would exit without setting im->w to 0.
---
 src/modules/loaders/loader_png.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c
index 7a488b5..32b669f 100644
--- a/src/modules/loaders/loader_png.c
+++ b/src/modules/loaders/loader_png.c
@@ -66,6 +66,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
   }
 if (setjmp(png_jmpbuf(png_ptr)))
   {
+ im->w = 0;
  png_destroy_read_struct(_ptr, _ptr, NULL);
  fclose(f);
  return 0;
@@ -75,16 +76,15 @@ load(ImlibImage * im, ImlibProgressFunction progress,
 png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (),
  (png_uint_32 *) (), _depth, _type,
  _type, NULL, NULL);
-im->w = (int)w32;
-im->h = (int)h32;
 if (!IMAGE_DIMENSIONS_OK(w32, h32))
   {
- png_read_end(png_ptr, info_ptr);
+ im->w = 0;
  png_destroy_read_struct(_ptr, _ptr, (png_infopp) NULL);
  fclose(f);
- im->w = 0;
  return 0;
   }
+im->w = (int)w32;
+im->h = (int)h32;
 if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
hasa = 1;
 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
@@ -153,7 +153,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
 if (!im->data)
   {
  im->w = 0;
- png_read_end(png_ptr, info_ptr);
  png_destroy_read_struct(_ptr, _ptr, (png_infopp) NULL);
  fclose(f);
  return 0;
@@ -165,7 +164,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
  free(im->data);
  im->data = NULL;
  im->w = 0;
- png_read_end(png_ptr, info_ptr);
  png_destroy_read_struct(_ptr, _ptr, (png_infopp) NULL);
  fclose(f);
  return 0;

-- 

[EGIT] [legacy/imlib2] master 01/02: Maximum image dimension should be 32767, not 32766

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=a120e3152a5f9c5f8fadd8862d121cba9bda37be

commit a120e3152a5f9c5f8fadd8862d121cba9bda37be
Author: Kim Woelders 
Date:   Sat Mar 10 13:05:23 2018 +0100

Maximum image dimension should be 32767, not 32766

Presumably a glitch from when it last was lowered to "32767".
---
 src/lib/image.h | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/image.h b/src/lib/image.h
index 3078d38..868cc45 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -181,12 +181,14 @@ void__imlib_SaveImage(ImlibImage * im, 
const char *file,
 #define SET_FLAG(flags, f) ((flags) |= (f))
 #define UNSET_FLAG(flags, f) ((flags) &= (~f))
 
-/* The maximum pixmap dimension is 65535. */
-/* However, for now, use 46340 (46340^2 < 2^31) to avoid buffer overflow 
issues. */
-/* Reduced further to 32767, so that (w * h * sizeof(DATA32)) won't exceed 
ULONG_MAX */
+/* 32767 is the maximum pixmap dimension and ensures that
+ * (w * h * sizeof(DATA32)) won't exceed ULONG_MAX */
 #define X_MAX_DIM 32767
+/* NB! The image dimensions are sometimes used in (dim << 16) like expressions
+ * so great care must be taken if ever it is attempted to change this
+ * condition */
 
 #define IMAGE_DIMENSIONS_OK(w, h) \
-   ( ((w) > 0) && ((h) > 0) && ((w) < X_MAX_DIM) && ((h) < X_MAX_DIM) )
+   ( ((w) > 0) && ((h) > 0) && ((w) <= X_MAX_DIM) && ((h) <= X_MAX_DIM) )
 
 #endif

-- 

[EGIT] [apps/terminology] master 01/01: win: do not force focus when on options. Closes T4769

[Boris Faure]

billiob pushed a commit to branch master.

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

commit 71d9bc2f68c2973798a1945bb0954236a8fe3716
Author: Boris Faure 
Date:   Sat Mar 10 17:22:52 2018 +0100

win: do not force focus when on options. Closes T4769
---
 src/bin/win.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/win.c b/src/bin/win.c
index d4e6ba6..06d9936 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -556,6 +556,8 @@ _cb_win_focus_in(void *data,
tc->is_focused = EINA_TRUE;
if ((wn->cmdbox_up) && (wn->cmdbox))
  elm_object_focus_set(wn->cmdbox, EINA_TRUE);
+   if (wn->on_options)
+   return;
 
term = tc->focused_term_get(tc);
 

-- 

[EGIT] [apps/terminology] master 01/01: options: default is the behaviour tab. Closes T2130

[Boris Faure]

billiob pushed a commit to branch master.

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

commit 1a5384b19e09c9199437d3872cdc0fe26ebc82b3
Author: Boris Faure 
Date:   Sat Mar 10 17:13:10 2018 +0100

options: default is the behaviour tab. Closes T2130
---
 src/bin/options.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/bin/options.c b/src/bin/options.c
index 0d08ba7..9d1321e 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -18,12 +18,12 @@
 
 enum option_mode {
  OPTION_NONE = 0,
+ OPTION_BEHAVIOR,
  OPTION_FONT,
  OPTION_THEME,
  OPTION_BACKGROUND,
  OPTION_COLORS,
  OPTION_VIDEO,
- OPTION_BEHAVIOR,
  OPTION_KEYS,
  OPTION_HELPERS,
  OPTION_ELM,
@@ -98,12 +98,12 @@ _cb_opdt_hide_done(void *data,
switch (ctx->mode)
  {
   case OPTION_NONE:  break;
+  case OPTION_BEHAVIOR:  options_behavior(ctx->opbox, ctx->term); break;
   case OPTION_FONT:  options_font(ctx->opbox, ctx->term); break;
   case OPTION_THEME: options_theme(ctx->opbox, ctx->term); break;
   case OPTION_BACKGROUND: options_background(ctx->opbox, ctx->term); break;
   case OPTION_COLORS:options_colors(ctx->opbox, ctx->term, ctx->bg); 
break;
   case OPTION_VIDEO: options_video(ctx->opbox, ctx->term); break;
-  case OPTION_BEHAVIOR:  options_behavior(ctx->opbox, ctx->term); break;
   case OPTION_KEYS:  options_keys(ctx->opbox, ctx->term); break;
   case OPTION_HELPERS:   options_helpers(ctx->opbox, ctx->term); break;
   case OPTION_ELM:   options_elm(ctx->opbox, ctx->term); break;
@@ -230,13 +230,12 @@ options_show(Evas_Object *win, Evas_Object *base, 
Evas_Object *bg, Evas_Object *
elm_toolbar_item_append(o, _icon_name, _name, _cb_op, \
(void*) >modes[OPTION_##_option_mode])
 
-   it_fn =
-  ITEM_APPEND("preferences-desktop-font", _("Font"), FONT);
+   it_fn = ITEM_APPEND("preferences-system", _("Behavior"), BEHAVIOR);
+   ITEM_APPEND("preferences-desktop-font", _("Font"), FONT);
ITEM_APPEND("preferences-desktop-theme", _("Theme"), THEME);
ITEM_APPEND("preferences-desktop-background", _("Background"), BACKGROUND);
ITEM_APPEND("preferences-desktop-theme", _("Colors"), COLORS);
ITEM_APPEND("video-display", _("Video"), VIDEO);
-   ITEM_APPEND("preferences-system", _("Behavior"), BEHAVIOR);
ITEM_APPEND("preferences-desktop-keyboard-shortcuts", _("Keys"), KEYS);
ITEM_APPEND("system-run", _("Helpers"), HELPERS);
ITEM_APPEND("preferences-color", _("Toolkit"), ELM);

-- 

[EGIT] [apps/terminology] master 01/01: options_behavior: expect EFL > 1.8

[Boris Faure]

billiob pushed a commit to branch master.

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

commit 9aeae783b5d61d475776679f14aa486e569171b1
Author: Boris Faure 
Date:   Sat Mar 10 16:14:40 2018 +0100

options_behavior: expect EFL > 1.8
---
 src/bin/options_behavior.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index ed45722..75d1284 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -340,9 +340,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
elm_slider_span_size_set(o, 40);
-#if (EINA_VERSION_MAJOR > 1) || (EINA_VERSION_MINOR >= 8)
elm_slider_step_set(o, 1);
-#endif
elm_slider_units_format_function_set(o,
 sback_units_format,
 (void(*)(char*))eina_stringshare_del);

-- 

[EGIT] [core/efl] master 01/01: elm test - adapt to argc/v being regular argv 0 being binary name

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 44387a580310d4e5acdd89a1a4ae3b2cb29f83ac
Author: Carsten Haitzler (Rasterman) 
Date:   Sat Mar 10 22:47:12 2018 +0900

elm test - adapt to argc/v being regular argv 0 being binary name
---
 src/bin/elementary/test.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 8685e1bce5..9862d1d906 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -1297,7 +1297,7 @@ efl_main(void *data EINA_UNUSED,
/* if called with a single argument try to autorun a test with
 * the same name as the given param
 * ex:  elementary_test "Box Vert 2" */
-   if (eina_array_count(arge->argv) == 1)
+   if (eina_array_count(arge->argv) == 2)
  {
 if (!strcmp(eina_array_data_get(arge->argv, 0), "--help"))
   {
@@ -1312,15 +1312,15 @@ efl_main(void *data EINA_UNUSED,
   }
 autorun = eina_array_data_get(arge->argv, 0);
  }
-   else if (eina_array_count(arge->argv) == 2)
+   else if (eina_array_count(arge->argv) == 3)
  {
 /* Just a workaround to make the shot module more
  * useful with elementary test. */
-if ((!strcmp(eina_array_data_get(arge->argv, 0), "--test-win-only")) ||
-(!strcmp(eina_array_data_get(arge->argv, 0), "-to")))
+if ((!strcmp(eina_array_data_get(arge->argv, 1), "--test-win-only")) ||
+(!strcmp(eina_array_data_get(arge->argv, 1), "-to")))
   {
  test_win_only = EINA_TRUE;
- autorun = eina_array_data_get(arge->argv, 1);
+ autorun = eina_array_data_get(arge->argv, 2);
   }
  }
 

-- 

[EGIT] [core/efl] efl-1.20 01/01: efreet_xml: make certain we unmap the right pointer.

[Al Poole]

netstar pushed a commit to branch efl-1.20.

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

commit 73f68ae183c3ae835418b87c079ceb033b7768e6
Author: Al Poole 
Date:   Sat Mar 10 11:20:42 2018 +

efreet_xml: make certain we unmap the right pointer.

This resolves all sorts of issues on FreeBSD and OpenBSD. Linux
and valgrind seems to not detect these mmap/munmap problems.

@fix T5949
---
 src/lib/efreet/efreet_xml.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lib/efreet/efreet_xml.c b/src/lib/efreet/efreet_xml.c
index 05261b2a4a..4f4cd2fea8 100644
--- a/src/lib/efreet/efreet_xml.c
+++ b/src/lib/efreet/efreet_xml.c
@@ -86,7 +86,7 @@ efreet_xml_new(const char *file)
 {
 Efreet_Xml *xml = NULL;
 int size, fd = -1;
-char *data = MAP_FAILED;
+char *tmp, *data = MAP_FAILED;
 struct stat st;
 int error = 0;
 
@@ -109,11 +109,12 @@ efreet_xml_new(const char *file)
 data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
 if (data == MAP_FAILED) goto efreet_error;
 
+tmp = data;
+
 error = 0;
 size = st.st_size;
-xml = efreet_xml_parse(, , );
+xml = efreet_xml_parse(, , );
 if (!xml || error) goto efreet_error;
-
 munmap(data, st.st_size);
 close(fd);
 return xml;

-- 

[EGIT] [core/efl] master 02/02: ecore - efl thread - remove unused local vars

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 249f50098ffaac7e700ab121c5b1d6eb81d5e317
Author: Carsten Haitzler (Rasterman) 
Date:   Sat Mar 10 20:03:32 2018 +0900

ecore - efl thread - remove unused local vars
---
 src/lib/ecore/efl_thread.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index bab5c01717..6e59602ca9 100644
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -1012,7 +1012,6 @@ EOLIAN static void
 _efl_thread_efl_threadio_call(Eo *obj EINA_UNUSED, Efl_Thread_Data *pd,
   void *func_data, EFlThreadIOCall func, 
Eina_Free_Cb func_free_cb)
 {
-   Thread_Data *thdat = pd->thdat;
Control_Data cmd;
 
memset(, 0, sizeof(cmd));
@@ -1053,7 +1052,6 @@ EOLIAN static void *
 _efl_thread_efl_threadio_call_sync(Eo *obj EINA_UNUSED, Efl_Thread_Data *pd,
void *func_data, EFlThreadIOCallSync func, 
Eina_Free_Cb func_free_cb)
 {
-   Thread_Data *thdat = pd->thdat;
Control_Data cmd;
Control_Reply *rep;
void *data;

--