Remove dependency on libxkbcommon

[platform/upstream/at-spi2-core.git] / dbind / dbind.h

diff --git a/dbind/dbind.h b/dbind/dbind.h
index 4e66359..f7298d0 100644 (file)
--- a/dbind/dbind.h
+++ b/dbind/dbind.h
@@ -1,39 +1,69 @@
+/*
+ * Copyright 2008-2011 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #ifndef _DBIND_H_
 #define _DBIND_H_
 
-
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
+#include <dbind/dbind-any.h>
+
+DBusMessage *
+dbind_send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error);
+
+dbus_bool_t
+dbind_method_call_reentrant_va (DBusConnection *cnx,
+                                const char     *bus_name,
+                                const char     *path,
+                                const char     *interface,
+                                const char     *method,
+                                DBusError      *opt_error,
+                                const char     *arg_types,
+                                va_list         args);
+
+dbus_bool_t
+dbind_method_call_reentrant (DBusConnection *cnx,
+                             const char     *bus_name,
+                             const char     *path,
+                             const char     *interface,
+                             const char     *method,
+                             DBusError      *opt_error,
+                             const char     *arg_types,
+                             ...);
+
+dbus_bool_t
+dbind_emit_signal_va (DBusConnection *cnx,
+                      const char     *path,
+                      const char     *interface,
+                      const char     *signal,
+                      DBusError      *opt_error,
+                      const char     *arg_types,
+                      va_list         args);
 
-typedef struct _DBindContext DBindContext;
-
-DBindContext *dbind_create_context         (DBusBusType type, DBusError *opt_error);
-void          dbind_context_free           (DBindContext *ctx);
-dbus_bool_t   dbind_context_method_call    (DBindContext *ctx,
-                                            const char *bus_name,
-                                            const char *path,
-                                            const char *interface,
-                                            const char *method,
-                                            DBusError *opt_error,
-                                            const char *arg_types,
-                                            ...);
-
-/* dbus connection variants */
-dbus_bool_t   dbind_connection_method_call    (DBusConnection *cnx,
-                                               const char *bus_name,
-                                               const char *path,
-                                               const char *interface,
-                                               const char *method,
-                                               DBusError *opt_error,
-                                               const char *arg_types,
-                                               ...);
-dbus_bool_t   dbind_connection_method_call_va (DBusConnection *cnx,
-                                               const char *bus_name,
-                                               const char *path,
-                                               const char *interface,
-                                               const char *method,
-                                               DBusError *opt_error,
-                                               const char *arg_types,
-                                               va_list     args);
+dbus_bool_t
+dbind_emit_signal (DBusConnection *cnx,
+                   const char     *path,
+                   const char     *interface,
+                   const char     *signal,
+                   DBusError      *opt_error,
+                   const char     *arg_types,
+                   ...);
 
+void dbind_set_timeout (int timeout);
 #endif /* _DBIND_H_ */