diff options
| author | taesubkim <taesub.kim@samsung.com> | 2016-04-26 15:47:01 +0900 |
|---|---|---|
| committer | taesubkim <taesub.kim@samsung.com> | 2016-04-26 16:14:46 +0900 |
| commit | 22633ced6225d294ce8483efbf2b39ea0c0c1b65 (patch) | |
| tree | 8c5f2312feec413068a18e57a80321b31b4f7b74 /src/proxy.c | |
| parent | bcae74da8fa2958b3fec9153fc33e41f0e0317bf (diff) | |
| download | connman-22633ced6225d294ce8483efbf2b39ea0c0c1b65.tar.gz connman-22633ced6225d294ce8483efbf2b39ea0c0c1b65.tar.bz2 connman-22633ced6225d294ce8483efbf2b39ea0c0c1b65.zip | |
Imported Upstream version 1.29upstream/1.29
Change-Id: I2958446c35966d9ed72df0120b80561be7d89f54
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'src/proxy.c')
| -rw-r--r-- | src/proxy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/proxy.c b/src/proxy.c index 0d1a25ab..f331de92 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -44,6 +44,9 @@ struct proxy_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); @@ -150,11 +153,6 @@ void connman_proxy_lookup_cancel(unsigned int token) } 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, |