summaryrefslogtreecommitdiff
path: root/stubs
diff options
context:
space:
mode:
authorErik De Rijcke <Erik.De.Rijcke@prodatamobility.com>2015-01-08 16:38:37 +0100
committerErik De Rijcke <Erik.De.Rijcke@prodatamobility.com>2015-01-08 16:38:37 +0100
commitb154891b46bd6991989aa21fbce4a3e6a8b8f216 (patch)
tree0fbccbaa28cac473e4c3a93d552adcbd735e4d6b /stubs
parent896dfbe00f8dba5d85750941cc526cc9fe243ce6 (diff)
correctly read and write to and from union
Diffstat (limited to 'stubs')
-rw-r--r--stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java1
-rw-r--r--stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java12
-rw-r--r--stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java6
3 files changed, 9 insertions, 10 deletions
diff --git a/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java b/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java
index b30fabc..3bedf6e 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java
@@ -176,7 +176,6 @@ public abstract class Proxy<I> implements WaylandObject {
final Class<T> newProxyCls,
final wl_argument argsPointer) {
try {
- argsPointer.write();
final wl_proxy
wlProxy =
WaylandClientLibrary.INSTANCE.wl_proxy_marshal_array_constructor(this.pointer,
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java b/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java
index 7546f57..7fb0e41 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java
@@ -111,15 +111,15 @@ public class InterfaceMeta implements HasNative<wl_interface> {
final Pointer m = new Memory(name.length() + 1);
m.setString(0,
name);
- interfacePointer.name = m;
+ interfacePointer.writeField("name",m);
//set version
- interfacePointer.version = version;
+ interfacePointer.writeField("version",version);
//set methods
- interfacePointer.methods = methodPointer[0];
- interfacePointer.method_count = methods.length;
+ interfacePointer.writeField("methods",methodPointer[0]);
+ interfacePointer.writeField("method_count",methods.length);
//set events
- interfacePointer.events = eventPointer[0];
- interfacePointer.event_count = events.length;
+ interfacePointer.writeField("events",eventPointer[0]);
+ interfacePointer.writeField("event_count",events.length);
return new InterfaceMeta(interfacePointer);
}
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java b/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java
index 7ec03d2..19303aa 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java
@@ -66,15 +66,15 @@ public class MessageMeta implements HasNative<wl_message> {
.length() + 1);
m.setString(0,
message.name());
- messagePointer.name = m;
+ messagePointer.writeField("name",m);
//set signature
final Pointer s = new Memory(message.signature()
.length() + 1);
s.setString(0,
message.signature());
- messagePointer.signature = s;
+ messagePointer.writeField("signature",s);
//set types
- messagePointer.types = typesPointerPointer;
+ messagePointer.writeField("types",typesPointerPointer);
new MessageMeta(messagePointer,
message);