Changeset f126c87 in mainline for uspace/app/barber/barber.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

• uspace/app/barber/barber.c (modified) (2 diffs)

uspace/app/barber/barber.c

@@ -308 +308 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1],
+        window_t *main_window = window_open(argv[1], NULL,
             WINDOW_MAIN | WINDOW_DECORATED, "barber");
         if (!main_window) {
@@ -315 +315 @@
         }
         
-        frame_canvas = create_canvas(window_root(main_window),
+        frame_canvas = create_canvas(window_root(main_window), NULL,
             FRAME_WIDTH, FRAME_HEIGHT, frames[frame]);