]> git.sur5r.net Git - i3/i3/log
i3/i3
9 years agotests: don’t print interactive status when running on travis
Michael Stapelberg [Sat, 14 Mar 2015 11:33:54 +0000 (12:33 +0100)]
tests: don’t print interactive status when running on travis

(or without a tty)

9 years agotravis: run tests serialized, install latest AnyEvent::I3
Michael Stapelberg [Fri, 13 Mar 2015 22:38:56 +0000 (23:38 +0100)]
travis: run tests serialized, install latest AnyEvent::I3

9 years agotravis: install as many perl pkgs as possible via apt instead of cpanm
Michael Stapelberg [Fri, 13 Mar 2015 22:38:33 +0000 (23:38 +0100)]
travis: install as many perl pkgs as possible via apt instead of cpanm

9 years agotravis: fix pinning setup (newlines and YAML are complicated)
Michael Stapelberg [Fri, 13 Mar 2015 22:38:13 +0000 (23:38 +0100)]
travis: fix pinning setup (newlines and YAML are complicated)

9 years agotravis: escape strings for YAML
Michael Stapelberg [Fri, 13 Mar 2015 20:04:03 +0000 (21:04 +0100)]
travis: escape strings for YAML

9 years agotravis: install more perl dependencies, pull in trusty packages
Michael Stapelberg [Fri, 13 Mar 2015 19:52:53 +0000 (20:52 +0100)]
travis: install more perl dependencies, pull in trusty packages

9 years agotravis: also cat cpanm build logs after failure
Michael Stapelberg [Fri, 13 Mar 2015 12:24:02 +0000 (13:24 +0100)]
travis: also cat cpanm build logs after failure

9 years agotravis: cpanm: set -v so that we get error messages in the travis output
Michael Stapelberg [Fri, 13 Mar 2015 10:39:59 +0000 (11:39 +0100)]
travis: cpanm: set -v so that we get error messages in the travis output

9 years agotravis: directly use cpanm -n to skip tests
Michael Stapelberg [Fri, 13 Mar 2015 09:21:02 +0000 (10:21 +0100)]
travis: directly use cpanm -n to skip tests

X11::XCB currently fails its tests

9 years agotravis runs on ubuntu 12.04, so use libinline-perl
Michael Stapelberg [Fri, 13 Mar 2015 09:12:00 +0000 (10:12 +0100)]
travis runs on ubuntu 12.04, so use libinline-perl

9 years agotravis: mk-build-deps needs equivs
Michael Stapelberg [Fri, 13 Mar 2015 09:09:21 +0000 (10:09 +0100)]
travis: mk-build-deps needs equivs

9 years agoadd configuration for travis-ci.com
Michael Stapelberg [Fri, 13 Mar 2015 09:06:57 +0000 (10:06 +0100)]
add configuration for travis-ci.com

9 years agoMerge pull request #1521 from Airblader/feature-use-refactored-function
Michael Stapelberg [Fri, 13 Mar 2015 07:54:52 +0000 (00:54 -0700)]
Merge pull request #1521 from Airblader/feature-use-refactored-function

Use the already existing function to get rid of some code duplication

9 years agoMerge pull request #1513 from Airblader/defect-1473
Michael Stapelberg [Fri, 13 Mar 2015 07:52:52 +0000 (00:52 -0700)]
Merge pull request #1513 from Airblader/defect-1473

Move workspace to assigned output when renaming it

9 years agoMerge pull request #1512 from mdtipton/unclutter_scroll
Michael Stapelberg [Fri, 13 Mar 2015 07:46:16 +0000 (00:46 -0700)]
Merge pull request #1512 from mdtipton/unclutter_scroll

Fix scrolling in window decoration with hidden cursor.

9 years agoMerge pull request #1546 from rosetree/next
Michael Stapelberg [Fri, 13 Mar 2015 07:36:29 +0000 (00:36 -0700)]
Merge pull request #1546 from rosetree/next

Fix comment box

9 years agoFix comment box 1546/head
Micha Rosenbaum [Thu, 12 Mar 2015 10:18:12 +0000 (11:18 +0100)]
Fix comment box

