Changeset 95c675b in mainline for uspace/lib/c/generic/clipboard.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

uspace/lib/c/generic/clipboard.c

@@ -38 +38 @@
  */
 
+#include <async.h>
 #include <clipboard.h>
-#include <ns.h>
+#include <errno.h>
+#include <fibril_synch.h>
+#include <ipc/clipboard.h>
 #include <ipc/services.h>
-#include <ipc/clipboard.h>
-#include <fibril_synch.h>
-#include <async.h>
+#include <loc.h>
+#include <malloc.h>
 #include <str.h>
-#include <errno.h>
-#include <malloc.h>
 
 static FIBRIL_MUTEX_INITIALIZE(clip_mutex);
@@ -58 +58 @@
 static async_exch_t *clip_exchange_begin(void)
 {
+        service_id_t sid;
+        int rc;
+        
         fibril_mutex_lock(&clip_mutex);
         
-        while (clip_sess == NULL)
-                clip_sess = service_connect_blocking(SERVICE_CLIPBOARD,
-                    INTERFACE_CLIPBOARD, 0);
+        while (clip_sess == NULL) {
+                rc = loc_service_get_id(SERVICE_NAME_CLIPBOARD, &sid,
+                    IPC_FLAG_BLOCKING);
+                if (rc != EOK)
+                        continue;
+                
+                clip_sess = loc_service_connect(sid, INTERFACE_CLIPBOARD,
+                    IPC_FLAG_BLOCKING);
+        }
         
         fibril_mutex_unlock(&clip_mutex);