Port to Tizen 2.0alpha with the exception of contacts handling

diff --git a/Makefile.am b/Makefile.am
index 7976663..5b371ea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,11 +38,11 @@ utils_libofono_efl_utils_la_LIBADD = \
        @EFL_LIBS@ \
        @TIZEN_LIBS@
 
-if HAVE_TIZEN
-utils_libofono_efl_utils_la_SOURCES += utils/contacts-tizen.c
-else
+#if HAVE_TIZEN
+#utils_libofono_efl_utils_la_SOURCES += utils/contacts-tizen.c
+#else
 utils_libofono_efl_utils_la_SOURCES += utils/contacts.c
-endif
+#endif
 
 bin_PROGRAMS = \
        dialer/dialer \

diff --git a/configure.ac b/configure.ac
index 7e3ba75..9f3128d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ if test "$want_tizen" != "no"; then
                 [
                         ecore-x
                         appcore-efl
-                        ui-gadget
+                        ui-gadget-1
                         capi-social-contacts
                         vconf
                         capi-system-power

diff --git a/packaging/ofono-efl.spec b/packaging/ofono-efl.spec
index 7d15fa6..314b6eb 100644 (file)
--- a/packaging/ofono-efl.spec
+++ b/packaging/ofono-efl.spec
@@ -10,8 +10,19 @@ BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(ofono)
+BuildRequires:  pkgconfig(ecore-x)
+BuildRequires:  pkgconfig(appcore-efl)
+BuildRequires:  pkgconfig(ui-gadget-1)
+BuildRequires:  pkgconfig(capi-social-contacts)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(capi-system-power)
+BuildRequires:  pkgconfig(utilX)
+BuildRequires:  pkgconfig(aul)
+BuildRequires:  pkgconfig(appsvc)
+BuildRequires:  pkgconfig(notification)
 BuildRequires:  edje-tools
 
+
 %description
 Provides a dialer application for an In-Vehicle Infotainment (IVI) system, where
 the primary modem access is via a mobile device connected to the head unit via the
@@ -24,7 +35,7 @@ Protocol (PBAP) over bluetooth when supported.
 
 %build
 
-%autogen
+%autogen --enable-tizen
 
 make %{?jobs:-j%jobs}
 
@@ -37,8 +48,16 @@ rm -rf %{buildroot}
 %{_bindir}/answer_daemon
 %{_bindir}/dialer
 %{_bindir}/messages
+%{_bindir}/dialer_daemon
+%{_bindir}/dialer_open
+%{_bindir}/message_daemon
 %{_datadir}/ofono-efl/examples/contacts.csv
 %{_datadir}/ofono-efl/scripts/ofono-efl-contacts-db-create.py
 %{_datadir}/ofono-efl/themes/default-sd.edj
 %{_datadir}/ofono-efl/themes/default.edj
-
+%{_datadir}/dbus-1/services/org.tizen.dialer.service
+%{_datadir}/ofono-efl/tizen-examples/order
+/opt/share/applications/answer_daemon.desktop
+/opt/share/applications/dialer.desktop
+/opt/share/applications/org.tizen.call.desktop
+/opt/share/applications/org.tizen.phone.desktop

diff --git a/tizen/answer_daemon.c b/tizen/answer_daemon.c
index f35ce2a..0a9e37d 100644 (file)
--- a/tizen/answer_daemon.c
+++ b/tizen/answer_daemon.c
@@ -55,7 +55,7 @@ static void _set_notification_type(Evas_Object *win, Eina_Bool high)
                                                ECORE_X_WINDOW_TYPE_NOTIFICATION);
                utilx_set_system_notification_level(ecore_x_display_get(), xwin,
                                                        UTILX_NOTIFICATION_LEVEL_HIGH);
-               power_wakeup();
+               power_wakeup(EINA_TRUE);
        } else
                ecore_x_netwm_window_type_set(xwin, ECORE_X_WINDOW_TYPE_NORMAL);
 #else

diff --git a/tizen/message_daemon.c b/tizen/message_daemon.c
index 9c0c74c..21c6339 100644 (file)
--- a/tizen/message_daemon.c
+++ b/tizen/message_daemon.c
@@ -81,7 +81,7 @@ static void _inc_sms_cb(void *data __UNUSED__, unsigned int sms_class,
                return;
 
        if (_phone_locked())
-               power_wakeup();
+               power_wakeup(EINA_TRUE);
 
        _notification_create(sender, message);
 }