Changeset 19f24fd in mainline for uspace/lib/libc/generic/clipboard.c

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/libc/generic/clipboard.c (modified) (2 diffs)

uspace/lib/libc/generic/clipboard.c

@@ -84 +84 @@
                 clip_connect();
                 
-                aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_BLOB, NULL);
+                aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, NULL);
                 ipcarg_t rc = async_data_write_start(clip_phone, (void *) str, size);
                 if (rc != EOK) {
@@ -139 +139 @@
                         *str = sbuf;
                         return EOK;
-                case CLIPBOARD_TAG_BLOB:
+                case CLIPBOARD_TAG_DATA:
                         sbuf = malloc(size + 1);
                         if (sbuf == NULL)