]> git.sur5r.net Git - i3/i3/log
i3/i3
11 years agogenerate-command-parser: make input/output configurable
Michael Stapelberg [Sun, 7 Oct 2012 14:30:34 +0000 (16:30 +0200)]
generate-command-parser: make input/output configurable

11 years agoi3-msg.man: fix reference to the "reply section" (Thanks slowpoke)
Michael Stapelberg [Sat, 6 Oct 2012 20:27:57 +0000 (22:27 +0200)]
i3-msg.man: fix reference to the "reply section" (Thanks slowpoke)

11 years agoallow floating cons to be reached using 'focus parent'
Michael Stapelberg [Thu, 4 Oct 2012 16:50:33 +0000 (18:50 +0200)]
allow floating cons to be reached using 'focus parent'

I suppose this was just an oversight. Let’s see if it causes any issues.

fixes #831

11 years agoImprove startup sequence termination conditions
Deiz [Thu, 4 Oct 2012 01:06:04 +0000 (21:06 -0400)]
Improve startup sequence termination conditions

If a window with _NET_STARTUP_ID set is moved to another workspace, it
will delete any associated startup sequence immediately. This will also
occur if a window has a leader with _NET_STARTUP_ID set, if the leader
has no container (never been mapped).

A startup sequence may also be deleted if it's matched by
startup_workspace_for_window() and its 30-second timeout has elapsed.

11 years agoReplace the discrete 'split' Con property with a simple function.
Deiz [Wed, 3 Oct 2012 17:10:48 +0000 (13:10 -0400)]
Replace the discrete 'split' Con property with a simple function.

11 years agoUn-fullscreen as needed when moving fullscreen containers
Deiz [Thu, 4 Oct 2012 08:22:41 +0000 (04:22 -0400)]
Un-fullscreen as needed when moving fullscreen containers

This avoids a case where a fullscreen container could be moved onto a
workspace that already had its own fullscreen container, leading to
two fullscreen containers on top of each other.

11 years agoshmlog: Remove O_TRUNC flag for shm_open, we truncate ourselves
Michael Stapelberg [Thu, 4 Oct 2012 15:05:08 +0000 (17:05 +0200)]
shmlog: Remove O_TRUNC flag for shm_open, we truncate ourselves

11 years agorelease-notes: s/mod+l/mod+e/ (Thanks hax404)
Michael Stapelberg [Thu, 4 Oct 2012 15:04:37 +0000 (17:04 +0200)]
release-notes: s/mod+l/mod+e/ (Thanks hax404)

11 years agodocs/ipc: add a warning to use an existing library (Thanks slowpoke)
Michael Stapelberg [Wed, 3 Oct 2012 21:59:33 +0000 (23:59 +0200)]
docs/ipc: add a warning to use an existing library (Thanks slowpoke)

11 years agodocs/ipc: remove unnecessary newline (Thanks Merovius)
Michael Stapelberg [Wed, 3 Oct 2012 21:54:35 +0000 (23:54 +0200)]
docs/ipc: remove unnecessary newline (Thanks Merovius)

