(cherry picked from commit f74d2ab5)

Now that we have a one instance mode with DBus under linux, also make
it possible to use the "one-instance-when-started-from-file" and
"started-from-file" options.
Consider using --started-from-file in the file association scripts,
like what we do in the win32 NSIS script, so that all files opened
through the GUI are enqueued/played in the same instance.
(cherry picked from commit a8821cd8)

Inital patch by Marian Durkovic.
(cherry picked from commit a69b713e)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit 328bcb92)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Saves a few kB and prevents some, ehm, corruption.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit ed54701a)

Once again, thanks to plc5_250 for the tests.
(cherry picked from commit 6e8bbe8e)

Thanks a lot to plc5_250 on IRC for testing.
(cherry picked from commit aa98c569)

(cherry picked from commit 4f66b077)
Signed-off-by: Antoine Cellerier <dionoea@videolan.org>

This reverts commit 6b069ca8.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 2b73b011)

Thanks a lot to ipkiss for providing the bisect builds and geal for his help.
(cherry picked from commit 88f22433)

This reverts commit 95320ee3.

This will slow a few complaints from many people.

Qt: InputSlider: wheeling on it will seek of 1% in position.
(cherry picked from commit af7cf494)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Qt: Don't accept focus on the input slider. Never. Just process mouseEvents...
(cherry picked from commit 47591074)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 24bacb28)

1) Every Human Interface Guideline on Unix/Linux/Windows reserves alt key for menu and button accessibility... Try to NOT use those...
Moreover, you have NO idea how the translators are going to translate your accelerators...

On the other hand, with this long list of keys it was become more than difficult... I'll document on the wiki.

2) Use keys next-to-each-other like-a-cross for cropping

Those keys are making a cross in most layouts ( on the contrary to the previous ones).

3) At the same time, use easier snapshot key. (shift+s is easier than Ctrl+alt+s)

4) Comment previous changes and remove whitespace.

Nota Bene:
I have no idea on how are the default on the mac and if the are conflicts there too, so I won't make changes there.

(cherry picked from commit 4a02c9e3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit afd60281)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 90199a69)

... else the option is useless since nobody will think of enabling it.
(cherry picked from commit 02aeb3ca)

(cherry picked from commit 538b14f9)

Add a variable to force which .pc to use
add libxul (aka xulrunner 1.9) before iceape-plugin and xulrunner-plugin (xul 1.8)
Don't depends on mozilla-config.h when using pkg-config. It's the old way
of doing thing and requires us to depends on the foo-xpcom.pc

Needs backporting once tested
(cherry picked from commit 26c5015f)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit 9463913f)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit cdc8bcd3)

Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>
(cherry picked from commit 5a16baa2)

Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>
(cherry picked from commit 58b66d49)

This is a support to statically link jpeg plugin on windows to the plugin in order to make Qt read jpeg files (needed for album art).
This of course, will increase the binary size, but since dionoea is lazy and doesn't want to make easily conversion from jpeg to png|xpm|bmp, here we go. :D
Better solution should be found on master.