OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
76d11f1
)
shared: Resetting watch identifier is done in the destroy handler
author
Marcel Holtmann
<marcel@holtmann.org>
Sat, 12 Jan 2013 01:53:03 +0000
(17:53 -0800)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sat, 12 Jan 2013 01:53:03 +0000
(17:53 -0800)
src/shared/mgmt.c
patch
|
blob
|
history
diff --git
a/src/shared/mgmt.c
b/src/shared/mgmt.c
index
78dc881
..
c41454b
100644
(file)
--- a/
src/shared/mgmt.c
+++ b/
src/shared/mgmt.c
@@
-422,15
+422,11
@@
void mgmt_unref(struct mgmt *mgmt)
g_queue_free(mgmt->reply_queue);
g_queue_free(mgmt->request_queue);
- if (mgmt->write_watch > 0)
{
+ if (mgmt->write_watch > 0)
g_source_remove(mgmt->write_watch);
- mgmt->write_watch = 0;
- }
- if (mgmt->read_watch > 0)
{
+ if (mgmt->read_watch > 0)
g_source_remove(mgmt->read_watch);
- mgmt->read_watch = 0;
- }
g_io_channel_unref(mgmt->io);
mgmt->io = NULL;