11 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 3 Oct 2012 13:08:31 +0000 (15:08 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-ws-layout'
Michael Stapelberg [Wed, 3 Oct 2012 13:08:31 +0000 (15:08 +0200)]
Merge branch 'fix-ws-layout'

11 years agoset workspace_layout in create_workspace_on_output
Sascha Kruse [Wed, 3 Oct 2012 01:52:57 +0000 (03:52 +0200)]
set workspace_layout in create_workspace_on_output

fixes #835

11 years agoFocus the relevant workspace when clicking any container.
Deiz [Sun, 30 Sep 2012 09:26:38 +0000 (05:26 -0400)]
Focus the relevant workspace when clicking any container.

11 years agoMaintain relative positioning when moving floating windows between outputs.
Deiz [Sun, 30 Sep 2012 04:30:03 +0000 (00:30 -0400)]
Maintain relative positioning when moving floating windows between outputs.

11 years agotestsuite: add 'new-test' helper script
Michael Stapelberg [Tue, 2 Oct 2012 22:13:30 +0000 (00:13 +0200)]
testsuite: add 'new-test' helper script

11 years agoadd test for previous commit
Michael Stapelberg [Tue, 2 Oct 2012 22:04:05 +0000 (00:04 +0200)]
add test for previous commit

11 years agoOnly re-focus the workspace when moving a con if the target ws is hidden.
Deiz [Mon, 1 Oct 2012 02:44:19 +0000 (22:44 -0400)]
Only re-focus the workspace when moving a con if the target ws is hidden.

11 years agoImplement moving workspaces as if they're regular containers
Deiz [Fri, 28 Sep 2012 17:54:24 +0000 (13:54 -0400)]
Implement moving workspaces as if they're regular containers

11 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 28 Sep 2012 22:03:42 +0000 (00:03 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-floating-move'
Michael Stapelberg [Fri, 28 Sep 2012 22:03:25 +0000 (00:03 +0200)]
Merge branch 'fix-floating-move'

11 years agoBugfix: Correctly move floating windows to invisible workspaces cross-output (Thanks...
Michael Stapelberg [Fri, 28 Sep 2012 22:02:41 +0000 (00:02 +0200)]
Bugfix: Correctly move floating windows to invisible workspaces cross-output (Thanks swh)

11 years agoBugfix: with one ws per output, don’t crash on cross-output moves (Thanks moju)
Michael Stapelberg [Fri, 28 Sep 2012 21:04:37 +0000 (23:04 +0200)]
Bugfix: with one ws per output, don’t crash on cross-output moves (Thanks moju)

fixes #827

11 years agoMake the resize command honor criteria (Thanks Tblue)
Michael Stapelberg [Fri, 28 Sep 2012 18:36:25 +0000 (20:36 +0200)]
Make the resize command honor criteria (Thanks Tblue)

fixes #816

11 years agoMerge branch 'fix-indicator-pos'
Michael Stapelberg [Fri, 28 Sep 2012 17:47:16 +0000 (19:47 +0200)]
Merge branch 'fix-indicator-pos'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 28 Sep 2012 17:47:16 +0000 (19:47 +0200)]
Merge branch 'master' into next

11 years agoBugfix: Draw h-split indicator at the right position
Michael Stapelberg [Fri, 28 Sep 2012 17:46:50 +0000 (19:46 +0200)]
Bugfix: Draw h-split indicator at the right position

fixes #817

11 years agoFix 'border toggle' (it "skipped" 1px border) (Thanks joepd)
Michael Stapelberg [Fri, 28 Sep 2012 17:29:14 +0000 (19:29 +0200)]
Fix 'border toggle' (it "skipped" 1px border) (Thanks joepd)

fixes #818

11 years agoMerge branch 'fix-floating-move'
Michael Stapelberg [Fri, 28 Sep 2012 16:24:04 +0000 (18:24 +0200)]
Merge branch 'fix-floating-move'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 28 Sep 2012 16:24:04 +0000 (18:24 +0200)]
Merge branch 'master' into next

11 years agoBugfix: don’t crash when dragged floating window closes (Thanks darkraven)
Michael Stapelberg [Fri, 28 Sep 2012 16:23:01 +0000 (18:23 +0200)]
Bugfix: don’t crash when dragged floating window closes (Thanks darkraven)

Previously, while the loop would not be executed anymore, the callback
(for actually repositioning the window after a MotionNotify) would still
get called once. This commit avoids that, thus fixing the crash.

fixes #819

11 years agouserguide: document how to "un-scratchpad" a window (Thanks knopwob)
Michael Stapelberg [Fri, 28 Sep 2012 16:03:36 +0000 (18:03 +0200)]
userguide: document how to "un-scratchpad" a window (Thanks knopwob)

11 years agofix crash: send non-floating window with floating parent to scratchpad (thanks pkordy)
Simon Elsbrock [Thu, 27 Sep 2012 22:38:02 +0000 (00:38 +0200)]
fix crash: send non-floating window with floating parent to scratchpad (thanks pkordy)

Fix a crash that occured when moving a window to the scratchpad that is
seemingly floating to the user, but actually a descendant of a floating
parent con (and itself non-floating). If that is the case, move the
floating parent container to scratchpad instead of the window.

fixes #740

11 years agoRevert "raise floating windows when focusing (Thanks Marcos)"
Michael Stapelberg [Fri, 28 Sep 2012 15:57:17 +0000 (17:57 +0200)]
Revert "raise floating windows when focusing (Thanks Marcos)"

This commit breaks floating window keyboard focus order
(t/135-floating-focus.t) when you have > 2 floating windows. Since
keyboard focus is more important than saving one click to raise floating
windows, I revert the commit.

Note that we cannot implement this without keeping a third list (beneath
floating_windows and focus) for the z coordinate of a floating window.
This seems not worth it.

This reverts commit 064be457e59603e1d4a4b45b4bf138dcc231a849.

11 years agoraise floating windows when focusing (Thanks Marcos)
Michael Stapelberg [Thu, 27 Sep 2012 10:41:38 +0000 (12:41 +0200)]
raise floating windows when focusing (Thanks Marcos)

11 years agoadd testcase for commit 87525ad
Michael Stapelberg [Thu, 27 Sep 2012 10:37:38 +0000 (12:37 +0200)]
add testcase for commit 87525ad

11 years agoremove async-unsafe functions from signal handler
Michael Stapelberg [Thu, 27 Sep 2012 10:37:27 +0000 (12:37 +0200)]
remove async-unsafe functions from signal handler

11 years agoRevert "Use ev_signal to avoid async-unsafe functions (Thanks Markus)"
Michael Stapelberg [Thu, 27 Sep 2012 10:34:09 +0000 (12:34 +0200)]
Revert "Use ev_signal to avoid async-unsafe functions (Thanks Markus)"

This makes our signal handler useless and leads to infinite SIGSEGV
loops because the ev callback handler gets called only from within the
event loop, and control doesn’t necessary get to the event loop…

This reverts commit 514265b529ac78b7778eeee2db3dddb6f3a1c24c.

11 years agofix crash: urgent floating con on separate workspace (thanks Piotr)
Simon Elsbrock [Thu, 27 Sep 2012 06:35:09 +0000 (08:35 +0200)]
fix crash: urgent floating con on separate workspace (thanks Piotr)

If there is a single floating con on a separate workspace that is not
focused, and this con becomes urgent, switching back to that workspace
may result in a crash of i3. This is because while setting the urgency
of parent containers, 'parent' may become NULL in case of floating
containers. This commit checks the validity of parent.

fixes #821

11 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 27 Sep 2012 10:10:14 +0000 (12:10 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-manage-unmap'
Michael Stapelberg [Thu, 27 Sep 2012 10:10:08 +0000 (12:10 +0200)]
Merge branch 'fix-manage-unmap'

11 years agoBugfix: properly react to windows being unmapped before we can reparent (Thanks xeen...
Michael Stapelberg [Thu, 27 Sep 2012 10:09:06 +0000 (12:09 +0200)]
Bugfix: properly react to windows being unmapped before we can reparent (Thanks xeen, darkraven)

We need to verify that setting the event mask works, and we need to
include StructureNotify to get unmap events at any point in time.
Thanks darkraven for the pointer.

fixes #718

11 years agoBugfix: Correctly clear the urgency hint when the window is underneath a split-con...
Michael Stapelberg [Tue, 25 Sep 2012 13:40:08 +0000 (15:40 +0200)]
Bugfix: Correctly clear the urgency hint when the window is underneath a split-con (+test)

Previously, when you had an urgent container in a stack on some
invisible workspace (say urxvt) and you switched to it, the urgency hint
was not properly cleared.

11 years agoMerge branch 'fix-assign-render'
Michael Stapelberg [Mon, 24 Sep 2012 21:59:30 +0000 (23:59 +0200)]
Merge branch 'fix-assign-render'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 24 Sep 2012 21:59:30 +0000 (23:59 +0200)]
Merge branch 'master' into next

11 years agoBugfix: Render workspaces created by assignments to use correct coordinates (Thanks...
Michael Stapelberg [Mon, 24 Sep 2012 21:57:58 +0000 (23:57 +0200)]
Bugfix: Render workspaces created by assignments to use correct coordinates (Thanks meaneye)

Previously, i3 would send width=0, height=0 to windows which were put on
workspaces created by an assignment (that is, invisible workspaces,
which do not get rendered normally).

fixes #653

11 years agorendering: fix bottom line of tabbed borders decoration not continuous
noxxun [Sat, 22 Sep 2012 15:59:33 +0000 (17:59 +0200)]
rendering: fix bottom line of tabbed borders decoration not continuous

fixes #814

Signed-off-by: noxxun <noxxun@gmail.com>
11 years agoImplement variable border widths for pixel/normal
Yaroslav Molochko [Sun, 23 Sep 2012 23:14:00 +0000 (02:14 +0300)]
Implement variable border widths for pixel/normal

fixes #325

11 years agoDisplay appropriate cursors when resizing or moving floating windows.
Deiz [Sun, 23 Sep 2012 19:43:43 +0000 (15:43 -0400)]
Display appropriate cursors when resizing or moving floating windows.

11 years agoClicking the root window should try to focus the relevant workspace.
Deiz [Sun, 23 Sep 2012 14:35:52 +0000 (10:35 -0400)]
Clicking the root window should try to focus the relevant workspace.

11 years agoReplace duplicate "__" workspace prefix checks with a single function.
Deiz [Sun, 23 Sep 2012 12:56:56 +0000 (08:56 -0400)]
Replace duplicate "__" workspace prefix checks with a single function.

11 years agodraw empty title if WM_NAME is empty
Sascha Kruse [Sun, 23 Sep 2012 04:09:34 +0000 (06:09 +0200)]
draw empty title if WM_NAME is empty

fixes #811

11 years agoadd descriptive titles to split containers
Sascha Kruse [Sun, 9 Sep 2012 04:37:51 +0000 (06:37 +0200)]
add descriptive titles to split containers

11 years agotestcase for propagating urgency
Sascha Kruse [Sun, 9 Sep 2012 16:08:55 +0000 (18:08 +0200)]
testcase for propagating urgency

11 years agomark parents of urgent container also as urgent
Sascha Kruse [Mon, 3 Sep 2012 14:05:44 +0000 (16:05 +0200)]
mark parents of urgent container also as urgent

11 years agoUserguide: Added link from 7.2 to 6.6
Pauli Ervi [Sat, 22 Sep 2012 16:19:53 +0000 (19:19 +0300)]
Userguide: Added link from 7.2 to 6.6

The multiple monitors section (7) is probably the most
likely place for someone to go look for how to move
workspaces between monitors (6.6).

11 years agoClose empty workspaces after cross-output move (+test) (Thanks chrysn)
Michael Stapelberg [Sat, 22 Sep 2012 17:03:19 +0000 (19:03 +0200)]
Close empty workspaces after cross-output move (+test) (Thanks chrysn)

fixes #795

11 years agoremove unnecessary code in render_con().
darkraven [Thu, 6 Sep 2012 15:27:23 +0000 (23:27 +0800)]
remove unnecessary code in render_con().

The removed code was add by commit 61b8a62 to fix #564. That bug is cause
by rendering the mplayer window again as a floating window (even if it
has been rendered before as a fullscreen window, at line 202). So simply
checking for fullscreen window is enough to solve this problem. Treating
floating/tiling fullscreen window differently is not needed.

11 years agoIn get_output_next(), avoid an off-by-one for adjacent outputs and || mutually-exclus...
Deiz [Sat, 22 Sep 2012 16:05:22 +0000 (12:05 -0400)]
In get_output_next(), avoid an off-by-one for adjacent outputs and || mutually-exclusive failure conditions.

11 years agot/506-focus-right: also verify that focus up/down is a no-op (Thanks swh)
Michael Stapelberg [Sat, 22 Sep 2012 15:30:44 +0000 (17:30 +0200)]
t/506-focus-right: also verify that focus up/down is a no-op (Thanks swh)

11 years agoMake get_output_next() work with non-aligned RandR setups (+test) (Thanks Feh, swh...
Michael Stapelberg [Sat, 22 Sep 2012 14:49:37 +0000 (16:49 +0200)]
Make get_output_next() work with non-aligned RandR setups (+test) (Thanks Feh, swh, Moritz)

A good visualization of the new algorithm is this:

           +--------+
           |        |
+--------+=|   S1   |========================
|        | |        |
|   S0   | +--------+
|        |         +--------+
+--------+=========|        |================
                   |   S2   | +--------+
                   |        | |        |
                   +--------+ |   S3   |
                              |        |
                              +--------+

When focus is on S0, 'focus output right' will first match S1 (the
closest output which overlaps in the highlighted area), then S2, but not
S3 (since S3 does not overlap into the highlighted area).

fixes #669
fixes #771

11 years agoi3bar: Honor "urgent" protocol hint by unhiding
Quentin Glidic [Tue, 21 Aug 2012 11:52:15 +0000 (13:52 +0200)]
i3bar: Honor "urgent" protocol hint by unhiding

11 years agoi3bar: Allow to force unhide with draw_bars
Quentin Glidic [Tue, 21 Aug 2012 11:51:40 +0000 (13:51 +0200)]
i3bar: Allow to force unhide with draw_bars

11 years agoi3bar: Allow child to specify signals to use
Quentin Glidic [Mon, 20 Aug 2012 20:20:37 +0000 (22:20 +0200)]
i3bar: Allow child to specify signals to use

We now wait for the child process to send the first line before stopping
it to use the signal which might be specified in the i3bar protocol
header
Since clients might use the same signal for both stop and cont, we also
save the stopped state of the child to avoid stopping it while hidden!

11 years agoi3bar: Fully parse the JSON header
Quentin Glidic [Mon, 3 Sep 2012 08:43:29 +0000 (10:43 +0200)]
i3bar: Fully parse the JSON header

11 years agoi3bar: Introduce i3bar_child struct
Quentin Glidic [Mon, 3 Sep 2012 08:23:25 +0000 (10:23 +0200)]
i3bar: Introduce i3bar_child struct

11 years agoi3bar: Handle the first line with another callback
Quentin Glidic [Mon, 3 Sep 2012 08:11:01 +0000 (10:11 +0200)]
i3bar: Handle the first line with another callback

11 years agoi3bar: Split JSON line logic to read_json_input
Quentin Glidic [Mon, 3 Sep 2012 07:52:17 +0000 (09:52 +0200)]
i3bar: Split JSON line logic to read_json_input

11 years agoi3bar: Split flat line logic to read_flat_input
Quentin Glidic [Mon, 3 Sep 2012 07:52:17 +0000 (09:52 +0200)]
i3bar: Split flat line logic to read_flat_input

11 years agoi3bar: Split stdin reading logic to get_buffer
Quentin Glidic [Mon, 3 Sep 2012 07:45:59 +0000 (09:45 +0200)]
i3bar: Split stdin reading logic to get_buffer

11 years agoi3bar: Rename determine_json_version to parse_json_header
Quentin Glidic [Wed, 22 Aug 2012 15:02:02 +0000 (17:02 +0200)]
i3bar: Rename determine_json_version to parse_json_header

11 years agodocs/i3bar-protocol: Document stop/cont_signal
Quentin Glidic [Mon, 20 Aug 2012 18:43:06 +0000 (20:43 +0200)]
docs/i3bar-protocol: Document stop/cont_signal

11 years agoi3bar: Rework unhide/hide on workspace urgency
Quentin Glidic [Tue, 21 Aug 2012 11:49:48 +0000 (13:49 +0200)]
i3bar: Rework unhide/hide on workspace urgency

We now check globally for workspace urgency instead of per-output since
the result is the same but we call unhide_bars/hide_bars only once this
way

11 years agotests: Bugfix: use exit_gracefully() in t/200-urgency-timer
Michael Stapelberg [Sat, 22 Sep 2012 12:51:38 +0000 (14:51 +0200)]
tests: Bugfix: use exit_gracefully() in t/200-urgency-timer

11 years agoMake "[move] workspace number" accept a default ws name after the ws number
Sebastian Ullrich [Fri, 31 Aug 2012 18:19:27 +0000 (20:19 +0200)]
Make "[move] workspace number" accept a default ws name after the ws number

11 years agocfgparse: be forgiving about a missing "ms" after a duration
Michael Stapelberg [Sat, 22 Sep 2012 12:21:35 +0000 (14:21 +0200)]
cfgparse: be forgiving about a missing "ms" after a duration

While it’s certainly better and clearer to specify it, we should do the
right thing when the unit is missing, just like CSS for example
(margin: 0; is okay, margin: 0px; too).

11 years agotests: rename double t/198, add boilerplate
Michael Stapelberg [Sat, 22 Sep 2012 12:20:19 +0000 (14:20 +0200)]
tests: rename double t/198, add boilerplate

11 years agotests: fix t/113-urgent.t after previous commit
Michael Stapelberg [Sat, 22 Sep 2012 12:19:20 +0000 (14:19 +0200)]
tests: fix t/113-urgent.t after previous commit

11 years agoimplement delayed urgency hint reset
Simon Elsbrock [Sat, 22 Sep 2012 11:48:22 +0000 (13:48 +0200)]
implement delayed urgency hint reset

If there is a client with an urgency hint on another workspace and
switching to this workspace would cause the urgency to be reset (by
moving the focusing to the client), delay the reset by some time. This
gives the user the chance to see it.

This commit adds the possibility to configure the urgency delay timer
duration using the 'force_display_urgency_hint' directive. Also,
documentation and a testcase was added to allow for automated checks of
the intended behavior.

fixes #482

11 years agofixes #776
chrysn [Tue, 4 Sep 2012 08:51:18 +0000 (10:51 +0200)]
fixes #776

this implements both the "move container to workspace back_and_forth" command
and movements to the same workspace when auto_back_and_forth is set.

it includes documentation and test suite additions by michael.

it also simplifies the workspace_show_by_name function (making use of
workspace_get accepting NULL pointers).

11 years agodon’t use reserved identifiers for include guards (left-overs)
Michael Stapelberg [Sat, 22 Sep 2012 11:31:08 +0000 (13:31 +0200)]
don’t use reserved identifiers for include guards (left-overs)

fixes #804

11 years agotests: add testcase for the 'mode' IPC event
Michael Stapelberg [Sat, 22 Sep 2012 11:10:01 +0000 (13:10 +0200)]
tests: add testcase for the 'mode' IPC event

11 years agotests: add missing boilerplate
Michael Stapelberg [Sat, 22 Sep 2012 10:56:01 +0000 (12:56 +0200)]
tests: add missing boilerplate

11 years agoAdd new subscribe event 'mode' for binding mode changes
Pavel Löbl [Fri, 21 Sep 2012 22:21:39 +0000 (00:21 +0200)]
Add new subscribe event 'mode' for binding mode changes

Introducing a new event to subscribe called mode. It's fired up
when i3 changes binding mode (like switching from default to resize).
IPC guide adjusted also.

11 years agoadd proper error handling for in-place restarts (Thanks Markus)
Michael Stapelberg [Fri, 21 Sep 2012 14:47:43 +0000 (16:47 +0200)]
add proper error handling for in-place restarts (Thanks Markus)

fixes #806

11 years agoUse ev_signal to avoid async-unsafe functions (Thanks Markus)
Michael Stapelberg [Fri, 21 Sep 2012 14:35:25 +0000 (16:35 +0200)]
Use ev_signal to avoid async-unsafe functions (Thanks Markus)

Functions such as fprintf() might be unsafe to use in a signal handler,
see http://stackoverflow.com/questions/3941271/#answer-3941563

By using ev_signal, libev will use a tiny signal handler which just
passes on the information and then calls (outside of the signal handler)
our callback function which can use fprintf() and other unsafe
functions.

fixes #803

11 years agodon’t use reversed identifiers for include guards (Thanks Markus)
Michael Stapelberg [Fri, 21 Sep 2012 13:36:25 +0000 (15:36 +0200)]
don’t use reversed identifiers for include guards (Thanks Markus)

Done with:

    sed -in 's/\(ifndef\|define\) _\([0-9A-Z_]*\)$/\1 I3_\2/' include/**/*.h

fixes #804

11 years agocomplete-run.pl: Check for missing executables
Sascha Kruse [Tue, 18 Sep 2012 13:36:40 +0000 (15:36 +0200)]
complete-run.pl: Check for missing executables

11 years agoMerge branch 'desktop-file'
Michael Stapelberg [Thu, 20 Sep 2012 09:34:26 +0000 (11:34 +0200)]
Merge branch 'desktop-file'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 20 Sep 2012 09:34:26 +0000 (11:34 +0200)]
Merge branch 'master' into next

11 years agoFix xsession.desktop to comply to fdo standard
Kacper Kowalik (Xarthisius) [Wed, 19 Sep 2012 18:00:28 +0000 (20:00 +0200)]
Fix xsession.desktop to comply to fdo standard

For more information please see:
http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html

11 years agoMerge branch 'remove-ev'
Michael Stapelberg [Thu, 20 Sep 2012 09:20:00 +0000 (11:20 +0200)]
Merge branch 'remove-ev'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 20 Sep 2012 09:20:00 +0000 (11:20 +0200)]
Merge branch 'master' into next

11 years agoremove superfluous ev.h include statements
Oliver Kiddle [Thu, 20 Sep 2012 02:01:01 +0000 (04:01 +0200)]
remove superfluous ev.h include statements

11 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 20 Sep 2012 08:56:58 +0000 (10:56 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'tiny-fixes'
Michael Stapelberg [Thu, 20 Sep 2012 08:56:33 +0000 (10:56 +0200)]
Merge branch 'tiny-fixes'

11 years agoclean old and new libi3 (Thanks SardemFF7)
Michael Stapelberg [Thu, 20 Sep 2012 08:55:26 +0000 (10:55 +0200)]
clean old and new libi3 (Thanks SardemFF7)

11 years agospelling fix: s/succesfully/successfully/
Michael Stapelberg [Thu, 20 Sep 2012 08:55:03 +0000 (10:55 +0200)]
spelling fix: s/succesfully/successfully/

11 years agoupdate debian packaging
Michael Stapelberg [Wed, 19 Sep 2012 16:44:13 +0000 (18:44 +0200)]
update debian packaging

11 years agoMerge branch 'next'
Michael Stapelberg [Wed, 19 Sep 2012 16:12:41 +0000 (18:12 +0200)]
Merge branch 'next'