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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef06907..7c9b589 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,10 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
# Set required packages
INCLUDE(FindPkgConfig)
-SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle aul ecore")
+SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle aul")
IF (with_x)
-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)
diff --git a/src/appsvc.c b/src/appsvc.c
index ff95f43..7956bf0 100644
--- a/src/appsvc.c
+++ b/src/appsvc.c
@@ -19,10 +19,10 @@
#include <glib.h>
#include <aul.h>
#include <aul_svc.h>
-#include <Ecore.h>
+//#include <Ecore.h>
#ifndef WAYLAND
-#include <Ecore_X.h>
+//#include <Ecore_X.h>
#endif
#include "appsvc.h"
@@ -183,7 +183,7 @@ SLPAPI int appsvc_data_is_array(bundle *b, const char *key)
}
#ifndef WAYLAND
-SLPAPI int appsvc_allow_transient_app(bundle *b, Ecore_X_Window id)
+SLPAPI int appsvc_allow_transient_app(bundle *b, unsigned int id)
{
return aul_svc_allow_transient_app(b, id);
}
@@ -195,7 +195,7 @@ SLPAPI int appsvc_allow_transient_app(bundle *b, unsigned int id)
#endif
#ifndef WAYLAND
-SLPAPI int appsvc_request_transient_app(bundle *b, Ecore_X_Window callee_id, appsvc_host_res_fn cbfunc, void *data)
+SLPAPI int appsvc_request_transient_app(bundle *b, unsigned int callee_id, appsvc_host_res_fn cbfunc, void *data)
{
return aul_svc_request_transient_app(b, callee_id, (aul_svc_host_res_fn)cbfunc, data);
}
diff --git a/test/appsvc_test.c b/test/appsvc_test.c
index cb4a62f..0e13d9f 100755
--- 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 @@ static void cb_func(bundle *kb, int request_code, appsvc_result_val result, void
if(strcmp(cmd,"run_svc_res")==0){
printf("==== end of appsvc_run() ====\n");
- ecore_main_loop_quit();
+ //ecore_main_loop_quit();
}
}
@@ -291,7 +291,7 @@ void print_usage(char* progname)
}
-
+/*
static Eina_Bool run_func(void *data)
{
callfunc(cmd);
@@ -303,7 +303,7 @@ static Eina_Bool run_func(void *data)
return 0;
}
-
+*/
int main(int argc, char** argv)
{
@@ -312,7 +312,7 @@ int main(int argc, char** argv)
exit(0);
}
- ecore_init();
+ //ecore_init();
cmd = argv[1];
gargc = argc;
@@ -324,9 +324,9 @@ int main(int argc, char** argv)
//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;
}
|
