diff options
author | marha <marha@users.sourceforge.net> | 2012-03-26 14:23:28 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-26 14:23:28 +0200 |
commit | 76bcc36ed305418a3ddc5752d287ede894243e1b (patch) | |
tree | bacb320c825768471ce56f058f17ce863d592376 /xorg-server/config/dbus.c | |
parent | 7d894e32566b710952c44cbc71939ad1d9e2fa8d (diff) | |
parent | 0f834b91a4768673833ab4917e87d86c237bb1a6 (diff) | |
download | vcxsrv-76bcc36ed305418a3ddc5752d287ede894243e1b.tar.gz vcxsrv-76bcc36ed305418a3ddc5752d287ede894243e1b.tar.bz2 vcxsrv-76bcc36ed305418a3ddc5752d287ede894243e1b.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/Xext/shm.c
xorg-server/Xext/syncsrv.h
xorg-server/Xext/xvmain.c
xorg-server/Xi/exevents.c
xorg-server/Xi/opendev.c
xorg-server/composite/compalloc.c
xorg-server/composite/compoverlay.c
xorg-server/dix/colormap.c
xorg-server/dix/devices.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/dix/eventconvert.c
xorg-server/dix/events.c
xorg-server/dix/gc.c
xorg-server/dix/getevents.c
xorg-server/dix/main.c
xorg-server/dix/privates.c
xorg-server/dix/registry.c
xorg-server/dix/resource.c
xorg-server/exa/exa_accel.c
xorg-server/exa/exa_migration_classic.c
xorg-server/exa/exa_unaccel.c
xorg-server/fb/fb.h
xorg-server/fb/fbcopy.c
xorg-server/fb/fbpixmap.c
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.h
xorg-server/glx/glapi_gentable.c
xorg-server/glx/glapitable.h
xorg-server/glx/glprocs.h
xorg-server/glx/glxcmds.c
xorg-server/glx/glxcmdsswap.c
xorg-server/glx/glxdricommon.c
xorg-server/glx/glxdriswrast.c
xorg-server/glx/glxext.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/glx/indirect_util.c
xorg-server/glx/rensize.c
xorg-server/glx/single2swap.c
xorg-server/glx/singlepix.c
xorg-server/glx/singlepixswap.c
xorg-server/glx/singlesize.c
xorg-server/hw/dmx/dmxinit.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/ephyr/hostx.c
xorg-server/hw/kdrive/ephyr/hostx.h
xorg-server/hw/kdrive/src/kinput.c
xorg-server/hw/xfree86/common/compiler.h
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/glx/glwrap.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.h
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winallpriv.c
xorg-server/hw/xwin/winauth.c
xorg-server/hw/xwin/winclipboard.h
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winclipboardxevents.c
xorg-server/hw/xwin/wincmap.c
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/wincreatewnd.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winerror.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/wingetsp.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winlayouts.h
xorg-server/hw/xwin/winmisc.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winmsg.h
xorg-server/hw/xwin/winmultiwindowclass.c
xorg-server/hw/xwin/winmultiwindowicons.c
xorg-server/hw/xwin/winmultiwindowshape.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winnativegdi.c
xorg-server/hw/xwin/winpfbdd.c
xorg-server/hw/xwin/winpixmap.c
xorg-server/hw/xwin/winpolyline.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winregistry.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
xorg-server/hw/xwin/winshadgdi.c
xorg-server/hw/xwin/wintrayicon.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/hw/xwin/winwindow.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/hw/xwin/winwndproc.c
xorg-server/include/callback.h
xorg-server/include/dixstruct.h
xorg-server/include/misc.h
xorg-server/include/os.h
xorg-server/include/scrnintstr.h
xorg-server/mi/micmap.c
xorg-server/mi/miinitext.c
xorg-server/mi/mioverlay.c
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/mi/miwindow.c
xorg-server/miext/damage/damage.c
xorg-server/miext/rootless/rootlessGC.c
xorg-server/miext/rootless/rootlessWindow.c
xorg-server/os/WaitFor.c
xorg-server/os/access.c
xorg-server/os/connection.c
xorg-server/os/io.c
xorg-server/os/log.c
xorg-server/os/osinit.c
xorg-server/os/utils.c
xorg-server/os/xdmcp.c
xorg-server/os/xprintf.c
xorg-server/os/xstrans.c
xorg-server/render/mipict.c
xorg-server/xkb/xkbActions.c
xorg-server/xkb/xkbInit.c
xorg-server/xkeyboard-config/compat/default.in
Diffstat (limited to 'xorg-server/config/dbus.c')
-rw-r--r-- | xorg-server/config/dbus.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c index f0fc5686e..99a1537e1 100644 --- a/xorg-server/config/dbus.c +++ b/xorg-server/config/dbus.c @@ -33,7 +33,7 @@ #include <X11/X.h> #include "config-backends.h" -#include "opaque.h" /* for 'display': there should be a better way. */ +#include "opaque.h" /* for 'display': there should be a better way. */ #include "input.h" #include "inputstr.h" @@ -65,7 +65,7 @@ reset_info(struct connection_info *info) } static int -add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) +add_device(DBusMessage * message, DBusMessage * reply, DBusError * error) { DBusMessageIter iter, reply_iter, subiter; InputOption *input_options = NULL; @@ -89,6 +89,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) /* signature should be [ss][ss]... */ while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_ARRAY) { char *key, *value; + dbus_message_iter_recurse(&iter, &subiter); if (dbus_message_iter_get_arg_type(&subiter) != DBUS_TYPE_STRING) @@ -145,7 +146,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) } } -unwind: + unwind: if (ret != Success) { if (dev) RemoveDevice(dev, TRUE); @@ -160,7 +161,7 @@ unwind: } static int -remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error) +remove_device(DBusMessage * message, DBusMessage * reply, DBusError * error) { int deviceid, ret, err; DeviceIntPtr dev; @@ -196,7 +197,7 @@ remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error) ret = Success; -unwind: + unwind: err = (ret == Success) ? ret : -ret; dbus_message_iter_append_basic(&reply_iter, DBUS_TYPE_INT32, &err); @@ -204,7 +205,7 @@ unwind: } static int -list_devices(DBusMessage *message, DBusMessage *reply, DBusError *error) +list_devices(DBusMessage * message, DBusMessage * reply, DBusError * error) { DeviceIntPtr dev; DBusMessageIter iter, subiter; @@ -237,7 +238,7 @@ list_devices(DBusMessage *message, DBusMessage *reply, DBusError *error) } static int -get_version(DBusMessage *message, DBusMessage *reply, DBusError *error) +get_version(DBusMessage * message, DBusMessage * reply, DBusError * error) { DBusMessageIter iter; unsigned int version = API_VERSION; @@ -252,7 +253,7 @@ get_version(DBusMessage *message, DBusMessage *reply, DBusError *error) } static DBusHandlerResult -message_handler(DBusConnection *connection, DBusMessage *message, void *data) +message_handler(DBusConnection * connection, DBusMessage * message, void *data) { DBusError error; DBusMessage *reply; @@ -301,19 +302,19 @@ message_handler(DBusConnection *connection, DBusMessage *message, void *data) ret = DBUS_HANDLER_RESULT_HANDLED; -err_reply: + err_reply: dbus_message_unref(reply); -err_start: + err_start: dbus_error_free(&error); return ret; } static void -connect_hook(DBusConnection *connection, void *data) +connect_hook(DBusConnection * connection, void *data) { DBusError error; - DBusObjectPathVTable vtable = { .message_function = message_handler, }; + DBusObjectPathVTable vtable = {.message_function = message_handler, }; struct connection_info *info = data; info->connection = connection; @@ -336,8 +337,7 @@ connect_hook(DBusConnection *connection, void *data) } if (!dbus_connection_register_object_path(info->connection, - info->busobject, &vtable, - info)) { + info->busobject, &vtable, info)) { ErrorF("[config/dbus] couldn't register object path\n"); goto err_match; } @@ -348,11 +348,11 @@ connect_hook(DBusConnection *connection, void *data) return; -err_match: + err_match: dbus_bus_remove_match(info->connection, MATCH_RULE, &error); -err_name: + err_name: dbus_bus_release_name(info->connection, info->busname, &error); -err_start: + err_start: dbus_error_free(&error); reset_info(info); @@ -372,8 +372,7 @@ pre_disconnect_hook(void) dbus_error_init(&error); dbus_connection_unregister_object_path(connection_data->connection, connection_data->busobject); - dbus_bus_remove_match(connection_data->connection, MATCH_RULE, - &error); + dbus_bus_remove_match(connection_data->connection, MATCH_RULE, &error); dbus_bus_release_name(connection_data->connection, connection_data->busname, &error); dbus_error_free(&error); @@ -381,6 +380,7 @@ pre_disconnect_hook(void) #endif static struct connection_info connection_data; + static struct config_dbus_core_hook core_hook = { .connect = connect_hook, .disconnect = disconnect_hook, |