projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[daemon-dev][lib-opt] Fix in freeing memory, cleanup, comments, renames
[platform/upstream/dbus.git]
/
dbus
/
dbus-mainloop.h
diff --git
a/dbus/dbus-mainloop.h
b/dbus/dbus-mainloop.h
index
8a3cde1
..
a76cb6f
100644
(file)
--- a/
dbus/dbus-mainloop.h
+++ b/
dbus/dbus-mainloop.h
@@
-1,9
+1,9
@@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"
; indent-tabs-mode: nil;
-*- */
/* dbus-mainloop.h Main loop utility
*
* Copyright (C) 2003 Red Hat, Inc.
*
/* dbus-mainloop.h Main loop utility
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version
1.2
+ * Licensed under the Academic Free License version
2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*
*/
*
*/
@@
-33,30
+33,20
@@
typedef struct DBusLoop DBusLoop;
typedef dbus_bool_t (* DBusWatchFunction) (DBusWatch *watch,
unsigned int condition,
void *data);
typedef dbus_bool_t (* DBusWatchFunction) (DBusWatch *watch,
unsigned int condition,
void *data);
-typedef void (* DBusTimeoutFunction) (DBusTimeout *timeout,
- void *data);
DBusLoop* _dbus_loop_new (void);
DBusLoop* _dbus_loop_new (void);
-
void
_dbus_loop_ref (DBusLoop *loop);
+
DBusLoop*
_dbus_loop_ref (DBusLoop *loop);
void _dbus_loop_unref (DBusLoop *loop);
dbus_bool_t _dbus_loop_add_watch (DBusLoop *loop,
void _dbus_loop_unref (DBusLoop *loop);
dbus_bool_t _dbus_loop_add_watch (DBusLoop *loop,
- DBusWatch *watch,
- DBusWatchFunction function,
- void *data,
- DBusFreeFunction free_data_func);
+ DBusWatch *watch);
void _dbus_loop_remove_watch (DBusLoop *loop,
void _dbus_loop_remove_watch (DBusLoop *loop,
- DBusWatch *watch
,
-
DBusWatchFunction function
,
-
void *data
);
+ DBusWatch *watch
);
+
void _dbus_loop_toggle_watch (DBusLoop *loop
,
+
DBusWatch *watch
);
dbus_bool_t _dbus_loop_add_timeout (DBusLoop *loop,
dbus_bool_t _dbus_loop_add_timeout (DBusLoop *loop,
- DBusTimeout *timeout,
- DBusTimeoutFunction function,
- void *data,
- DBusFreeFunction free_data_func);
+ DBusTimeout *timeout);
void _dbus_loop_remove_timeout (DBusLoop *loop,
void _dbus_loop_remove_timeout (DBusLoop *loop,
- DBusTimeout *timeout,
- DBusTimeoutFunction function,
- void *data);
+ DBusTimeout *timeout);
dbus_bool_t _dbus_loop_queue_dispatch (DBusLoop *loop,
DBusConnection *connection);
dbus_bool_t _dbus_loop_queue_dispatch (DBusLoop *loop,
DBusConnection *connection);
@@
-70,7
+60,7
@@
dbus_bool_t _dbus_loop_dispatch (DBusLoop *loop);
int _dbus_get_oom_wait (void);
void _dbus_wait_for_memory (void);
int _dbus_get_oom_wait (void);
void _dbus_wait_for_memory (void);
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+#endif /*
!
DOXYGEN_SHOULD_SKIP_THIS */
#endif /* DBUS_MAINLOOP_H */
#endif /* DBUS_MAINLOOP_H */