projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.29
[platform/upstream/connman.git]
/
src
/
proxy.c
diff --git
a/src/proxy.c
b/src/proxy.c
index
0d1a25a
..
f331de9
100644
(file)
--- a/
src/proxy.c
+++ b/
src/proxy.c
@@
-44,6
+44,9
@@
struct proxy_lookup {
static void remove_lookup(struct proxy_lookup *lookup)
{
static void remove_lookup(struct proxy_lookup *lookup)
{
+ if (lookup->watch > 0)
+ g_source_remove(lookup->watch);
+
lookup_list = g_slist_remove(lookup_list, lookup);
connman_service_unref(lookup->service);
lookup_list = g_slist_remove(lookup_list, lookup);
connman_service_unref(lookup->service);
@@
-150,11
+153,6
@@
void connman_proxy_lookup_cancel(unsigned int token)
}
if (lookup) {
}
if (lookup) {
- if (lookup->watch > 0) {
- g_source_remove(lookup->watch);
- lookup->watch = 0;
- }
-
if (lookup->proxy &&
lookup->proxy->cancel_lookup)
lookup->proxy->cancel_lookup(lookup->service,
if (lookup->proxy &&
lookup->proxy->cancel_lookup)
lookup->proxy->cancel_lookup(lookup->service,