Changeset ff381a7 in mainline for uspace/lib/gui/terminal.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/terminal.c (modified) (2 diffs)

uspace/lib/gui/terminal.c

@@ -679 +679 @@
         
         list_foreach(terms, link, terminal_t, cur) {
-                if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
+                if (cur->dsid == (service_id_t) IPC_GET_ARG2(*icall)) {
                         term = cur;
                         break;
@@ -744 +744 @@
         term->top_row = 0;
         
-        async_set_client_connection(term_connection);
+        async_set_fallback_port_handler(term_connection, NULL);
         con_srvs_init(&term->srvs);
         term->srvs.ops = &con_ops;