fix gl engine opt + pulse.

SVN revision: 84249

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 7a53923..c42c96f 100644 (file)
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1047,3 +1047,7 @@
 
         * Fix restacking issue on ctxpopup - resatck callback makes the bg object be top of ctxpopup.
 
+2013-02-20 Carsten Haitzler (The Rasterman)
+
+        * Fix gl engine vsync option pass-in in elm_win
+        * Fix elm_progressbar_pulse() to abort if pulsing not enabled

diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index ba386a5..6d00924 100644 (file)
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -155,7 +155,9 @@ Fixes:
    * ignore tab key widget focus change if control/alt is pressed
    * prevent blank entry hoversels
    * Fix restacking issue on ctxpopup - resatck callback makes the bg object be top of ctxpopup.
-
+   * Fix vsync option in gl engine windows
+   * Fix elm_progressbar_pulse() to abort if pulsing not enabled
+   
 Removals:
 
    * All internal widget hooks (and related macros) were removed, due

diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c
index 4b76eaa..73490d7 100644 (file)
--- a/legacy/elementary/src/lib/elm_progressbar.c
+++ b/legacy/elementary/src/lib/elm_progressbar.c
@@ -372,7 +372,7 @@ _pulse(Eo *obj, void *_pd, va_list *list)
    Elm_Progressbar_Smart_Data *sd = _pd;
 
    state = !!state;
-   if ((!sd->pulse) && (sd->pulse_state == state)) return;
+   if ((!sd->pulse) || (sd->pulse_state == state)) return;
 
    sd->pulse_state = state;
 

diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 6f20d40..13b86a6 100644 (file)
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -2657,6 +2657,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
                   opt_i++;
                   opt[opt_i] = 1;
                   opt_i++;
+                  opt[opt_i] = 0;
                }
              if (opt_i > 0)
                tmp_sd.ee = ecore_evas_gl_x11_options_new