~trebelnik-stefina/cinnamon-test/+git/cinnamontest:2.4-maintenance

Last commit made on 2015-04-12
Get this branch:
git clone -b 2.4-maintenance https://git.launchpad.net/~trebelnik-stefina/cinnamon-test/+git/cinnamontest

Branch merges

Branch information

Name:
2.4-maintenance
Repository:
lp:~trebelnik-stefina/cinnamon-test/+git/cinnamontest

Recent commits

110f57e... by Michael Webster

Add wrapper for cogl texture functions to implement this (reverted) commit:

https://github.com/linuxmint/Cinnamon/commit/118527f9f0f7a48c5df38ffc136fea90014d2b2e

in a more compatible manner. If the new functions are supported, use them, otherwise
just use the old ones.

726443f... by Clement Lefebvre <email address hidden>

2.4.8

45db022... by Clement Lefebvre <email address hidden>

Revert "st: Use a more up-to-date cogl API when creating textures"

This reverts commit 5c189e922740444e15f1fce6fc50519996e58153.

6942f13... by Clement Lefebvre <email address hidden>

2.4.7

3e86161... by Michael Webster

dnd.js: Allow control over certain callbacks.

See: https://github.com/linuxmint/Cinnamon/commit/3855777086e569d21fc666a03bc8b2e18f200267#commitcomment-9998687

5c189e9... by Michael Webster

st: Use a more up-to-date cogl API when creating textures
(efforts to reduce freezes) - see http://pastebin.com/a1uiMx5j for
suspect backtrace.

e23d825... by Michael Webster

dnd.js: refactor to eliminate dnd freeze bug

This fixes the random freeze behavior introduced by:
https://github.com/linuxmint/Cinnamon/commit/27d0c9c4cfdf614b97534987d8f06517dcd31959

See #2946 and #3798 (not all of it is pertinent, however)

59212ed... by Michael Webster

mouse/dnd: merge Cinnamon dnd threshold back to using the Gtk one -
this reverts what was done in 8388640bed1b6e7582fc7, which was a
workaround for buggy drag-and-drop behavior in Cinnamon (losing tracking
when dragging off a panel, etc..) - this no longer applies, so having
two settings now is just confusing and excessive.

2.4-maintenance - cherry-picked to allow:
655395de8d256bfd567217947222fa83753acce5
to apply cleanly.

a51bd00... by Michael Webster

applet.js: once more allow the theme to control symbolic icon heights -
caused by https://github.com/linuxmint/Cinnamon/commit/2cfffbcf6d496d455a7b1fd59504d0030222432b

Fixes #3926

aea6853... by Joseph Mccullar

Tweak how the panel icon is used to prevent occasionally getting an oversized icons when restarting cinnamon or changing cinnamon themes