summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVyacheslav Reutskiy <v.reutskiy@samsung.com>2014-07-07 10:16:20 +0300
committerVyacheslav Reutskiy <v.reutskiy@samsung.com>2014-07-07 10:16:20 +0300
commit59fc6e94253f954f0b4d7a654200bdacb561ae7b (patch)
tree252cf5c6683cc921892c66c820228dd25e5d5c44
parente68f722db5fce0846a37e378c7901902564056a9 (diff)
parent5acc57da7e2d0d26b8451e86753808cda17baae8 (diff)
Merge branch 'develop'0.1.2
Conflicts: src/lib/ewe_statusbar.eo src/lib/ewe_tabs.eo
-rw-r--r--configure.ac56
-rw-r--r--src/lib/ewe_ruler.eo4
-rw-r--r--src/lib/ewe_statusbar.eo2
-rw-r--r--src/lib/ewe_tabs.eo2
4 files changed, 32 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac
index d674d33..527a7ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1EWE_VERSION([0], [1], [1]) 1EWE_VERSION([0], [1], [2])
2AC_INIT([ewe], [ewe_version], [enlightenment-devel@lists.sourceforge.net]) 2AC_INIT([ewe], [ewe_version], [enlightenment-devel@lists.sourceforge.net])
3AC_PREREQ([2.60]) 3AC_PREREQ([2.60])
4AC_CONFIG_SRCDIR([configure.ac]) 4AC_CONFIG_SRCDIR([configure.ac])
@@ -60,41 +60,41 @@ PKG_PROG_PKG_CONFIG
60 60
61PKG_CHECK_MODULES([EFL], 61PKG_CHECK_MODULES([EFL],
62 [ 62 [
63 eina >= efl_version 63 eina > efl_version
64 eet >= efl_version 64 eet > efl_version
65 evas >= efl_version 65 evas > efl_version
66 ecore >= efl_version 66 ecore > efl_version
67 ecore-input >= efl_version 67 ecore-input > efl_version
68 edje >= efl_version 68 edje > efl_version
69 eo >= efl_version 69 eo > efl_version
70 ecore-imf >= efl_version 70 ecore-imf > efl_version
71 ecore-con >= efl_version 71 ecore-con > efl_version
72 eio >= efl_version 72 eio > efl_version
73 eldbus >= efl_version 73 eldbus > efl_version
74 efreet >= efl_version 74 efreet > efl_version
75 efreet-mime >= efl_version 75 efreet-mime > efl_version
76 ], 76 ],
77 [have_efl="${GREEN}yes${RESET}"], 77 [have_efl="${GREEN}yes${RESET}"],
78 [have_efl="${RED}no${RESET} (version < efl_version)"] 78 [have_efl="${RED}no${RESET} (version < efl_version)"]
79) 79)
80 80
81requirement_ewe="\ 81requirement_ewe="\
82 eina >= efl_version \ 82 eina > efl_version \
83 eet >= efl_version \ 83 eet > efl_version \
84 evas >= efl_version \ 84 evas > efl_version \
85 ecore >= efl_version \ 85 ecore > efl_version \
86 ecore-input >= efl_version \ 86 ecore-input > efl_version \
87 edje >= efl_version \ 87 edje > efl_version \
88 eo >= efl_version \ 88 eo > efl_version \
89 ecore-imf >= efl_version \ 89 ecore-imf > efl_version \
90 ecore-con >= efl_version \ 90 ecore-con > efl_version \
91 eio >= efl_version \ 91 eio > efl_version \
92 eldbus >= efl_version \ 92 eldbus > efl_version \
93 efreet >= efl_version \ 93 efreet > efl_version \
94 efreet-mime >= efl_version \ 94 efreet-mime > efl_version \
95 " 95 "
96 96
97PKG_CHECK_MODULES([ELEMENTARY], [elementary >= elm_version], 97PKG_CHECK_MODULES([ELEMENTARY], [elementary > elm_version],
98 [have_elm="${GREEN}yes${RESET}"], 98 [have_elm="${GREEN}yes${RESET}"],
99 [have_elm="${RED}no${RESET} (version < elm_version)"]) 99 [have_elm="${RED}no${RESET} (version < elm_version)"])
100 100
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index dc64211..6e4fe92 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -26,7 +26,7 @@ class Ewe_Ruler (Elm_Widget)
26 @ingroup ruler*/ 26 @ingroup ruler*/
27 } 27 }
28 values { 28 values {
29 unsigned int step; 29 uint step;
30 } 30 }
31 } 31 }
32 zero_offset { 32 zero_offset {
@@ -65,7 +65,7 @@ class Ewe_Ruler (Elm_Widget)
65 @ingroup ruler*/ 65 @ingroup ruler*/
66 return Eina_Bool; 66 return Eina_Bool;
67 params { 67 params {
68 @in unsigned int step; /*@The Ruler's step between marks*/ 68 @in uint step; /*@The Ruler's step between marks*/
69 } 69 }
70 } 70 }
71 zero_offset_set { 71 zero_offset_set {
diff --git a/src/lib/ewe_statusbar.eo b/src/lib/ewe_statusbar.eo
index bb712f6..fec46c6 100644
--- a/src/lib/ewe_statusbar.eo
+++ b/src/lib/ewe_statusbar.eo
@@ -53,7 +53,7 @@ class Ewe_Statusbar (Elm_Widget)
53 53
54 @return Eina_List with a pointer to Ewe_Statusbar_Item in its nodes, NULL otherwise. 54 @return Eina_List with a pointer to Ewe_Statusbar_Item in its nodes, NULL otherwise.
55 @ingroup Statusbar. */ 55 @ingroup Statusbar. */
56 return const(Eina_List)*; 56 return const(Eina_List) *;
57 } 57 }
58 clear { 58 clear {
59 /*@ 59 /*@
diff --git a/src/lib/ewe_tabs.eo b/src/lib/ewe_tabs.eo
index 0118156..7980a04 100644
--- a/src/lib/ewe_tabs.eo
+++ b/src/lib/ewe_tabs.eo
@@ -13,7 +13,7 @@ class Ewe_Tabs (Elm_Widget)
13 @ingroup tabs*/ 13 @ingroup tabs*/
14 } 14 }
15 values { 15 values {
16 const(Eina_List) * items; 16 const(Eina_List) *items;
17 } 17 }
18 } 18 }
19 active_item { 19 active_item {