Fix build error and change base_scale

Change-Id: If48cb6722369897943cebfe85cd678771be8b5b8

diff --git a/clock-common/CMakeLists.txt b/clock-common/CMakeLists.txt
index c666353..dfc50bd 100644 (file)
--- a/clock-common/CMakeLists.txt
+++ b/clock-common/CMakeLists.txt
@@ -15,7 +15,6 @@ pkg_check_modules(clk_com_pkgs REQUIRED
                        gobject-2.0 gmodule-2.0 dlog
                        vconf
                        icu-i18n
-                       alarm-engine
                        edbus ecore-imf ecore ecore-file ecore-input
 )
 

diff --git a/clock-common/include/clock_fwk_util.h b/clock-common/include/clock_fwk_util.h
index 7cc14f3..07f49f5 100644 (file)
--- a/clock-common/include/clock_fwk_util.h
+++ b/clock-common/include/clock_fwk_util.h
@@ -18,7 +18,6 @@
 
 #include <Elementary.h>
 #include "clock_fwk_define.h"
-#include <alarm-engine.h>
 
 Evas_Object *load_edj(Evas_Object *parent, const char *file, const char *group);
 void win_del(void *data, Evas_Object *obj, void *event);

diff --git a/clock-common/src/clock_fwk_util.c b/clock-common/src/clock_fwk_util.c
index d8865da..e07a0ca 100644 (file)
--- a/clock-common/src/clock_fwk_util.c
+++ b/clock-common/src/clock_fwk_util.c
@@ -15,7 +15,6 @@
  */
 
 #include "clock_fwk_util.h"
-#include <alarm-engine.h>
 #include <vconf.h>
 #include <stdlib.h>
 //#include <edje.h>

diff --git a/packaging/libug-worldclock-efl.spec b/packaging/libug-worldclock-efl.spec
index e40d42a..f928a3b 100644 (file)
--- a/packaging/libug-worldclock-efl.spec
+++ b/packaging/libug-worldclock-efl.spec
@@ -20,8 +20,6 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(ui-gadget-1)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(icu-i18n)
-BuildRequires:  pkgconfig(heynoti)
-BuildRequires:  pkgconfig(alarm-engine)
 BuildRequires:  cmake
 BuildRequires:  edje-tools
 BuildRequires:  gettext-tools
@@ -365,8 +363,8 @@ fi
 # Change file owner
 chown :6015 /opt/dbspace/.worldclock.db
 chown :6015 /opt/dbspace/.worldclock.db-journal
-chmod 660 /opt/dbspace/.worldclock.db
-chmod 660 /opt/dbspace/.worldclock.db-journal
+chmod 664 /opt/dbspace/.worldclock.db
+chmod 664 /opt/dbspace/.worldclock.db-journal
 
 %postun -p /sbin/ldconfig
 

diff --git a/res/edc/worldclock_add.edc b/res/edc/worldclock_add.edc
old mode 100644 (file)
new mode 100755 (executable)
index 029e7cb..05dfefa
--- a/res/edc/worldclock_add.edc
+++ b/res/edc/worldclock_add.edc
@@ -16,6 +16,8 @@
 #define ADD_VIEW_WIDTH    (480)
 #define ADD_VIEW_HEIGHT   (HEIGHT-INDICATOR_H-NAVIGATION_BAR_H)
 
+base_scale: 2.4;
+
 group {
        name: "ug_add_layout";
 

diff --git a/res/edc/worldclock_segment.edc b/res/edc/worldclock_segment.edc
old mode 100644 (file)
new mode 100755 (executable)
index f98e27a..22aa2f5
--- a/res/edc/worldclock_segment.edc
+++ b/res/edc/worldclock_segment.edc
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+base_scale: 2.4;
+
 group {
         name: "segment_panel_layout";
        parts{

diff --git a/res/theme/worldclock_theme.edc b/res/theme/worldclock_theme.edc
old mode 100644 (file)
new mode 100755 (executable)
index bed6205..7114b1c
--- a/res/theme/worldclock_theme.edc
+++ b/res/theme/worldclock_theme.edc
@@ -66,6 +66,8 @@
 collections
 {
        //worldclock_addview_list
+       base_scale: 2.4;
+
     group
     {
         name:  "elm/genlist/item/worldclock_addview_list/default";

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cf72b9..f9cc52b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED appcore-efl elementary db-util
                                                glib-2.0 dlog vconf
                                                ui-gadget-1 bundle
-                        icu-i18n heynoti
+                        icu-i18n
                                                )
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/src/worldclock_util.c b/src/worldclock_util.c
index 1823b80..b789fc4 100644 (file)
--- a/src/worldclock_util.c
+++ b/src/worldclock_util.c
@@ -19,7 +19,6 @@
 #include <appcore-efl.h>
 #include <Elementary.h>
 #include <vconf.h>
-#include <heynoti.h>
 #include <unicode/ustring.h>
 #include <unicode/ucol.h>