summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Volz <andreas@er00923n.(none)>2010-07-13 23:12:50 +0200
committerAndreas Volz <andreas@er00923n.(none)>2010-07-13 23:12:50 +0200
commit9ac4f0252f0784e8594b41e578e6d04f89835d13 (patch)
tree5e2b669f51574aaf697493122f3315528faa3f4b
parentd083d0716776b60a9396053b204497b4577b9ec4 (diff)
downloaddbus-c++-9ac4f0252f0784e8594b41e578e6d04f89835d13.tar.gz
compile against latest ecore
-rw-r--r--include/dbus-c++/ecore-integration.h6
-rw-r--r--src/ecore-integration.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/dbus-c++/ecore-integration.h b/include/dbus-c++/ecore-integration.h
index b475533..2b14b27 100644
--- a/include/dbus-c++/ecore-integration.h
+++ b/include/dbus-c++/ecore-integration.h
@@ -47,7 +47,7 @@ private:
void toggle();
- static int timeout_handler( void* );
+ static Eina_Bool timeout_handler( void* );
void _enable();
@@ -69,9 +69,9 @@ private:
void toggle();
- static int watch_handler_read ( void*, Ecore_Fd_Handler *fdh);
+ static Eina_Bool watch_handler_read ( void*, Ecore_Fd_Handler *fdh);
- static int watch_handler_error ( void*, Ecore_Fd_Handler *fdh);
+ static Eina_Bool watch_handler_error ( void*, Ecore_Fd_Handler *fdh);
void _enable();
diff --git a/src/ecore-integration.cpp b/src/ecore-integration.cpp
index e530e06..f1e24e7 100644
--- a/src/ecore-integration.cpp
+++ b/src/ecore-integration.cpp
@@ -50,7 +50,7 @@ void Ecore::BusTimeout::toggle()
else _disable();
}
-int Ecore::BusTimeout::timeout_handler( void *data )
+Eina_Bool Ecore::BusTimeout::timeout_handler( void *data )
{
Ecore::BusTimeout* t = reinterpret_cast<Ecore::BusTimeout*>(data);
@@ -118,7 +118,7 @@ void Ecore::BusWatch::toggle()
else _disable();
}
-int Ecore::BusWatch::watch_handler_read( void *data, Ecore_Fd_Handler *fdh )
+Eina_Bool Ecore::BusWatch::watch_handler_read( void *data, Ecore_Fd_Handler *fdh )
{
Ecore::BusWatch* w = reinterpret_cast<Ecore::BusWatch*>(data);
@@ -133,7 +133,7 @@ int Ecore::BusWatch::watch_handler_read( void *data, Ecore_Fd_Handler *fdh )
return 1;
}
-int Ecore::BusWatch::watch_handler_error( void *data, Ecore_Fd_Handler *fdh )
+Eina_Bool Ecore::BusWatch::watch_handler_error( void *data, Ecore_Fd_Handler *fdh )
{
//Ecore::BusWatch* w = reinterpret_cast<Ecore::BusWatch*>(data);