1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
diff --git a/app-svc/src/appsvc.c b/app-svc/src/appsvc.c
index f6d6766..a3e393a 100644
--- a/src/appsvc.c
+++ b/src/appsvc.c
@@ -30,10 +30,10 @@
#include <libsoup/soup.h>
#ifndef WAYLAND
-#include <Ecore_X.h>
+//#include <Ecore_X.h>
#endif
-#include <Ecore.h>
+//#include <Ecore.h>
#include <iniparser.h>
#include <pkgmgr-info.h>
@@ -1073,7 +1073,7 @@
appsvc_host_res_fn cb_func;
#ifndef WAYLAND
- Ecore_X_Window win_id;
+ //Ecore_X_Window win_id;
#endif
void *data;
@@ -1079,6 +1079,9 @@ typedef struct _appsvc_transient_cb_info_t{
void *data;
}appsvc_transient_cb_info_t;
+/*
+* cut callback function from efl main loop
+*
static Eina_Bool __transient_cb(void *data, int type, void *event)
{
#ifndef WAYLAND
@@ -1095,7 +1098,7 @@ static Eina_Bool __transient_cb(void *data, int type, void *event)
#endif
return ECORE_CALLBACK_RENEW;
}
-
+*/
int __aul_subapp_cb(void *data)
{
appsvc_transient_cb_info_t* cb_info;
@@ -1106,7 +1106,7 @@
cb_info = (appsvc_transient_cb_info_t*) data;
cb_info->cb_func(cb_info->data);
- ecore_main_loop_quit();
+ //ecore_main_loop_quit();
return 0;
}
@@ -1107,7 +1110,7 @@ int __aul_subapp_cb(void *data)
return 0;
}
-
+/*
#ifndef WAYLAND
SLPAPI int appsvc_allow_transient_app(bundle *b, Ecore_X_Window id)
{
@@ -1155,7 +1158,7 @@ SLPAPI int appsvc_request_transient_app(bundle *b, Ecore_X_Window callee_id, app
info->cb_func = cbfunc;
info->data = data;
- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, __transient_cb, info);
+ //ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, __transient_cb, info);
aul_set_subapp(__aul_subapp_cb, info);
return 0;
@@ -1166,7 +1169,7 @@ SLPAPI int appsvc_request_transient_app(bundle *b, unsigned int callee_id, appsv
return 0;
}
#endif
-
+*/
SLPAPI int appsvc_subapp_terminate_request_pid(int pid)
{
return aul_subapp_terminate_request_pid(pid);
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,12 +22,12 @@
# Set required packages
INCLUDE(FindPkgConfig)
-SET(APPSVC_PKGS_CHECK_MODULES "dlog ecore libprivilege-control aul")
-SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 ecore libsoup-2.4 iniparser pkgmgr-info libtzplatform-config")
+SET(APPSVC_PKGS_CHECK_MODULES "dlog libprivilege-control aul")
+SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 libsoup-2.4 iniparser pkgmgr-info libtzplatform-config")
IF (with_x)
pkg_check_modules(pkgs REQUIRED ${APPSVC_PKGS_CHECK_MODULES} x11)
-pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES} ecore-x)
+pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES})
ENDIF(with_x)
IF (with_wayland)
--- a/test/appsvc_test.c
+++ b/test/appsvc_test.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <sys/time.h>
#include <unistd.h>
-#include <Ecore.h>
+//#include <Ecore.h>
#include <aul.h>
#include "appsvc.h"
@@ -197,7 +197,7 @@
if(strcmp(cmd,"run_svc_res")==0){
printf("==== end of appsvc_run() ====\n");
- ecore_main_loop_quit();
+ //ecore_main_loop_quit();
}
}
@@ -292,18 +292,18 @@
}
-static Eina_Bool run_func(void *data)
-{
- callfunc(cmd);
-
- if(strcmp(cmd,"run_svc_res") == 0 )
- return 0;
- else
- ecore_main_loop_quit();
-
- return 0;
-}
-
+/* static Eina_Bool run_func(void *data)
+ * {
+ * callfunc(cmd);
+ *
+ * if(strcmp(cmd,"run_svc_res") == 0 )
+ * return 0;
+ * else
+ * ecore_main_loop_quit();
+ *
+ * return 0;
+ * }
+ */
int main(int argc, char** argv)
{
@@ -312,7 +312,7 @@
exit(0);
}
- ecore_init();
+ //ecore_init();
cmd = argv[1];
gargc = argc;
@@ -324,9 +324,9 @@
//aul_listen_app_dead_signal(dead_tracker,NULL);
//aul_listen_app_dead_signal(NULL,NULL);
- ecore_idler_add(run_func, NULL);
+ //ecore_idler_add(run_func, NULL);
- ecore_main_loop_begin();
+ //ecore_main_loop_begin();
return 0;
}
|
