Merge branch 'tizen_3.0' into tizen

Conflicts:
	CMakeLists.txt
	include/windicator.h
	packaging/org.tizen.windicator.spec
	src/windicator.c

Change-Id: I55b8a021ebe7c644f8ba89ebeb63efe831ed6397

diff --cc CMakeLists.txt
index 0c0e4b1a6c622df357f972de2c6934c3bf3e207e,0f92e6efa998429164f98452659e1900247d8138..13c57fe74d027078226098aa8546454ea3a7c67b
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,12 -2,12 +2,12 @@@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6
  PROJECT(windicator C)
  
  SET(SRCS
--      src/windicator.c
++        src/windicator.c
          src/windicator_util.c
          src/windicator_moment_bar.c
          src/windicator_moment_view.c
          src/windicator_brightness.c
--      src/windicator_connection.c
++        src/windicator_connection.c
          src/windicator_volume.c
          src/windicator_dynamic.c
          src/windicator_call_fwd_btn.c
@@@ -54,11 -54,10 +54,11 @@@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOU
  INCLUDE(FindPkgConfig)
  pkg_check_modules(pkgs REQUIRED elementary ecore-imf appcore-common appcore-efl
                                  dlog glib-2.0 evas eina edje vconf elementary sensor
 -                                ecore ecore-input ecore-evas capi-appfw-application capi-appfw-widget-application
 +                                ecore ecore-input ecore-evas capi-appfw-preference
 +                                capi-appfw-app-control capi-appfw-application
                                  feedback appsvc deviced capi-system-device capi-system-info
--                              capi-media-sound-manager efl-extension capi-system-system-settings
-                               capi-ui-efl-util aul pkgmgr pkgmgr-info tzsh-quickpanel-service
 -                              capi-ui-efl-util aul pkgmgr pkgmgr-info tzsh-quickpanel-service tzsh-quickpanel 
++                                capi-media-sound-manager efl-extension capi-system-system-settings
++                                capi-ui-efl-util aul pkgmgr pkgmgr-info tzsh-quickpanel-service tzsh-quickpanel
  )
  
  #??

diff --cc include/windicator.h
index 9ab17d6225f089ca2553c310fd6c2a51d7abad64,55c3dd4da8821c9c90b295313e927d3f525ee1d9..3c6e09c7173847cdf3f06def512c785bfd96dd1b
--- 1/include/windicator.h
--- 2/include/windicator.h
+++ b/include/windicator.h
@@@ -20,7 -24,9 +23,9 @@@
  #include <device/power.h>
  #include <feedback.h>
  #include <efl_util.h>
--#include "tzsh_quickpanel_service.h"
 -#include "tzsh_quickpanel.h"
++#include <tzsh_quickpanel_service.h>
++#include <tzsh_quickpanel.h>
+ #include <widget_app.h>
  
  #if !defined(PACKAGE)
  #  define PACKAGE "windicator"

diff --cc packaging/org.tizen.windicator.spec
index 6d5f7d801abe534c7ad0d9a27197e9be08f0129f,0ebd0dc0adc59d4d869ca4ea7313551c94b7cbcc..1d5d91a71f305c1b672f64186aa8f4e351085122
--- 1/packaging/org.tizen.windicator.spec
--- 2/packaging/org.tizen.windicator.spec
+++ b/packaging/org.tizen.windicator.spec
@@@ -36,6 -35,7 +36,8 @@@ BuildRequires: pkgconfig(aul
  BuildRequires: gettext-tools
  BuildRequires: edje-bin, embryo-bin
  BuildRequires: pkgconfig(tzsh-quickpanel-service)
+ BuildRequires: pkgconfig(tzsh-quickpanel)
++
  %description
  Notification panel for wearable devices
  

diff --cc src/windicator.c
index fb2d65b587f2b47a2658a71b5f81b53dd39c3b80,e207e4264331e223db768635862397db5f4127d6..2b782aa96e841afe0bc7cdc65e3246fbeea8a57e
--- 1/src/windicator.c
--- 2/src/windicator.c
+++ b/src/windicator.c
@@@ -160,9 -179,11 +179,12 @@@ void windicator_lo_update(void* data
  void create_moments_bar_win(void *user_data)
  {
        struct appdata *ad = (struct appdata *)user_data;
-       elm_config_preferred_engine_set("opengl_x11");
+       //elm_config_preferred_engine_set("opengl_x11");
        _init_variables(ad);
++
+ #ifndef __W_HOME_WIDGET__
        tzsh_quickpanel_service_h qp_service;
+       tzsh_quickpanel_h qp;
        tzsh_region_h region;
        tzsh_window tz_win;
        tzsh_h tzsh = NULL;
@@@ -171,7 -192,8 +193,9 @@@
                _E("Failed to create tzsh\n");
                return;
        }
 +
+ #endif
+ 
        /* initialize Moment Bar */
        if (WINDICATOR_ERROR_OK != windicator_moment_bar_init(ad)) {
                _E("Failed to initialize moment bar");
@@@ -187,7 -211,10 +213,12 @@@
                return;
        }
        qp_service = tzsh_quickpanel_service_create(tzsh, tz_win);
++
+       qp = tzsh_quickpanel_create(tzsh, tz_win);
        ad->qp_service = qp_service;
+       ad->qp = qp;
+       _D("ad->qp : %x", ad->qp);
++
        tzsh_quickpanel_service_effect_type_set(qp_service, TZSH_QUICKPANEL_SERVICE_EFFECT_TYPE_MOVE);
        region = tzsh_region_create(tzsh);
        tzsh_region_add(region, 0, 300, 360, 60);