xorg-x11-server/xorg-server-xf4vnc-fixes_1_8.diff
Stefan Dirsch 7e6a980b1f Accepting request 35298 from home:oertel:branches:openSUSE:Factory
Copy from home:oertel:branches:openSUSE:Factory/xorg-x11-server via accept of submit request 35298 revision 8.
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/35298
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=229
2010-03-20 02:42:15 +00:00

44 lines
1.1 KiB
Diff

--- hw/vnc/vncext.c
+++ hw/vnc/vncext.c
@@ -140,7 +140,7 @@
if (rec) {
rec->client = client;
rec->fakeID = FakeClientID(client->index);
- rec->res = CreateNewResourceType(VncDestroyClientResourceCallback);
+ rec->res = CreateNewResourceType(VncDestroyClientResourceCallback,"DestroyClientResourceCallback");
if (!AddResource(rec->fakeID, rec->res, rec)) {
xfree(rec);
}
@@ -689,7 +689,7 @@
VncResourceGeneration = serverGeneration;
- if (!(VncNotifyList = CreateNewResourceType(VncDestroyNotifyList))) {
+ if (!(VncNotifyList = CreateNewResourceType(VncDestroyNotifyList,"DestroyNotifyList"))) {
ErrorF("CreateResourceTypes: failed to allocate vnc notify list resource.\n");
return FALSE;
}
--- hw/vnc/init.c
+++ hw/vnc/init.c
@@ -984,6 +984,11 @@
}
void
+CloseInput()
+{
+}
+
+void
OsVendorInit()
{
}
@@ -1047,7 +1052,7 @@
}
int
-NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs, DeviceIntPtr *pdev)
{
return BadValue;
}