Changeset ff381a7 in mainline for uspace/lib/gui/window.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/gui/window.c (modified) (3 diffs)

uspace/lib/gui/window.c

@@ -623 +623 @@
         }
         
-        async_sess_t *reg_sess = loc_service_connect(EXCHANGE_SERIALIZE,
-            reg_dsid, 0);
+        async_sess_t *reg_sess =
+            loc_service_connect(reg_dsid, INTERFACE_COMPOSITOR, 0);
         if (reg_sess == NULL) {
                 free(win);
@@ -639 +639 @@
         }
         
-        win->osess = loc_service_connect(EXCHANGE_SERIALIZE, out_dsid, 0);
+        win->osess = loc_service_connect(out_dsid, INTERFACE_COMPOSITOR, 0);
         if (win->osess == NULL) {
                 free(win);
@@ -645 +645 @@
         }
         
-        win->isess = loc_service_connect(EXCHANGE_SERIALIZE, in_dsid, 0);
+        win->isess = loc_service_connect(in_dsid, INTERFACE_COMPOSITOR, 0);
         if (win->isess == NULL) {
                 async_hangup(win->osess);