hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-02 03:15:52 +00:00
Code Issues Projects Releases Wiki Activity

dbus-core: Make dbus-core no longer mutually exclusive with udev

Browse source 
With systemd-logind the dbus-core will be used for more then just config, so
it should be possible to build it even when using a non dbus dependent config
backend.

This patch also removes the config_ prefix from the dbus-core symbols.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Hans de Goede 2013-12-04 11:10:06 +01:00 • committed by Keith Packard
commit 480590b90c
10 changed files with 101 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

56
include/dbus-core.h Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright © 2013 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
* Author: Hans de Goede <hdegoede@redhat.com>
*/
#ifndef DBUS_CORE_H
#define DBUS_CORE_H
#ifdef NEED_DBUS
typedef struct DBusConnection DBusConnection;
typedef void (*dbus_core_connect_hook) (DBusConnection * connection,
void *data);
typedef void (*dbus_core_disconnect_hook) (void *data);
struct dbus_core_hook {
dbus_core_connect_hook connect;
dbus_core_disconnect_hook disconnect;
void *data;
struct dbus_core_hook *next;
};
int dbus_core_init(void);
void dbus_core_fini(void);
int dbus_core_add_hook(struct dbus_core_hook *hook);
void dbus_core_remove_hook(struct dbus_core_hook *hook);
#else
#define dbus_core_init()
#define dbus_core_fini()
#endif
#endif