jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge from freedesktop.org

Browse source 
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	examples/echo/echo-server.cpp
	examples/properties/props-server.cpp
This commit is contained in:
Andreas Volz 2008-09-29 23:17:03 +02:00
commit 13219dd9fc
18 changed files with 124 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/eventloop-integration.cpp
View file

@ -100,7 +100,8 @@ Timeout *BusDispatcher::add_timeout(Timeout::Internal *ti)
bt->expired = new Callback<BusDispatcher, void, DefaultTimeout &>(this, &BusDispatcher::timeout_expired);
bt->data(bt);
debug_log("added timeout %p (%s)", bt, ((Timeout *)bt)->enabled() ? "on":"off");
debug_log("added timeout %p (%s) interval=%d",
bt, ((Timeout *)bt)->enabled() ? "on":"off", ((Timeout *)bt)->interval());
return bt;
}
@ -120,8 +121,7 @@ Watch *BusDispatcher::add_watch(Watch::Internal *wi)
bw->data(bw);
debug_log("added watch %p (%s) fd=%d flags=%d",
bw, ((Watch *)bw)->enabled() ? "on":"off", ((Watch *)bw)->descriptor(), ((Watch *)bw)->flags()
);
bw, ((Watch *)bw)->enabled() ? "on":"off", ((Watch *)bw)->descriptor(), ((Watch *)bw)->flags());
return bw;
}