diff options
| author | Simon McVittie <smcv@debian.org> | 2017-11-01 15:47:02 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2017-11-01 16:07:27 +0000 |
| commit | b433ea03e9523faf8e0479062e368cb01727b745 (patch) | |
| tree | eadb2005ea441ecb04d85ff4ce8979dae5010b01 | |
| parent | 65b40d2d380109a3713035c22e37c8ee323cd566 (diff) | |
| download | dbus-glib-b433ea03e9523faf8e0479062e368cb01727b745.tar.gz | |
dbus-gmain: Add a separate header for the main-loop integration
Signed-off-by: Simon McVittie <smcv@debian.org>
| -rw-r--r-- | dbus/Makefile.am | 4 | ||||
| -rw-r--r-- | dbus/dbus-glib-lowlevel.h | 6 | ||||
| -rw-r--r-- | dbus/dbus-gmain.h | 43 |
3 files changed, 47 insertions, 6 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 6433224..91ca3ab 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -44,7 +44,9 @@ libdbus_glib_HEADERS = \ dbus-gtype-specialized.h \ dbus-gvalue-parse-variant.h \ dbus-glib.h \ - dbus-glib-lowlevel.h + dbus-glib-lowlevel.h \ + dbus-gmain.h \ + $(NULL) libdbus_glibdir = $(includedir)/dbus-1.0/dbus diff --git a/dbus/dbus-glib-lowlevel.h b/dbus/dbus-glib-lowlevel.h index d08f951..bd479ad 100644 --- a/dbus/dbus-glib-lowlevel.h +++ b/dbus/dbus-glib-lowlevel.h @@ -25,6 +25,7 @@ #define DBUS_GLIB_LOWLEVEL_H #include <dbus/dbus-glib.h> +#include <dbus/dbus-gmain.h> #include <dbus/dbus.h> G_BEGIN_DECLS @@ -37,11 +38,6 @@ void dbus_set_g_error (GError **gerror, GType dbus_connection_get_g_type (void) G_GNUC_CONST; GType dbus_message_get_g_type (void) G_GNUC_CONST; -void dbus_connection_setup_with_g_main (DBusConnection *connection, - GMainContext *context); -void dbus_server_setup_with_g_main (DBusServer *server, - GMainContext *context); - void dbus_g_proxy_send (DBusGProxy *proxy, DBusMessage *message, dbus_uint32_t *client_serial); diff --git a/dbus/dbus-gmain.h b/dbus/dbus-gmain.h new file mode 100644 index 0000000..111772e --- /dev/null +++ b/dbus/dbus-gmain.h @@ -0,0 +1,43 @@ +/* -*- mode: C; c-file-style: "gnu" -*- */ +/* dbus-gmain.h — GLib main loop integration for libdbus + * + * Copyright (C) 2002, 2003 CodeFactory AB + * Copyright (C) 2003, 2004 Red Hat, Inc. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ +#ifndef DBUS_GMAIN_H +#define DBUS_GMAIN_H + +#include <dbus/dbus.h> +#include <glib.h> + +G_BEGIN_DECLS + +void dbus_connection_setup_with_g_main (DBusConnection *connection, + GMainContext *context); +void dbus_server_setup_with_g_main (DBusServer *server, + GMainContext *context); + +G_END_DECLS + +#endif /* DBUS_GLIB_LOWLEVEL_H */ + + + + |