Fix theme breakage exposed with updated EFL

The newer edje compiler will correctly flag duplicate script entries
as errors.

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index aa701ef..7ad3574 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -965,9 +965,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/datetime_ampm/default";
       inherit: "elm/button/base/style1/auto_expand";
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
       parts {
          part { name: "bg";
             type: RECT;

diff --git a/themes/widgets/genlist/genlist.edc b/themes/widgets/genlist/genlist.edc
index 98d7738..89c9c2a 100644 (file)
--- a/themes/widgets/genlist/genlist.edc
+++ b/themes/widgets/genlist/genlist.edc
@@ -34,30 +34,6 @@
       alias: "elm/scroller/base/dialogue";
       inherit: "elm/scroller/base/default";
 
-         script {
-         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
-         public timer0(val) {
-            new v;
-            v = get_int(sbvis_v);
-            if (v) {
-               v = get_int(sbalways_v);
-               if (!v) {
-                  emit("do-hide-vbar", "");
-                  set_int(sbvis_v, 0);
-               }
-            }
-            v = get_int(sbvis_h);
-            if (v) {
-               v = get_int(sbalways_h);
-               if (!v) {
-                  emit("do-hide-hbar", "");
-                  set_int(sbvis_h, 0);
-               }
-            }
-            set_int(sbvis_timer, 0);
-            return 0;
-         }
-      }
       parts {
          part { name: "bg";
             description { state: "default" 0.0;

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index becf36a..27f1101 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -2200,11 +2200,6 @@
       inherit: "elm/naviframe/item/basic/default";
       alias:"elm/naviframe/item/1line/instant/default";
       alias:"elm/naviframe/item/instant/default";
-      script {
-         public oh_show = 0;     //optionheader show/hide
-         public oh_close = 0;    //optionheader close/open
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
@@ -2232,11 +2227,6 @@
       inherit: "elm/naviframe/item/basic2/default";
       alias:"elm/naviframe/item/2line/instant/default";
       alias:"elm/naviframe/item/instant2/default";
-      script {
-         public oh_show = 0;     //optionheader show/hide
-         public oh_close = 0;    //optionheader close/open
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
@@ -2262,9 +2252,6 @@
    }
    group { name: "elm/naviframe/item/segment/instant/default";
       inherit:  "elm/naviframe/item/segment/default";
-      script {
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
@@ -2303,9 +2290,6 @@
 
    group { name: "elm/naviframe/item/tabbar/instant/default";
       inherit:  "elm/naviframe/item/tabbar/default";
-      script {
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index e11529e..f1f2946 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -2769,9 +2769,6 @@ group { name: "elm/popup/buttons3/content_expand";
 
 group { name: "elm/popup/item/content_expand";
    inherit: "elm/popup/item/default";
-   script {
-      public item_state = POPUP_ITEM_STATE_ENABLED;
-   }
    parts {
       part { name: "bg";
          mouse_events: 0;

diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc
index 1fa4001..11f8729 100644 (file)
--- a/themes/widgets/slider.edc
+++ b/themes/widgets/slider.edc
@@ -2911,31 +2911,6 @@
 
    group { name: "elm/slider/horizontal/expanded_indicator_button";
       inherit: "elm/slider/horizontal/default";
-      script {
-         public invert_on = 0;
-         public set_invert_on() {
-            set_state(PART:"level", "inverted", 0.0);
-            set_state(PART:"level2", "inverted", 0.0);
-            set_int(invert_on, 1);
-         }
-         public set_invert_off() {
-            set_state(PART:"level", "default", 0.0);
-            set_state(PART:"level2", "default", 0.0);
-            set_int(invert_on, 0);
-         }
-         public thumb_down() {
-            if(get_int(invert_on) == 0)
-               set_state(PART:"level", "pressed", 0.0);
-            else if(get_int(invert_on) == 1)
-               set_state(PART:"level2", "pressed", 0.0);
-            }
-         public thumb_up() {
-            if(get_int(invert_on) == 0)
-               set_state(PART:"level", "default", 0.0);
-            else if(get_int(invert_on) == 1)
-               set_state(PART:"level2", "inverted", 0.0);
-            }
-         }
       parts {
          part { name: "elm.dragable.slider";
             type: GROUP;

diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index 19ae3ba..4d1d0d3 100644 (file)
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -647,9 +647,6 @@ group { name: "elm/toolbar/item/default";
 
 group { name: "elm/toolbar/item/item_horizontal";
    inherit: "elm/toolbar/item/default";
-   script {
-      public item_state = ITEM_STATE_ENABLED;
-   }
    parts {
       part { name: "icon_rect";
          description { state: "default" 0.0;
@@ -1708,9 +1705,6 @@ group { name: "elm/toolbar/item/tabbar";
 
 group { name: "elm/toolbar/item/tabbar/item_horizontal";
    inherit: "elm/toolbar/item/tabbar";
-   script {
-      public item_state = ITEM_STATE_ENABLED;
-   }
    parts {
       part { name: "icon_rect";
          description { state: "default" 0.0;