Update launch code for quickpanal

Change-Id: I39313fb553398ee47fc41ff8c57efc5f384214be

diff --git a/daemon/quickpanel-ui.c b/daemon/quickpanel-ui.c
index 49dd5a9..077cf12 100755 (executable)
--- a/daemon/quickpanel-ui.c
+++ b/daemon/quickpanel-ui.c
@@ -256,7 +256,7 @@ static void _ui_handler_content_region_set(void *data, int contents_height)
        ecore_x_window_prop_card32_set(xwin, atom_window_contents_region, window_contents_region, 4);
 #else
        tzsh_region_add(region, 0, contents_height, ad->win_width, ELM_SCALE_SIZE(QP_HANDLE_H));
-       tzsh_quickpanel_service_handler_region_set(ad->quickpanel_service, ad->angle, region);
+       tzsh_quickpanel_service_content_region_set(ad->quickpanel_service, ad->angle, region);
        tzsh_region_destroy(region);
 #endif
 }

diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec
index f25992a..8e415dc 100755 (executable)
--- a/packaging/org.tizen.quickpanel.spec
+++ b/packaging/org.tizen.quickpanel.spec
@@ -119,12 +119,9 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}%{__usrdir}/default.target.wants
-mkdir -p %{buildroot}%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
 install -m 0644 %SOURCE102 %{buildroot}%{__usrdir}/quickpanel.service
-ln -s ../quickpanel.service %{buildroot}%{__usrdir}/default.target.wants/quickpanel.service
-
 install -m 0644 %SOURCE104 %{buildroot}%{__usrdir}/quickpanel.path
-ln -s ../quickpanel.path %{buildroot}%{__usrdir}/default.target.wants/quickpanel.path
+ln -s ../quickpanel.path %{buildroot}%{__usrdir}/default.target.wants/
 %post
 
 
@@ -137,11 +134,9 @@ ln -s ../quickpanel.path %{buildroot}%{__usrdir}/default.target.wants/quickpanel
 /opt/%{_prefix}/apps/%{name}/data
 %{_prefix}/apps/%{name}
 %{_prefix}/share/packages/%{name}.xml
-%{_sysconfdir}/init.d/quickpanel
+%{__usrdir}/default.target.wants/quickpanel.path
 %{__usrdir}/quickpanel.service
 %{__usrdir}/quickpanel.path
-%{__usrdir}/default.target.wants/quickpanel.service
-%{__usrdir}/default.target.wants/quickpanel.path
 %{_prefix}/share/license/%{name}
 %if %{with wayland}
 # Do not install the SMACK Rule file for Tizen 3.x

diff --git a/packaging/quickpanel-system.service b/packaging/quickpanel-system.service
index 9db42e5..d971b3c 100755 (executable)
--- a/packaging/quickpanel-system.service
+++ b/packaging/quickpanel-system.service
@@ -1,17 +1,16 @@
 [Unit]
 Description=Start the Quickpanel
-After=connman.service
 
 [Service]
 Type=simple
-EnvironmentFile=/run/xdg-root-env
 EnvironmentFile=/run/tizen-system-env
-ExecStart=/usr/apps/org.tizen.quickpanel/bin/quickpanel
+#ExecStart=/usr/apps/org.tizen.quickpanel/bin/quickpanel
+ExecStart=/usr/bin/app_launcher -s org.tizen.quickpanel
 Restart=always
 RestartSec=0
 KillSignal=SIGKILL
 OOMScoreAdjust=200
 
 [Install]
-WantedBy=multi-user.target
-#WantedBy=default.target
+#WantedBy=multi-user.target
+WantedBy=default.target