9 years agoMerge pull request #1545 from garbados/gendered-terms-in-docs
Michael Stapelberg [Thu, 12 Mar 2015 07:38:35 +0000 (00:38 -0700)]
Merge pull request #1545 from garbados/gendered-terms-in-docs

degendered terms

9 years agodegendered terms 1545/head
Diana Thayer [Thu, 12 Mar 2015 04:41:43 +0000 (21:41 -0700)]
degendered terms

9 years agoadd release.sh, a script to prepare a new i3 release
Michael Stapelberg [Sat, 7 Mar 2015 19:37:34 +0000 (20:37 +0100)]
add release.sh, a script to prepare a new i3 release

9 years agoupdate debian/changelog for the new release
Michael Stapelberg [Sat, 7 Mar 2015 19:31:38 +0000 (20:31 +0100)]
update debian/changelog for the new release

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 19:26:29 +0000 (20:26 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'release-4.9.1'
Michael Stapelberg [Sat, 7 Mar 2015 19:26:29 +0000 (20:26 +0100)]
Merge branch 'release-4.9.1'

9 years agorelease i3 4.9.1 4.9.1
Michael Stapelberg [Sat, 7 Mar 2015 19:26:09 +0000 (20:26 +0100)]
release i3 4.9.1

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 14:57:41 +0000 (15:57 +0100)]
Merge branch 'master' into next

Conflicts:
src/commands.c

9 years agoMerge branch 'fix-restore-errormsg'
Michael Stapelberg [Sat, 7 Mar 2015 14:57:13 +0000 (15:57 +0100)]
Merge branch 'fix-restore-errormsg'

9 years agoProperly error out when the layout file cannot be read.
Ingo Bürk [Wed, 4 Mar 2015 21:45:39 +0000 (22:45 +0100)]
Properly error out when the layout file cannot be read.
This will result in an actual error message for the user.
fixes #1499

9 years agoGlob filepath when calling append_layout
Ingo Bürk [Sat, 28 Feb 2015 23:13:37 +0000 (00:13 +0100)]
Glob filepath when calling append_layout
fixes #1500

