Changeset 5828554 in mainline for uspace/lib/gui/connection.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/connection.c (modified) (1 diff)

uspace/lib/gui/connection.c

@@ -210 +210 @@
                         link_initialize(&event->link);
                         event->type = ET_SIGNAL_EVENT;
-                        event->data.sig.object = (sysarg_t) cur->widget;
-                        event->data.sig.slot = (sysarg_t) cur->slot;
-                        event->data.sig.argument = (sysarg_t) data_copy;
+                        event->data.signal.object = (sysarg_t) cur->widget;
+                        event->data.signal.slot = (sysarg_t) cur->slot;
+                        event->data.signal.argument = (sysarg_t) data_copy;
                         prodcons_produce(&cur->widget->window->events, &event->link);
                 } else {