9 years agoImprove error messages on failing commands
Ingo Bürk [Wed, 4 Mar 2015 13:01:42 +0000 (14:01 +0100)]
Improve error messages on failing commands

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 14:40:59 +0000 (15:40 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'dont-match-placeholders'
Michael Stapelberg [Sat, 7 Mar 2015 14:40:59 +0000 (15:40 +0100)]
Merge branch 'dont-match-placeholders'

9 years agoBugfix: insert id-based match at HEAD, not TAIL.
Michael Stapelberg [Sat, 7 Mar 2015 14:38:10 +0000 (15:38 +0100)]
Bugfix: insert id-based match at HEAD, not TAIL.

Before this commit, placeholder windows had any matches that were
defined in the JSON file, _followed_ by an i3-internal match that
ensures the placeholder X11 window gets swallowed into the placeholder
i3 container.

The problem was that the first successful match was deleted, and if
users specified a criterion (title=IPython) that matched the placeholder
window itself (name=IPython), then that match is deleted and the
i3-internal match is kept. This results in the actual window the user
wants to match not being swallowed, and the placeholder window not
displaying any criteria.

fixes #1526

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 13:52:39 +0000 (14:52 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'fix-mode-switch'
Michael Stapelberg [Sat, 7 Mar 2015 13:52:39 +0000 (14:52 +0100)]
Merge branch 'fix-mode-switch'

9 years agoFix bindings using Mode_switch
Michael Stapelberg [Sat, 7 Mar 2015 13:51:24 +0000 (14:51 +0100)]
Fix bindings using Mode_switch

fixes #1518

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 10:47:59 +0000 (11:47 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'revert-iconic'
Michael Stapelberg [Sat, 7 Mar 2015 10:47:59 +0000 (11:47 +0100)]
Merge branch 'revert-iconic'

9 years agoRevert "Handle WM_CHANGE_STATE requests for iconic state"
Michael Stapelberg [Sat, 7 Mar 2015 10:46:43 +0000 (11:46 +0100)]
Revert "Handle WM_CHANGE_STATE requests for iconic state"

This reverts commit 136b3e345bfde637d3270eafaa2d8aa3555cc3d5.

fixes #1516

9 years agoUse the already existing function to get rid of some code duplication 1521/head
Ingo Bürk [Thu, 5 Mar 2015 13:00:24 +0000 (14:00 +0100)]
Use the already existing function to get rid of some code duplication

9 years agoMerge pull request #1515 from Airblader/feature-commands-error-messages
Michael Stapelberg [Wed, 4 Mar 2015 18:20:21 +0000 (10:20 -0800)]
Merge pull request #1515 from Airblader/feature-commands-error-messages

Improve error messages on failing commands

9 years agoImprove error messages on failing commands 1515/head
Ingo Bürk [Wed, 4 Mar 2015 13:01:42 +0000 (14:01 +0100)]
Improve error messages on failing commands

9 years agoAdded tests for #1473 1513/head
Ingo Bürk [Wed, 4 Mar 2015 08:45:47 +0000 (09:45 +0100)]
Added tests for #1473

9 years agoRefactor functions for easy reuse
Ingo Bürk [Wed, 4 Mar 2015 08:22:25 +0000 (09:22 +0100)]
Refactor functions for easy reuse

9 years agoWhen renaming a workspace, look for assignments and move the renamed workspace to...
Ingo Bürk [Wed, 4 Mar 2015 08:06:44 +0000 (09:06 +0100)]
When renaming a workspace, look for assignments and move the renamed workspace to the appropriate output.

9 years agoFix keyboard layout change detection
Michael Stapelberg [Tue, 3 Mar 2015 08:46:16 +0000 (09:46 +0100)]
Fix keyboard layout change detection

…by listening to XKB_NEW_KEYBOARD events and re-allocating the keysym
map on both XKB_NEW_KEYBOARD and XKB_MAP_NOTIFY.

fixes #1302

9 years agoMerge branch 'fix-keyboard-layout'
Michael Stapelberg [Tue, 3 Mar 2015 08:46:39 +0000 (09:46 +0100)]
Merge branch 'fix-keyboard-layout'

9 years agoFix keyboard layout change detection
Michael Stapelberg [Tue, 3 Mar 2015 08:46:16 +0000 (09:46 +0100)]
Fix keyboard layout change detection

…by listening to XKB_NEW_KEYBOARD events and re-allocating the keysym
map on both XKB_NEW_KEYBOARD and XKB_MAP_NOTIFY.

fixes #1302

9 years agoFix scrolling in window decoration with hidden cursor. 1512/head
Michael Tipton [Tue, 3 Mar 2015 07:44:28 +0000 (23:44 -0800)]
Fix scrolling in window decoration with hidden cursor.

If the mouse cursor is hidden (by unclutter, for example), then scrolling
in the window decoration creates an event with a child
(i.e. event->child != XCB_NONE). This causes route_click() to be called
with dest=CLICK_INSIDE, which prevents scrolling through a stacked layout.

To fix this, check if a click is in the window decoration _before_
checking if the event has a child.

9 years agoMerge pull request #1503 from Airblader/defect-layout-globbing
Michael Stapelberg [Sun, 1 Mar 2015 16:25:09 +0000 (08:25 -0800)]
Merge pull request #1503 from Airblader/defect-layout-globbing

Glob filepath when calling append_layout

9 years agoMerge branch 'Airblader-defect-1480' into next
Michael Stapelberg [Sun, 1 Mar 2015 16:21:27 +0000 (17:21 +0100)]
Merge branch 'Airblader-defect-1480' into next

9 years agoclang-format
Michael Stapelberg [Sun, 1 Mar 2015 16:19:42 +0000 (17:19 +0100)]
clang-format

9 years agoMerge branch 'defect-1480' of https://github.com/Airblader/i3-original into Airblader...
Michael Stapelberg [Sun, 1 Mar 2015 16:19:22 +0000 (17:19 +0100)]
Merge branch 'defect-1480' of https://github.com/Airblader/i3-original into Airblader-defect-1480

9 years agorun clang-format (3.5.0)
Michael Stapelberg [Sun, 1 Mar 2015 16:16:03 +0000 (17:16 +0100)]
run clang-format (3.5.0)

Not quite sure why there are so many differences. Perhaps we’ve gotten
out of the habit of running clang-format after every change.

I guess it’d be best to have a travis hook that runs clang-format for us
and reports any problems on pull requests.

9 years agoGlob filepath when calling append_layout 1503/head
Ingo Bürk [Sat, 28 Feb 2015 23:13:37 +0000 (00:13 +0100)]
Glob filepath when calling append_layout
fixes #1500

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 1 Mar 2015 15:50:49 +0000 (16:50 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'ton-master'
Michael Stapelberg [Sun, 1 Mar 2015 15:50:45 +0000 (16:50 +0100)]
Merge branch 'ton-master'

9 years agoMerge branch 'master' of https://github.com/ton/i3 into ton-master
Michael Stapelberg [Sun, 1 Mar 2015 15:50:37 +0000 (16:50 +0100)]
Merge branch 'master' of https://github.com/ton/i3 into ton-master

9 years agoMerge pull request #1478 from acrisci/feature/use-default-monospace
Michael Stapelberg [Sun, 1 Mar 2015 15:33:19 +0000 (07:33 -0800)]
Merge pull request #1478 from acrisci/feature/use-default-monospace

Config: use default system monospace

9 years agoMerge branch 'stevenjm-big-endian'
Michael Stapelberg [Sun, 1 Mar 2015 15:30:28 +0000 (16:30 +0100)]
Merge branch 'stevenjm-big-endian'

9 years agoMerge branch 'big-endian' of https://github.com/stevenjm/i3 into stevenjm-big-endian
Michael Stapelberg [Sun, 1 Mar 2015 15:28:42 +0000 (16:28 +0100)]
Merge branch 'big-endian' of https://github.com/stevenjm/i3 into stevenjm-big-endian

9 years agoFix key bindings on big-endian platforms 1504/head
Steven McDonald [Sun, 1 Mar 2015 07:30:45 +0000 (18:30 +1100)]
Fix key bindings on big-endian platforms

input_code is a uint16_t, but xcb_keycode_t is uint8_t, meaning that
only the first byte of input_code is inspected by memmem. On
little-endian platforms, this code would have worked by accident, since
the first byte of input_code represents the 8 least significant bits.
However, on big-endian platforms the first byte is the 8 most
significant bits, which means memmem is scanning bind->translated_to
for the wrong keycode (probably 0).

In order to work correctly on big-endian and little-endian platforms,
simply typecast input_code to an xcb_keycode_t and pass that to memmem.

The observed behaviour associated with this bug is that key bindings
don't work at all. This patch has been tested on an iBook G4 running
OpenBSD -current, and key bindings work properly with this fix applied.

9 years agodebian: update changelog
Michael Stapelberg [Sat, 28 Feb 2015 14:03:53 +0000 (15:03 +0100)]
debian: update changelog

9 years agoMerge branch 'next'
Michael Stapelberg [Sat, 28 Feb 2015 14:02:31 +0000 (15:02 +0100)]
Merge branch 'next'

9 years agoMerge branch 'release-4.9' into next
Michael Stapelberg [Sat, 28 Feb 2015 14:02:21 +0000 (15:02 +0100)]
Merge branch 'release-4.9' into next

9 years agorelease i3 v4.9 4.9
Michael Stapelberg [Sat, 28 Feb 2015 13:36:22 +0000 (14:36 +0100)]
release i3 v4.9

9 years agoFix incorrect y-offset for text in i3bar 1495/head
Ton van den Heuvel [Thu, 26 Feb 2015 20:49:54 +0000 (21:49 +0100)]
Fix incorrect y-offset for text in i3bar

When using Pango to draw text in i3bar, the y-offset of the text is
incorrectly calculated in case all characters in the string to draw are
smaller than the cached font height. Fixes #1494.

9 years agoMerge pull request #1486 from acrisci/feature/docs-xvfb-tests
Michael Stapelberg [Sun, 22 Feb 2015 11:02:20 +0000 (03:02 -0800)]
Merge pull request #1486 from acrisci/feature/docs-xvfb-tests

Docs: add hint to use xvfb-run

9 years agoConfig: use default system monospace 1478/head
Tony Crisci [Sat, 21 Feb 2015 22:34:26 +0000 (17:34 -0500)]
Config: use default system monospace

Use the default monospace font for the system in the default config.
This should be a bit more portable for systems that do not have the
recommended font installed.

9 years agoDocs: add hint to use xvfb-run 1486/head
Tony Crisci [Sat, 21 Feb 2015 21:36:24 +0000 (16:36 -0500)]
Docs: add hint to use xvfb-run

Document that Xvfb can be used to run tests without an X server, and be
used to significantly speed up tests on machines with slow video cards.

9 years agoMerge pull request #1471 from acrisci/feature/i3bar-use-pango-markup
Michael Stapelberg [Sat, 21 Feb 2015 20:19:26 +0000 (12:19 -0800)]
Merge pull request #1471 from acrisci/feature/i3bar-use-pango-markup

i3bar: use Pango markup

9 years agofree block->instance when cleaning up statusline 1481/head
Ingo Bürk [Wed, 18 Feb 2015 19:29:11 +0000 (20:29 +0100)]
free block->instance when cleaning up statusline

9 years agoremoved forgotten declaration of unused variable
Ingo Bürk [Wed, 18 Feb 2015 19:23:26 +0000 (20:23 +0100)]
removed forgotten declaration of unused variable

9 years agoIntroduce a statusline buffer.
Ingo Bürk [Wed, 18 Feb 2015 19:11:42 +0000 (20:11 +0100)]
Introduce a statusline buffer.

A buffer is introduced for the statusline which will only be copied to the actual statusline
once an entire statusline is parsed. This avoids a race condition where incompletely parsed
statuslines were rendered, causing only some status blocks to be rendered which is visible to
the user as a flickering.

fixes #1480

9 years agoremove unused statusline_buffer
Ingo Bürk [Wed, 18 Feb 2015 19:01:32 +0000 (20:01 +0100)]
remove unused statusline_buffer

9 years agodebian: add changelog entry for 4.8-2
Michael Stapelberg [Sun, 15 Feb 2015 12:42:29 +0000 (13:42 +0100)]
debian: add changelog entry for 4.8-2

9 years agoi3bar: use Pango markup 1471/head
Tony Crisci [Thu, 12 Feb 2015 19:45:34 +0000 (14:45 -0500)]
i3bar: use Pango markup

Parse text within workspace buttons and the i3bar statusline as Pango
markup. This lets people specify things like font weight, text color,
background color, font size, and font family in the text of i3bar.

fixes #1468

9 years agoCONTRIBUTING: document people should use the `next` branch
Michael Stapelberg [Thu, 12 Feb 2015 07:59:33 +0000 (08:59 +0100)]
CONTRIBUTING: document people should use the `next` branch

9 years agoProperly invalidate rendering cache when updating orientation (Thanks hercek)
Michael Stapelberg [Wed, 11 Feb 2015 20:13:19 +0000 (21:13 +0100)]
Properly invalidate rendering cache when updating orientation (Thanks hercek)

fixes #1445

9 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 11 Feb 2015 20:08:00 +0000 (21:08 +0100)]
Merge branch 'master' into next

9 years agoMerge pull request #1465 from Airblader/bugfix-1430
Michael Stapelberg [Wed, 11 Feb 2015 19:45:12 +0000 (20:45 +0100)]
Merge pull request #1465 from Airblader/bugfix-1430

Make click events on status blocks work if 'workspace_buttons no' is set...

9 years agoMake click events on status blocks work if 'workspace_buttons no' is set. 1465/head
Ingo Bürk [Wed, 11 Feb 2015 19:34:43 +0000 (20:34 +0100)]
Make click events on status blocks work if 'workspace_buttons no' is set.

1. Always subscribe to click events for i3bar.
2. Exit the click event handler if no current workspace was found only after clicks on status blocks have been handled.

fixes #1430

9 years agoRemove one level of indentation #1465
Ingo Bürk [Wed, 11 Feb 2015 19:34:19 +0000 (20:34 +0100)]
Remove one level of indentation #1465

9 years agoMerge pull request #1462 from carrotIndustries/netwm_moveresize
Michael Stapelberg [Wed, 11 Feb 2015 19:30:05 +0000 (20:30 +0100)]
Merge pull request #1462 from carrotIndustries/netwm_moveresize

Support _NET_WM_MOVERESIZE

9 years agoMerge pull request #1460 from Airblader/bugfix-1458
Michael Stapelberg [Wed, 11 Feb 2015 19:18:53 +0000 (20:18 +0100)]
Merge pull request #1460 from Airblader/bugfix-1458

Correctly calculate clicks on i3bar status blocks

9 years agoMerge pull request #1451 from acrisci/feature/handle-button-release
Michael Stapelberg [Wed, 11 Feb 2015 19:13:00 +0000 (20:13 +0100)]
Merge pull request #1451 from acrisci/feature/handle-button-release

Handle button release events

9 years agoadd a CONTRIBUTING file
Michael Stapelberg [Wed, 11 Feb 2015 08:15:01 +0000 (09:15 +0100)]
add a CONTRIBUTING file

See https://github.com/blog/1184-contributing-guidelines

9 years agoMerge pull request #1453 from acrisci/feature/bar-update-font-reload
Michael Stapelberg [Wed, 11 Feb 2015 07:55:06 +0000 (07:55 +0000)]
Merge pull request #1453 from acrisci/feature/bar-update-font-reload

Update bar font config on reload

9 years agoSupport _NET_WM_MOVERESIZE 1462/head
Lukas K [Tue, 27 Jan 2015 21:58:48 +0000 (22:58 +0100)]
Support _NET_WM_MOVERESIZE

Add support for the _NET_WM_MOVERESIZE client message. This message
enables clients to initiate window moving or resizing. Toolkits like
Gtk3 use this message when the user drags a client-side decorated window
by its title bar. When Gtk detects that the window manager does not
support this client message, it uses a slow fallback implementation.

fixes #1432

9 years agoHandle button release events 1451/head
Tony Crisci [Tue, 10 Feb 2015 22:46:02 +0000 (17:46 -0500)]
Handle button release events

This enables the --release switch on mouse button bindings.

9 years agolibi3: free previous font on font load 1453/head
Tony Crisci [Tue, 10 Feb 2015 20:11:40 +0000 (15:11 -0500)]
libi3: free previous font on font load

When loading a new font with `load_font`, free the previously loaded
font with `free_font`.

If no font is loaded, `free_font` will simply return (instead of
crashing because of a double free).

9 years agoUpdate bar font config on reload
Tony Crisci [Tue, 10 Feb 2015 19:26:22 +0000 (14:26 -0500)]
Update bar font config on reload

Dynamically update the font when the `reload` command is called by
reloading the font with `xcb_init_late` and adjusting the size of the
bar by updating the output dimensions with a call to the ipc.

9 years agoCorrectly calculate clicks on i3bar status blocks 1460/head
Ingo Bürk [Mon, 9 Feb 2015 19:13:02 +0000 (20:13 +0100)]
Correctly calculate clicks on i3bar status blocks

fixes #1458

9 years agodocs/debugging: use logs.i3wm.org
Michael Stapelberg [Wed, 4 Feb 2015 18:54:07 +0000 (19:54 +0100)]
docs/debugging: use logs.i3wm.org

9 years agocking-howto: update links
Michael Stapelberg [Wed, 4 Feb 2015 18:52:40 +0000 (19:52 +0100)]
cking-howto: update links

9 years agoMerge branch 'placeholder'
Michael Stapelberg [Sat, 31 Jan 2015 21:56:08 +0000 (22:56 +0100)]
Merge branch 'placeholder'

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 31 Jan 2015 21:56:08 +0000 (22:56 +0100)]
Merge branch 'master' into next

9 years agoBugfix: actually parse client.placeholder (Thanks Ingo)
Michael Stapelberg [Sat, 31 Jan 2015 21:55:45 +0000 (22:55 +0100)]
Bugfix: actually parse client.placeholder (Thanks Ingo)

fixes #1400

9 years agoMerge branch 'fix-ws-con'
Michael Stapelberg [Sat, 31 Jan 2015 21:42:54 +0000 (22:42 +0100)]
Merge branch 'fix-ws-con'

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 31 Jan 2015 21:42:54 +0000 (22:42 +0100)]
Merge branch 'master' into next

9 years agoBugfix: correctly restore workspaces regardless of where “type” is (Thanks dsargrad)
Michael Stapelberg [Sat, 31 Jan 2015 21:40:55 +0000 (22:40 +0100)]
Bugfix: correctly restore workspaces regardless of where “type” is (Thanks dsargrad)

fixes #1395