Merge lp:~sethj/ubuntu/wily/unity/fix-for-1445595 into lp:ubuntu/wily/unity

[Seth Johnson]

[Seth Johnson (sethj)]

So... that didn't seem to work out properly. I changed 1 line, dunno how 1082 files got modified. Must have started with an old source maybe?

Unmerged revisions

4028. By Seth Johnson on 2015-10-29

Don't open nautilus when the user empties the trash from the launcher
(LP: #1445595)

4027. By CI Train Bot Account on 2015-10-16

Releasing 7.3.2+15.10.20151016-0ubuntu1

4026. By Andrea Azzarone on 2015-10-16

Avoid test failures on jenkins.
Approved by: Marco Trevisan (Treviño)

4025. By CI Train Bot Account on 2015-10-16

UnityScreen: close the session dialog in case it's open and we're requested to lock

Otherwise a grab conflict will will cause the lockscreen not to show up. Fixes: #1505234
Approved by: Andrea Azzarone

4024. By Marco Trevisan (Treviño) on 2015-10-16

PanelService: ensure that we free the "fake" IndicatorEntry's we create for dropdowns Fixes: #1503348
Approved by: Andrea Azzarone

4023. By Marco Trevisan (Treviño) on 2015-10-16

LauncherIcon: force lookup icon by scaling it at the requested size

As bonus, remove unused GtkWrapper class Fixes: #1446081, #1501973
Approved by: Andrea Azzarone

4022. By Marco Trevisan (Treviño) on 2015-10-16

ResultRendererTile: consider global scaling when scaling a not-squared icon Fixes: #1499286
Approved by: Andrea Azzarone

4021. By Marco Trevisan (Treviño) on 2015-10-16

TestDash: Use local results in PreviewNavigateTests instead of online ones

They're just more reliable
Approved by: Andrea Azzarone

4020. By Marco Trevisan (Treviño) on 2015-10-16

UnityScreen: close the session dialog in case it's open and we're requested to lock

Otherwise a grab conflict will will cause the lockscreen not to show up. Fixes: #1505234
Approved by: Andrea Azzarone

4019. By CI Train Bot Account on 2015-10-02

Releasing 7.3.2+15.10.20151002.2-0ubuntu1

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-10-29 00:16:10 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True
 
=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-10-29 00:16:10 +0000
@@ -0,0 +1,7 @@
+build
+services/panel-marshal.c
+services/panel-marshal.h
+.AUTHORS.sed
+tests/autopilot/dist
+tests/autopilot/unity.egg-info
+.bzr-repo
 
=== modified file 'AUTHORS'
--- AUTHORS	2012-10-16 16:39:25 +0000
+++ AUTHORS	2015-10-29 00:16:10 +0000
@@ -4,16 +4,21 @@
  [e-mail]
  Albert Astals <[e-mail]>
  Albert Astals <[e-mail]>, Christopher Lee <[e-mail]>, Christopher Lee <[e-mail]>
+ Albert Astals <[e-mail]>, Timo Jyrinki <[e-mail]>, Brandon Schaefer <[e-mail]>, Łukasz 'sil2100' Zemczak <[e-mail]>, MC Return <[e-mail]>, Didier Roche <[e-mail]>, Andrea Azzarone <[e-mail]>
  Alejandro Piñeiro <[e-mail]>
  Alejandro Piñeiro <[e-mail]>, Andrea Azzarone <[e-mail]>
+ Alexandre Abreu <[e-mail]>
  Alexandros Frantzis <[e-mail]>
  Alexandros Frantzis <[e-mail]>, Marc Ordinas i Llopis <[e-mail]>, Jay Taoko <[e-mail]>
  Alex Launi <[e-mail]>
  Alex Launi <[e-mail]>, Allan LeSage <[e-mail]>
  Alex Launi <[e-mail]>, Thomi Richards <[e-mail]>
+ Alfred Neumayer <[e-mail]>
  Andrea Azzarone
  Andrea Azzarone <[e-mail]>
  Andrea Cimitan <[e-mail]>
+ Andrew Gaul <[e-mail]>
+ Andrew McCarthy <[e-mail]>
  Andrey Logvinov <[e-mail]
  Aurélien Gâteau <[e-mail]>
  Benjamin Kerensa <[e-mail]>
@@ -21,31 +26,50 @@
  Bilal Akhtar <[e-mail]>, Thomi Richards <[e-mail]>
  Brandon Schaefer <[e-mail]>
  Brandon Schaefer <[e-mail]>, Brandon Schaefer <[e-mail]>
- Brandon Schaefer <[e-mail]>, Marco Trevisan (Treviño) <[e-mail]>, Christopher Lee <[e-mail]>
+ Brandon Schaefer <[e-mail]>, MC Return <[e-mail]>
+ Brandon Schaefer <[e-mail]>, Nick Dedekind <[e-mail]>
  Brandon Schaefer <[e-mail]
  Brandon Schaefer <[e-mail]>
  Brandon Schaefer <[e-mail], Brandon Schaefer <[e-mail]>
  Brandon Schaefer <[e-mail], Jay Taoko <[e-mail]>
+ Brandon Schaefer <[e-mail]>, Marco Trevisan (Treviño) <[e-mail]>
  Brandon Schaefer <[e-mail]>, Thomi Richards <[e-mail]>
  Brandon Schaefer <[e-mail]>
  Charles Kerr <[e-mail]>
+ Charles Kerr <[e-mail]>, Andrea Azzarone <[e-mail]>
  Chase Douglas <[e-mail]>
  Chris Coulson <[e-mail]>
+ chris.gagnon <[e-mail]>
  Christopher James Halse Rogers <[e-mail]>
  Christopher Lee <[e-mail]>
+ Christopher Lee <[e-mail]>, Thomi Richards <[e-mail]>
  Christopher Lee <[e-mail]>
+ Christopher Townsend <[e-mail]>
+ Chris Townsend <[e-mail]>
  Daniel d'Andrada <[e-mail]>
  Daniel van Vugt <[e-mail]>
  David Barth <[e-mail]>
  David Gomes <[e-mail]>
  David Planella <[e-mail]>
  Didier Roche <[e-mail]>
+ Didier Roche <[e-mail]>, Sebastien Bacher <[e-mail]>, Marco Trevisan (Treviño) <[e-mail]>, Łukasz 'sil2100' Zemczak <[e-mail]>, Didier Roche <[e-mail]>, Neil Jagdish Patel <[e-mail]>
  Didier Roche <[e-mail]>
+ Dimitri John Ledkov <[e-mail]>
+ Dimitri John Ledkov <[e-mail]>
+ Eleni Maria Stea <[e-mail]>
+ Eleni Maria Stea <[e-mail]>
  foxoman <[e-mail]>
+ Francis Ginther <[e-mail]>
+ Francis Ginther <[e-mail]>
  Gabor Kelemen <[e-mail]>
  Gary Lasker <[e-mail]>
+ George Karavasilev <[e-mail]>
  Gordon Allott <[e-mail]>
+ handsome_feng<[e-mail]>
  Henri De Veene <[e-mail]>
+ Iain Lane <[e-mail]>
+ Iain Lane <[e-mail]>, Iain Lane <[e-mail]>
+ Jacob Edwards
  Jani Monoses <[e-mail]>
  Jani Monoses <[e-mail]>
  Jason Conti <[e-mail]>
@@ -63,16 +87,22 @@
  Jay Taoko <[e-mail]>, Mirco Müller <[e-mail]>
  Jay Taoko <[e-mail]>, Robert Carr <[e-mail]>
  Jeremy Bicha <[e-mail]>
+ Jinkyu Yi <[e-mail]>
  [e-mail]
+ Jussi Pakkanen <[e-mail]>
  Ken VanDine <[e-mail]>
  Ken VanDine <[e-mail]>, Nick Dedekind <[e-mail]>
  Kevin DuBois <[e-mail]>
  Koichi Akabe <[e-mail]>
  Lars Uebernickel <[e-mail]>
+ Leo Arias <[e-mail]>
  Loïc Molinari <[e-mail]>
  Lorenzo Mattei <[e-mail]>
  Łukasz 'sil2100' Zemczak <[e-mail]>
  Luke Yelavich <[e-mail]>
+ Manuel de la Pena <[e-mail]>
+ Manuel de la Pena <[e-mail]>, Nick Dedekind <[e-mail]>, Pawel Stolowski <[e-mail]>, Michal Hruby <[e-mail]>, Łukasz 'sil2100' Zemczak <[e-mail]>, Marco Trevisan (Treviño) <[e-mail]>, Automatic PS uploader <[e-mail]>, Chris Townsend <[e-mail]>, Andrea Azzarone <[e-mail]>
+ Marc Deslauriers <[e-mail]>
  Marco Biscaro <[e-mail]>
  Marco Biscaro <[e-mail]>, Rick Spencer <[e-mail]>
  Marco Mariani <[e-mail]>, Thomi Richards <[e-mail]>
@@ -81,20 +111,34 @@
  Marco Trevisan <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, 3v1n0 <[e-mail]>
+ Marco Trevisan (Treviño) <[e-mail]>, Andrea Azzarone <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Andrea Cimitan <[e-mail]>
+ Marco Trevisan (Treviño) <[e-mail]>, Brandon Schaefer <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Brandon Schaefer <[e-mail]>, Tim Penhey <[e-mail]>
+ Marco Trevisan (Treviño) <[e-mail]>, Eleni Maria Stea <[e-mail]>
+ Marco Trevisan (Treviño) <[e-mail]>, Lukas Vacek <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Michal Hruby <[e-mail]>
+ Marco Trevisan (Treviño) <[e-mail]>, Sam Spilsbury <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Thomi Richards <[e-mail]>
+ Marco Trevisan (Treviño), Marco Trevisan (Treviño) <[e-mail]>
  Marius Gedminas <[e-mail]>
  Martin Albisetti <[e-mail]>
  Martin Mrazik <[e-mail]>
  Martin Mrazik <[e-mail]>
+ Martin Pitt <[e-mail]>
+ Martin Pitt <[e-mail]>
+ Mathieu Trudel-Lapierre <[e-mail]>
+ Matthias Alles
+ Matthieu James <[e-mail]>
+ Maxim Ermilov <[e-mail]>
  MC Return <[e-mail]>
  Michael Rawson <[e-mail]>
  Michael Terry <[e-mail]>
  Michael Terry <[e-mail]>
  Michael Vogt <[e-mail]>
+ Michael Zanetti <[e-mail]>
  Michal Hruby <[e-mail]>
+ Michi Henning <[e-mail]>
  Mikkel Kamstrup Erlandsen <[e-mail]>
  Mirco Müller <[e-mail]>
  Mitsuya Shibata
@@ -105,24 +149,36 @@
  Nick Dedekind <[e-mail]>, Michal Hruby <[e-mail]>
  Nick Dedekind <[e-mail]>
  Nick Dedekind <[e-mail]>, Christopher Lee <[e-mail]>
+ Nicolas Delvaux <[e-mail]>
  Nicolas d'Offay <[e-mail]>
+ Nicolas d'Offay <[e-mail]>, Nic d'Offay <[e-mail]>, Neil Jagdish Patel <[e-mail]>
  Nico van der Walt <[e-mail]>
+ Niklas Steger <[e-mail]>
  Oliver Sauder <[e-mail]>
  Omer Akram <[e-mail]>
  Omer Akram <[e-mail]>
+ Paolo Rotolo <[e-mail]>
  Paolo Rotolo <[e-mail]>
  Paul Sladen <[e-mail]>
  Paul Sladen <[e-mail]>, Andrea Cimitan <[e-mail]>
  Pawel Stolowski <[e-mail]>
+ Pawel Stolowski <[e-mail]>, Michal Hruby <[e-mail]>
+ Pawel Stolowski <[e-mail]>
+ Pawel Szubert
  Rafał Cieślak <[e-mail]>
  Renato Araujo Oliveira Filho <[e-mail]>
  Ricardo Mendoza <[e-mail]>
+ Ricardo Salveti de Araujo <[e-mail]>
+ Robert Ancell <[e-mail]>
  Robert Carr <[e-mail]>
  Robert Carr <[e-mail]>, Ken VanDine <[e-mail]>
  Robert Carr <[e-mail]>
  Rodrigo Moya <[e-mail]>
+ Romain Perier <[e-mail]>
  Ryan Lortie <[e-mail]>
+ Sami Jaktholm <[e-mail]>
  Sam Spilsbury <[e-mail]>
+ Sam Spilsbury <[e-mail]>, Andrea Azzarone <[e-mail]>
  Sam Spilsbury <[e-mail]>, Daniel van Vugt <[e-mail]>
  Sam Spilsbury <[e-mail]>, Didier Roche <[e-mail]>
  Sam Spilsbury <[e-mail]>, Michal Hruby <[e-mail]>
@@ -130,9 +186,11 @@
  smspillaz <[e-mail]>
  smspillaz <[e-mail]>, Daniel van Vugt <[e-mail]>
  smspillaz <[e-mail]>, Sam Spilsbury <[e-mail]>
+ Stephen M. Webb <[e-mail]>
+ Steve Langasek <[e-mail]>
  Sven Baars <[e-mail]>
- Tarmac
  Ted Gould <[e-mail]>
+ Thomas Voß <[e-mail]>, Didier Roche <[e-mail]>
  Thomas Voß <[e-mail]>
  Thomi Richards <[e-mail]>
  Thomi Richards <[e-mail]>, Alex Launi <[e-mail]>
@@ -140,13 +198,17 @@
  Thomi Richards <[e-mail]>
  Thomi Richards <[e-mail]>, Albert Astals <[e-mail]>
  Thomi Richards <[e-mail]>, Alex Launi <[e-mail]>
+ Thomi Richards <[e-mail]>, Brandon Schaefer <[e-mail]>
  Thomi Richards <[e-mail]>, Brandon Schaefer <[e-mail]>
+ Thomi Richards <[e-mail]>, Christopher Lee <[e-mail]>
  Thomi Richards <[e-mail]>, Gordon Allott <[e-mail]>
  Thomi Richards <[e-mail]>, Jason Smith <[e-mail]>
  Thomi Richards <[e-mail]>, Miklos Juhasz <[e-mail]>
  Thomi Richards <[e-mail]>, Ted Gould <[e-mail]>
  Thomi Richards <[e-mail]>, Thomi Richards <[e-mail]>
  Thomi Richards <[e-mail]>, Tim Penhey <[e-mail]>
+ Tigran Gabrielyan <[e-mail]>
+ Tim Lunn <[e-mail]>
  [e-mail]
  Timo Jyrinki <[e-mail]>
  Tim Penhey <[e-mail]>
@@ -155,8 +217,10 @@
  Tim Penhey <[e-mail]>, Jason Smith <[e-mail]>
  Tim Penhey <[e-mail]>, Jay Taoko <[e-mail]>
  Tim Penhey <[e-mail]>, Neil Jagdish Patel <[e-mail]>
- Ubuntu <ubuntu@netbook>
  Ugo Riboni <[e-mail]>
  Unity Merger <[e-mail]>
  Victor Eduardo <[e-mail]>
+ William Grant <[e-mail]>
+ William Hua <[e-mail]>
+ Xiao-Long Chen <[e-mail]>
  Zaid Yeganeh <[e-mail]>
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-08 09:10:21 +0000
+++ CMakeLists.txt	2015-10-29 00:16:10 +0000
@@ -1,29 +1,94 @@
 project (unity)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.9)
 
 include (cmake/Documentation.cmake)
+include (cmake/pch.cmake)
 
 #
 # Base bits
 #
 set (PROJECT_NAME "unity")
-set (UNITY_MAJOR 6)
-set (UNITY_MINOR 12)
-set (UNITY_MICRO 0)
+set (UNITY_MAJOR 7)
+set (UNITY_MINOR 3)
+set (UNITY_MICRO 2)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
+set (UNITY_COMPONENTS_VERSION "6")
 
-set (CMAKE_CXX_FLAGS "-DGNOME_DESKTOP_USE_UNSTABLE_API -std=c++0x -fno-permissive")
-set (CMAKE_CXX_FLAGS_DEBUG "-g3")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGNOME_DESKTOP_USE_UNSTABLE_API -std=c++11 -fno-permissive")
+set (CMAKE_CXX_FLAGS_DEBUG "-g3 -DUNITY_DEBUG_BUILD")
 set (CMAKE_CXX_FLAGS_RELEASE "")
 
+option(
+  ENABLE_X_SUPPORT
+  "Enable X.org support in unity"
+  ON
+)
+
+# This is due to bug lp:668799 - qemu-arm segfaults executing msgmerge
+option(
+  I18N_SUPPORT
+  "Enable I18N, do the .po file thing."
+  ON
+)
+
+if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+  set (PIC_FLAGS "-fPIC")
+endif()
+
+if (ENABLE_X_SUPPORT)
+  add_definitions(-DUSE_X11)
+  message("Unity is configured with support for X.org")
+else ()
+  message("Unity is configured with without X.org")
+  add_definitions(-DNO_X11)
+endif ()
+
 if (BUILD_GLES)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
-    set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl")
+  add_definitions(-DNUX_OPENGLES_20)
+  add_definitions(-DUSE_GLES)
+  set (UNITY_STANDALONE_LADD "unity-core-${UNITY_API_VERSION};m;pthread;dl")
 else ()
-    set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl -lGL -lGLU")
+  set (UNITY_STANDALONE_LADD "unity-core-${UNITY_API_VERSION};m;pthread;dl;GL;GLU")
 endif ()
 
+if (CMAKE_BUILD_TYPE MATCHES coverage)
+  set (COVERAGE_XML_FILE "${CMAKE_BINARY_DIR}/coverage.xml")
+# FIXME: Read below
+#  set (COVERAGE_INFO_FILE "${CMAKE_BINARY_DIR}/coverage-html.info")
+#  set (COVERAGE_HTML_DIR "${CMAKE_BINARY_DIR}/coverage-html")
+
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" )
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" )
+  set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage" )
+  set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage" )
+
+  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
+  if (NOT GCOVR_EXECUTABLE)
+      message(FATAL_ERROR "Cannot enable coverage targets because gcovr was not found.")
+  else ()
+      message (STATUS "Enabling XML coverage report")
+      add_custom_target (coverage-xml 
+          COMMAND  "${GCOVR_EXECUTABLE}" --exclude="tests.*" --exclude="obj-.*" -x -r "${CMAKE_SOURCE_DIR}" -o "${COVERAGE_XML_FILE}")
+  endif()
+
+# FIXME: This got commented out, as it forces a strict dependency on lcov
+#  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${LCOV_ROOT}/bin")
+#  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT} "${GENHTML_ROOT}/bin")
+#  if (NOT LCOV_EXECUTABLE)
+#      message(FATAL_ERROR "Cannot enable coverage targets because gcovr was not found.")
+#  elseif (NOT GENHTML_EXECUTABLE)
+#      message(FATAL_ERROR "Cannot enable coverage targets because genhtml was not found.")
+#  else ()
+#      message (STATUS "Enabling HTML coverage report")
+#      add_custom_target (coverage-html 
+#          COMMAND "${LCOV_EXECUTABLE}" --directory "${CMAKE_BINARY_DIR}" --capture --output-file "${COVERAGE_INFO_FILE}"
+#          COMMAND "${GENHTML_EXECUTABLE}" --output-directory "${COVERAGE_HTML_DIR}" "${COVERAGE_INFO_FILE}")
+#  endif()
+
+endif (CMAKE_BUILD_TYPE MATCHES coverage)
+
+
 #
 # Niceties
 #
@@ -37,15 +102,14 @@
        && bzr log --gnu-changelog > ChangeLog
        && echo "• Generating AUTHORS"
        && bzr log --long --levels=0 | grep -e "^\\s*author:" -e "^\\s*committer:" | cut -d ":" -f 2 | sed -r -f AUTHOR-glue | sort -u > AUTHORS
-       && echo "• Committing Release"
-       && bzr commit -m"Release ${UNITY_VERSION}" --unchanged
-       && echo "• Tagging Release"
-       && bzr tag ${UNITY_VERSION}
        && echo "• Running Distcheck"
   )
-  
+
 add_custom_target (dist
-  COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
+  COMMAND echo "• Creating Tarball"
+       && bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
+       && echo "• Signing Tarball"
+       && gpg --armor --sign --detach-sig ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
 add_dependencies(dist pre-distcheck)
@@ -59,56 +123,67 @@
        && cmake -DCMAKE_INSTALL_PREFIX=../install -DGSETTINGS_LOCALINSTALL=ON .. -DCMAKE_MODULE_PATH=/usr/share/cmake
        && make -j4
        && make -j4 install
-       && make check
+       && make check-headless
   )
 add_dependencies(distcheck dist)
 
 add_custom_target (post-distcheck
-  COMMAND echo "• Signing Tarball"
-       && gpg --armor --sign --detach-sig ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
-       && echo "• Pushing Branch"
-       && bzr push
-       && echo "• Publishing Tarball"
-       && lp-project-upload unity ${UNITY_VERSION} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
-       && echo ""
-       && echo "• Unity ${UNITY_VERSION} Released."
+  COMMAND echo "• Committing Release"
+       && bzr commit -m\"Release ${UNITY_VERSION}\" --unchanged
+       && echo "• Tagging Release"
+       && bzr tag ${UNITY_VERSION}
+       && echo "• Unity ${UNITY_VERSION} is ready for release."
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
 add_dependencies(post-distcheck distcheck)
 
 add_custom_target (release)
-add_dependencies (release post-distcheck)
+add_dependencies (release distcheck)
 
 #
 # config.h
 #
 set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/unity/${UNITY_MAJOR}")
+set (PKGDATADIR "${DATADIR}/unity/icons")
+set (SOURCEDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
 set (GETTEXT_PACKAGE "unity")
 set (LOCALE_DIR "${DATADIR}/locale")
 set (VERSION "${UNITY_VERSION}")
 set (BUILDDIR "${CMAKE_BINARY_DIR}")
+set (TESTDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
+
+find_package (PkgConfig)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gtk+-3.0 --variable prefix OUTPUT_VARIABLE GTK_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} unity --variable lensesdir OUTPUT_VARIABLE LENSES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE INDICATORDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE INDICATORICONDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable prefix OUTPUT_VARIABLE INDICATORPREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+set (INDICATOR_SERVICE_DIR "${INDICATORPREFIX}/share/unity/indicators")
 
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
 #
 # i18n
 #
+
 find_package (Gettext REQUIRED)
 
 set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
 
 add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/unity.pot
-		COMMAND xgettext -c --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/unity.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="[e-mail]" --no-wrap --no-location
+		COMMAND xgettext -c --from-code=UTF-8 --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/unity.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="[e-mail]" --no-wrap --no-location
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		)
 
-if (${GETTEXT_FOUND} STREQUAL "TRUE")
+if (I18N_SUPPORT)
+if (GETTEXT_FOUND)
         set (HAVE_GETTEXT true)
         file (GLOB _translations ${CMAKE_SOURCE_DIR}/po/*.po)
         GETTEXT_CREATE_TRANSLATIONS (${CMAKE_SOURCE_DIR}/po/${PROJECT_NAME}.pot
                 ALL ${_translations})
-endif (${GETTEXT_FOUND} STREQUAL "TRUE")
+endif (GETTEXT_FOUND)
+endif()
 
 #
 # Enable or disable boot logging
@@ -118,53 +193,136 @@
     SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
 endif (BOOT_LOGGER)
 
-SET (MAINTAINER_CFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
-option (DISABLE_MAINTAINER_CFLAGS "Disable maintainer CFlags" OFF)
-if (DISABLE_MAINTAINER_CFLAGS)
-  SET (MAINTAINER_CFLAGS "")
-endif (DISABLE_MAINTAINER_CFLAGS)
+SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
+
+option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
+if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
+  SET (MAINTAINER_CXXFLAGS "${MAINTAINER_CXXFLAGS} -Wno-error=unused-local-typedefs")
+endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
+
+option (DISABLE_MAINTAINER_CXXFLAGS "Disable maintainer CXXFlags" OFF)
+if (DISABLE_MAINTAINER_CXXFLAGS)
+  SET (MAINTAINER_CXXFLAGS "")
+endif (DISABLE_MAINTAINER_CXXFLAGS)
+
+# Make sure these flags are used for every build.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MAINTAINER_CXXFLAGS}")
 
 #
 # Compiz Plugins
 #
-set (UNITY_PLUGIN_DEPS "compiz>=0.9.8.0;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;gmodule-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-misc>=0.4.0;dbus-glib-1;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.95.1;libgeis;xrender>=0.9;zeitgeist-1.0>=0.3.18")
-set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.95.1")
-
-find_package (PkgConfig)
+set(UNITY_PROTOCOL_PRIVATE_DEPS unity-protocol-private>=7.1.0)
+set(UNITY_PLUGIN_SHARED_DEPS
+    ${UNITY_PROTOCOL_PRIVATE_DEPS}
+    atk
+    atk-bridge-2.0
+    cairo>=1.13.1
+    dbusmenu-glib-0.4
+    dee-1.0
+    gio-2.0>=2.30.0
+    gio-unix-2.0
+    gmodule-2.0
+    gthread-2.0
+    gtk+-3.0>=3.1
+    indicator3-0.4>=0.4.90
+    json-glib-1.0
+    libbamf3>=0.5.0
+    gnome-desktop-3.0
+    libnotify
+    libstartup-notification-1.0
+    nux-4.0>=4.0.5
+    sigc++-2.0
+    unity-misc>=0.4.0
+    xpathselect=1.4
+    zeitgeist-2.0
+)
+
+set(UNITY_PLUGIN_DEPS ${UNITY_PLUGIN_SHARED_DEPS})
+
+if(ENABLE_X_SUPPORT)
+  set(UNITY_PLUGIN_DEPS
+      ${UNITY_PLUGIN_DEPS}
+      compiz>=0.9.9
+      libgeis
+      x11
+      xfixes
+      xi>=1.6.99.1
+      xrender>=0.9
+  )
+endif ()
+
 pkg_check_modules (CACHED_UNITY_DEPS REQUIRED ${UNITY_PLUGIN_DEPS})
 pkg_check_modules (CACHED_UNITY_PRIVATE_DEPS REQUIRED ${UNITY_PROTOCOL_PRIVATE_DEPS})
+find_library (UNITY_PROTOCOL_PRIVATE_LIB unity-protocol-private ${CACHED_UNITY_PRIVATE_DEPS_LIBDIR} ${CACHED_UNITY_PRIVATE_DEPS_LIBRARY_DIRS})
+set(UNITY_STANDALONE_LADD ${UNITY_STANDALONE_LADD} ${UNITY_PROTOCOL_PRIVATE_LIB})
+
 add_subdirectory(unity-shared)
-add_subdirectory(panel)
 add_subdirectory(dash)
-add_subdirectory(hud)
 add_subdirectory(launcher)
-add_subdirectory(shortcuts)
-add_subdirectory(unity-standalone)
-add_subdirectory(plugins/unityshell)
-add_subdirectory(plugins/networkarearegion)
-add_subdirectory(plugins/unitydialog)
-add_subdirectory(plugins/unity-mt-grab-handles)
+add_subdirectory(data)
+if (ENABLE_X_SUPPORT)
+  add_subdirectory(hud)
+  add_subdirectory(lockscreen)
+  add_subdirectory(panel)
+  add_subdirectory(decorations)
+  add_subdirectory(plugins/unityshell)
+  add_subdirectory(plugins/networkarearegion)
+  add_subdirectory(plugins/unity-mt-grab-handles)
+  add_subdirectory(shortcuts)
+  add_subdirectory(shutdown)
+  add_subdirectory(unity-standalone)
+endif ()
 
 # subdirs
 add_subdirectory(doc)
 
 # Check for google test and build it locally
+set (
+  GMOCK_ROOT_DIR
+  "/usr/src/gmock"
+  CACHE
+  PATH
+  "Path to Google mock srcs"
+)
+
+set (
+  GMOCK_INCLUDE_DIR
+  "/usr/include/gmock/include"
+  CACHE
+  PATH
+  "Path to Google mock include"
+)
+
 set(
   GTEST_ROOT_DIR
-  "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
+  "${GMOCK_ROOT_DIR}/gtest" # Default value, adjustable by user with e.g., ccmake
   CACHE
   PATH
   "Path to Google test srcs"
 )
 
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
-if (GTEST_INCLUDE_DIR)
-  #FIXME - hardcoded is bad!
+set(
+  GTEST_INCLUDE_DIR
+  "${GMOCK_ROOT_DIR}/gtest/include"
+  CACHE
+  PATH
+  "Path to Google tests include"
+)
+
+if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
+  include_directories (
+    ${GMOCK_INCLUDE_DIR}
+    ${GTEST_INCLUDE_DIR}
+  )
   add_subdirectory(
-    ${GTEST_ROOT_DIR}
-    gtest
-  )
-endif(GTEST_INCLUDE_DIR)
+    ${GMOCK_ROOT_DIR}
+    "${CMAKE_CURRENT_BINARY_DIR}/gmock"
+  )
+elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
+  include_directories (
+    ${GTEST_INCLUDE_DIR}
+  )
+endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
 
 add_subdirectory(services)
 add_subdirectory(tests)
@@ -178,6 +336,7 @@
 # GSettings Schema
 #
 SET (UNITY_SCHEMAS "com.canonical.Unity.gschema.xml")
+SET (UNITY_TEST_SCHEMAS "external.gschema.xml")
 
 # Have an option to not install the schema into where GLib is
 option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
@@ -202,8 +361,15 @@
 install (CODE "message (STATUS \"Compiling GSettings schemas\")")
 install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
 
+# Resources
+install (FILES resources/dash-widgets.json DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/themes)
+file (GLOB _datafiles "${CMAKE_CURRENT_SOURCE_DIR}/resources/*")
+install (FILES ${_datafiles} DESTINATION ${PKGDATADIR})
+
+
 # For testing
 configure_file (${CMAKE_SOURCE_DIR}/${UNITY_SCHEMAS} ${CMAKE_BINARY_DIR}/settings/${UNITY_SCHEMAS})
+configure_file (${CMAKE_SOURCE_DIR}/tests/data/${UNITY_TEST_SCHEMAS} ${CMAKE_BINARY_DIR}/settings/${UNITY_TEST_SCHEMAS})
 execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_BINARY_DIR}/settings)
 
 #
 
=== modified file 'ChangeLog'
--- ChangeLog	2012-11-08 09:10:21 +0000
+++ ChangeLog	2015-10-29 00:16:10 +0000
@@ -1,3 +1,30011 @@
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20150227-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Draw osk above unity shell. Fixes: #1413165
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use an atom to check if a window is an osk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Draw osk above unity shell
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove FontSettings.*.
+	Add the possibility to specify the font size and the font weight without chaning the default font name.
+	Fix lp 886478. Fixes: #886478
+	Approved by: Brandon Schaefer, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add the possibility to specify the font size and the font weight without chaning the default font name.
+	Fix lp 886478.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove unitydialog plugin.
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove unitydialog plugin.
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Explore children when a view or layout is added
+	
+	The dash results view grid objects are not being created when the dash is opened. Force an exploration of the children of a view or layout to make sure any dynamically added/removed objects in the dash can be found. Fixes: #1066157
+	Approved by: Stephen M. Webb
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Explore children when a view or layout is added
+	
+	The dash results view grid objects are not being created when the
+	dash is opened. Force an exploration of the children of a view or layout to
+	make sure any dynamically added/removed objects in the dash can be found.
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Set focus to FALSE on window deactivation
+	
+	This ensures that dash results can be reviewed with orca and other assistive apps when the dash is opened more than once in a session. Fixes: #1066157
+	Approved by: PS Jenkins bot
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Set focus to FALSE on window deactivation
+	
+	This ensures that dash results can be reviewed with orca and other assistive
+	apps when the dash is opened more than once in a session.
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Move the unity a11y present environment call
+	
+	With this change, one can now use accerciser to explore Unity's accessibility object hierarchy again.
+	Approved by: PS Jenkins bot
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Move the unity a11y present environment call
+	
+	With this change, one can now use accerciser to explore Unity's accessibility
+	object hierarchy again.
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20150219.2-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Decorations, Panel: add menus for unfocused windows as well
+	
+	Now the indicator-appmenu exports the menus for all the windows,
+	then it's up to us to filter them based on their parent window and
+	show on relevant place.
+	Also, set LIM as default now. Fixes: #1309778
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test{dash,hud}: fix tests to adapt to new HUD/Dash behaviors with fullscreen windows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test_wm_keybindings: fix tests to make them not dependent on apps
+	
+	They just work with indicators anyway
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test_panel: add specific LIM tests on PanelLimTests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test_panel: fix some unstable tests on LIMs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: force redraw title in case we changed the focused state
+	
+	This is way better than we used to do...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use HasVisibleMenus() instead of !entries_.empty() as there always will be a drop-down entry
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test_panel: pass window to ensure_window_state
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelWindowButtonsActionsTests: just inherit from PanelTestsBase
+	
+	Otherwise tests will repeat
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, tests: use Gio.Settings and Variant to set gsettings values
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test_panel: repeat window buttons actions when panel is unfocused
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, test_panel: add "Global Menus" and "Integrated Menus" scenarios and fix tests on LIM
+	
+	Repeat all the tests in both the Global and Integrated menu modes, checking different behaviors.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, panel: add focused property
+	
+	It actually reflects the menu view area
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: add "focused", "maximized_window" and "integrated_menus" to introspection
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DBusIndicators: don't crash on mismatching variant signature, log errors
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestAppmenuIndicator: add syncronization tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: just use operator[] to access to window entries vector
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UBusWrapper: use next iterator provided by erase instead of manual handling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: use next iterator provided by erase instead of manual handling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: also raise windows on panel activation
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneWindowManager: emit resized/moved on geo changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestPanelMenuView: don't make BAMF interact with us
+	
+	And fix non-LIM issues
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: verify that whether a maximized window is valid for us when moved/resized
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorEntryView: don't terminate scale if in menu-mode
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesVScrollBar: use internal cairo context or we'll have a leak
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: protect from crashes when parent indicator is destructed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry, PanelMenuView: don't open menus on unfocused windows if not enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: add lim_unfocused_popup option
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry: don't try to open a menu on right/middle clicks if a WM action is set
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager (and gschema): set LIM as default
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	debian/control: suggest proper version of indicator-appmenu
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: don't build menus if the window has not
+	
+	Once they're added, we'll rebuild this anyway (but we'll be protected by invisible menus)...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: fix scalability of window buttons padding
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuLayout: insert items ordered by menu priorities
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Unity: Use unordered_map whenever possible
+	
+	As iterating over it seems just fast as in the ordered version, we just speedup lookups and insertions.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager: only update the window menus where they have changed
+	
+	Now we only rebuild the menubar of windows that got a changed signal,
+	instead of rebuilding appmenu for everything.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: override Sync method and emit updated_win whe one changes
+	
+	This will allow us to reduce the operations for all the windows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager: don't pass events to InputMixer when in scale
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: only grabs the keys for the active window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: keep a reference on WindowManager, and initialize ASAP
+	
+	In this way WindowsManager::Default() will be always available by our clients.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: return self on initialization
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: keep the entries in a map, per each window so we can get them quickly
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: keep the window panel ID around, as the win->id() might be 0 on destruction
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestIndicator: update for new APIs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Indicator: use indicator::Entry to emit that an element has been removed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: remove the ugly active_window property
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: update ShowNow property on entries based on the current active window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelView: use HasKeyActivableMenus to verify whether opening an entry on key activation
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: only add menu entries with the parent that matches the current window in control
+	
+	Also move some variables to properties to be notified automagically on changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorEntryView: add show_now_changed signal
+	
+	In this way we can disconnect from it automatically when the view entry gets deleted
+	but the entry is still alive (multi-monitor case)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestIndicator: adapt to new API
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorEntryDropdownView: add clear method and pass the window xid to ups
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuDropdown: set the window id as entry id
+	
+	And pass the window xid to the panel service
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsPriv: add missing definition for GetMenusPanelID
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorsView: make a view activable by position even if not focused
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorsView: add ClearEntries method and only remove an item if it's a known id
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorsView: call overridable function when adding the indicator entries
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: it's not needed anymore to notify when app focus changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Decorations: Include the window xid on the panel name when syncing with ups
+	
+	In this way every window is a single panel, and thus ups will handle input
+	events correctly.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager: setup app menus on all windows, not only on active one
+	
+	We should optimize code in order not to update every window on every menu change.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: build menus for all the windows, not only for the decorated one
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuDropdown: paint using backdrop state if not focused
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry: expose GrabEdge to extenders
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry: paint using the correct state when not focused
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuLayout: only add menus for the related window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: fix SYNC_WAITING to be really an uint
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: Since we're using a lot the appmenu indicator, let's keep a reference of it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: export the AppMenu library name in private header
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: Ignore quick entries removal/additions
+	
+	This allows to remove elements from geometry hash-table when needed,
+	being safer when looking for their geometries on panel clicks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: ensure menus are closed also on entry removal
+	
+	Plus, fix an issue we had when trying to remove the last entry of a panel geo
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: enable "unity-all-menus" environment variable
+	
+	This will make IndicatorAppmenu to spam us with all the menus it knows :)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: when looking for a panel, verify the entry is still valid before deferencing it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: compute entry panel based also on the parent window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: don't emit invalid panel/entry values
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: define periority per parent window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsSlidingLayout: don't try to draw the input item if it's not visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsWidgets: simplify GetTopParent
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DBusIndicators: rebuild entry only if priority has changed (don't keep track of index at this level)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: get entries by for parent window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Indicator: erase entries in one pass and use a vector instead than a list
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService, DBusIndicators, IndicatorEntry: add a parent_window parameter to Entry
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: share service names, path, and iface using the private header
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: add entry signature definitions in private header and use them everywhere
+	
+	So we don't have to rewrite the same unreadable string of types everywhere.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lim-visibility-fixes branch
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	Release 7.3.1
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20150205-0ubuntu1
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Try to set the folder permission otherwise Handle permission error. Fixes: #1418255
+	Approved by: PS Jenkins bot, Andrea Azzarone, Marco Trevisan (Treviño)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Remove prints
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fix migration script to force 0700 permissions on the folder
+	* If there is a permissions issue, catch it, and handle it! (ie. Dont crash!)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Actually connect to changed::* signal in UnitySettings.cpp. Fixes: #1408212
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Actually connect to changed::* signal in UnitySettings.cpp.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Actually connect to changed::* signal in MenuManager.cpp. Fixes: #1411620
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Actually connect to changed::* signal in MenuManager.cpp.
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20150126-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make unity unlockable if user is in nopsswdlogin group. On super+l the screensaver is activated. Fixes: #1413790
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Revert changes to pam/unity.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable lock if user is in nopasswdlogin group.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make unity unlockable by default if user is in nopsswdlogin group.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make sure dragged icons are not rendered behind the dash. Fixes: #1413773
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make sure dragged icons are not rendered behind the dash.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable markup accel for VolumeLauncherIcon quicklist menu items. Fixes: #1413411
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable markup accel for VolumeLauncherIcon quicklist menu items.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Force icon size (new gtk requires it). Fixes: #1404730
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Force icon size (new gtk requires it).
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20150115-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Avoid running pontentially dangerous code paths when the screen is locked. Fixes: #1410582
+	Approved by: Stephen M. Webb
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Avoid running pontentially dangerous path when the screen is locked.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: make sure menus are always shown when mouse is over them or when the always-show-menus option is on Fixes: #955193, #1312137, #1374942, #1390562
+	Approved by: Stephen M. Webb
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use std::to_string to correctly stringify a number
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: move integrated_menus property here, from decoration::Style
+	
+	This is not related to decoration or stiling at all, so it's better to keep it there
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: add setting to control menu visibility and use that value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: always show menus if the relative option in MenuManager is active_xid_
+	
+	Include some usual cleanup and ignore unneeded events and redraws in case this option is enabled.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager: update the active window menus if always_show_menus changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: always show input item in sliding layout if always_show_menus is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsSlidingLayout: add property to always override main item (with input item)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: add always_show_menus property
+	
+	False by default
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: wait a little more before sending an updated signal
+	
+	To avoid false positives
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AppmenuIndicator: keep track of the active window, and re-send an updated signal if that changes
+	
+	And we didn't get an update yet
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MenuManager: use the proper type to return the AppMenu indicator
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: cleanup code in GetMonitorAtPosition
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: ensure we disconnect from grab_mouse_changed_ signals
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: trap more X errors
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: don't hide menus when moving mouse out and ShowNow is active
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Show session dialog over fullscreen windows. Fixes: #1404486
+	Approved by: Stephen M. Webb
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Show session dialog over a full screen window.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Enable dash and hud if there is a fullscreen window. Fixes: #860970, #1159249
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Enable dash and hud if there is a fullscreen window.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use std::weak_ptr to avoid referencing an invalid barrier. Fixes: #1238063
+	Approved by: Stephen M. Webb, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix tests/test_pointer_barrier.cpp
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge the branch.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use a weak_ptr to avoid crashes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable Pointer Barriers during lockscreen. Fixes: #1401911
+	Approved by: Stephen M. Webb
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable Pointer Barriers during lockscreen.
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20150112-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove unsed StartupNotifyService.* 
+	Approved by: Stephen M. Webb
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove unsed StartupNotifyService.*
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Remove deprecated code that is no longer supported:
+	https://mail.gnome.org/archives/commits-list/2014-July/msg00351.html Fixes: #1404326
+	Approved by: Stephen M. Webb, Marco Trevisan (Treviño)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fix the other deprecated code
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Remove deprecated code that is no longer supported:
+	https://mail.gnome.org/archives/commits-list/2014-July/msg00351.html
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20141216-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	fix AP test failures due to upstream FileRoller .desktop file rename Fixes: #1402707
+	Approved by: Christopher Townsend
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	fix AP test failures due to upstream FileRoller .desktop file rename
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	skipped the animation of BGHash on startup to prevent unwanted fade-in Fixes: #1241757
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Skip the animation of BGHash on startup.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Ungrab the shoutdown dialog as soon as possible. Fixes: #1398287
+	Approved by: Stephen M. Webb
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Ungrab the shoutdown dialog as soon as possible.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Set the correct size for the lockscreen message. Fixes: #1384242
+	Approved by: Brandon Schaefer, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix typo.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Set the correct size for the lockscreen message.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	replace the use of static glib with gi glib in AP test cases Fixes: #1397006
+	Approved by: Christopher Townsend
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	Gnome keygrabber AP test: switch to GI from static glib
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.1+15.04.20141128-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make sure GetScreenGeometry returns the correct value. Fixes: #1374785
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use initializer list.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make sure GetScreenGeometry returns the correct value.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: use gdbus to notfy upstart of service start/stop
+	
+	This fixes a memory leak caused by the nih dbus proxy Fixes: #1302955
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CMakeLists.txt: remove libnih dependency
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	debian/control: remove dependencies on libnih libraries, and upstart-bin
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UpstartWrapper: use upstart defined values for proxy name, path and interface
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: use gdbus to notfy upstart of service start/stop
+	
+	This fixes a memory leak caused by the nih dbus proxy
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: inject special key events back to the root window when a menu is opened
+	
+	This will make the multimedia keys to work also if an indicator menu is opened. Fixes: #738202, #1389247
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeKeyGrabber: fix indentation
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: reinject some keys also when in lockscreen mode
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: inject special key events back to the root window if a menu is opened
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: add support for indicatror horizontal scroll events when a menu is opened
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: use g_unix_signal_add to handle unix signals
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: ensure that proper window tiles and buttons are shown at the right place Fixes: #1384910, #1384958, #1385285
+	Approved by: Christopher Townsend, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: ignore mouse events when expo is active
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: don't move the title to the right when in expo mode
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use a deque for minimized windows, and keep them ordered correctly
+	
+	In this way we are sure that the first element of the list is always the top-maximized window
+	we have.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: don't consider a window obscured if we're in scale mode
+	
+	To make things better we should actually check whether the window is in the list of
+	the currently scaled list.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: use std::set:find
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: when filtering out windows in spread, make sure we unscale them Fixes: #1316265
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: when filtering out windows in spread, make sure we unscale them
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: make sure we always set a _NET_FRAME_EXTENTS for windows that requested it
+	
+	Correctly handle the _NET_REQUEST_FRAME_EXTENTS message, by always replying to the window
+	setting the guessed _NET_FRAME_EXTENTS property. Fixes: #1383429
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: make sure we always set a _NET_FRAME_EXTENTS for windows that requested it
+	
+	Correctly handle the _NET_REQUEST_FRAME_EXTENTS atom.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: allow to filter-out unmapped windows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Decorated Window: still paint decorations if on transformated windows in different workspaces Fixes: #1383468
+	Approved by: Eleni Maria Stea, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Decorated Window: still paint decorations if a window in a different workspace has transformations
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Unmap all windows during shutdown. Fixes: #1370017, #1375271
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove comment.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor changes suggested by Marco's review.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Revert changes to debian/changelog.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Allocate/Deallocate ShutdownNotifier when needed.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Cleanup ShutdownNotifier/SuspendNotifier.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Improve the logic behind SuspendNotifier.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Register for suspend after resuming.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove suspending/resuming signals from UScreen.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add SuspendNotifier.*
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge lp:unity.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Test suspend changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a log in case we cannot inhibit the shutdown.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add operator& to glib::Object.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Unmap the windows on shutdown.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix shutdown notifier and use it inside lockscreen controller.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Implement a shutdown notifier.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.1+14.10.20141016-0ubuntu1
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	LayoutSystem: make sure the exposed open windows are displayed in the "correct" order
+	
+	In expose mode the windows were placed in z-order starting by the top-most window that was always put in the bottom right corner. After the change the windows are placed in a similar order to their initial one.
+	
+	here's a video of the expose mode after the change: http://youtu.be/eYFTeJjaDQE Fixes: 1349281
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	merged scale-pos-fixes so that we use the window y to choose the row and
+	the x value of the center to order the window inside the row
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: don't duplicate loops, just iterate once in layout windows and find relative scaled window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LayoutSystem: reduce the GetRows calls in LayoutWindowsNearest
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	removed double call to LayoutGridWindows, GetRows is enough
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixes in the coding style etc
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	changed unityshell plugin to use the new layouting functions
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	added new layout functions for the expose mode
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: make edges independent from borders and properly update them on actions changed
+	
+	Now windows can have edges (handles) also if they are not fully decorated, and
+	the other way around.
+	Improved the logic to detect which kind of decorations are supported by windows
+	(so now we add shadows to windows with borders, and we do not to shaped ones).
+	Removed a lot of duplicated matrix/region computations.
+	Properly rebuild decorations when _NET_WM_ALLOWED_ACTIONS changes
+	Fixes to the ForceQuit dialog shadows (and support for backdrop mode). Fixes: 1276177, 1299741, 1301776, 1324104, 1364225, 1373695
+	Approved by: Brandon Schaefer, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager: update the active window only on _NET_ACTIVE_WINDOW updates
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: some code cleanup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: don't remove shadows to windows that have Motif borders set
+	
+	Such as gtk windows with HeaderBar when using Gtk <= 3.10
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: make possible for non-rectangular windows to have edges
+	
+	But only if they're resizable... Such as Chrome/Chromium when using its client
+	side decorations.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: correctly paint the backdrop version of the dialog
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: correctly scale the style border size
+	
+	Small regression, plus some cleanups
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: use DecorationElement and make Edge present also in borderless windows
+	
+	Windows with no border decorations might still have decoration edges so that they
+	can be resized properly. This was not possible before, because we were only adding
+	them to windows with full decorations with a top layout. Now windows can also
+	have only grab handles, but no borders.
+	
+	Reduced also a lot the calls to verify what a window support, keeping track of
+	the decoration elements.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use proper shadow offsets
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: add WindowDecorationElements that returns a bitset describing the elements available
+	
+	This function will allow to check which decoration elements are supported by a window
+	by using just a single call, that will check which elements should be added when decorating
+	the window. By returning a single unsigned that is a bitwise composition of values, we can
+	just use a single call to verify which elements are supported.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	XWindowManager: properly log error
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: add missing comments
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsEdgeBorders: add proper scaling support
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: don't add an external input border if the window is not resizable
+	
+	There's no need to take the input in the edges of a window if the window can't be resized
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: just initialize EdgeBorders, they will adapt depending on the window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsEdgeBorders: reduce the items number if we have a not resizable window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsEdgeBorders: only add the GrabEdge if the window is not resizable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TexturedItem: update the region when the geometry has been changed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: directly update and use quad.region instead of building a new one at each draw
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: include a CompRegion in TextureQuad, to avoid regeneration at each draw
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsTitle: we need to manually update the texture matrix here
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: avoid matrix updates when only a texture size changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: initialize a MatrixList for each TextureQuad, so we avoid to create one at each draw
+	
+	Keep a reference not to break old code
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: remove debugging code
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: don't paint decorations for windows that are in different workspaces
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: undecorate windows in showDesktop mode
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: don't (shadow)decorate windows that have a region mismatching their geometry
+	
+	This means that windows using XShape extensions to define a region that is different to
+	the actual window geometry, should not be decorated
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: make sure we set/unset the shadows accordingly
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: call updateSupportedWmHints after setting the handlers, or it won't work
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: queue decorations update on action changes, rebuild them on paint
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: update frame also on _NET_WM_ALLOWED_ACTIONS changes, to match actual actions
+	
+	Actions might change during execution, and only listening _MOTIF_WM_HINTS is not enough
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.1+14.10.20141015-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GLibSignal: don't call callback function if the object_ value is not matching the CB Fixes: 1366351
+	Approved by: Christopher Townsend
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StaticCairoText: use glib::Signal
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GLibSignal: don't call callback function if the object_ value is not matching the CB
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Remove bad tests that randomly fail 
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* DIsable test_proxy tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: wait the primary shield to get the grab before setting the session locked
+	
+	If that fails (and if the grab has never been gained during this locking session),
+	it's up to the Controller to decide whether the lock request has to be ignored.
+	So, if the primary shield fails to grab, before that the screen has ever been locked,
+	then we have to give up. Otherwise if it fails (but we were already locked), it's safe
+	to assume that this failure is due to the menus that are currently controlling the grab.
+	
+	Also setup the primary shield signal connections in a shared place and use a
+	connection::Manager to keep track of them. Fixes: 1368427, 1371764
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	MockIndicators: add CloseActiveEntry method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: remove useless logger definition
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: add missing new-line at the end of file
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: close the active indicator when the on lock screen request
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Indicators: add CloseActiveEntry method, that calls relative on u-p-s
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: add CloseActiveEntry method
+	
+	To force an indicator to be closed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: Activate the active entry during panel initialization
+	
+	In this way we get the pointer motion events tracked and the
+	proper indicator visual effect.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: don't include the monitor id on the panel name
+	
+	Even in multi-monitor, there's just only one panel in the lockscreen,
+	thus we need to sync the menu geometries for just one panel instance.
+	By doing this, if the primary shield gets moved to another monitor,
+	while a menu is open, we get the menu automagically moved to the new
+	monitor for free (as it's handled by u-p-s).
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: wait the primary shield to get the grab before setting the session locked
+	
+	If that fails (and if the grab has never been gained during this locking session),
+	it's up to the Controller to decide whether the lock request has to be ignored.
+	So, if the primary shield fails to grab, before that the screen has ever been locked,
+	then we have to give up. Otherwise if it fails (but we were already locked), it's safe
+	to assume that this failure is due to the menus that are currently controlling the grab.
+	
+	Also setup the primary shield signal connections in a shared place and use a
+	connection::Manager to keep track of them.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: add HasGrab method and grabbed and grab_failed signals
+	
+	It's not up to the shield to eventually unlock the screen if it can't take the grab
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: initialize the active state, based on the indicator status
+	
+	If an indicator is already open when the panel is created, we need to mark
+	the panel as active (in order to be able to get back the grab when the menu is closed).
+
[phone]  Iain Lane  <[e-mail]>
+
+	When grabbing keys, try prefixing "XF86" if the key isn't found. GNOME gives us unprefixed keys sometimes. Fixes: 1302885
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Iain Lane  <[e-mail]>
+
+	Compare with the value of key()
+
[phone]  Iain Lane  <[e-mail]>
+
+	Move {} onto their own lines
+
[phone]  Iain Lane  <[e-mail]>
+
+	GDK (sometimes) strips the "XF86" prefix from keys
+	
+	If compiz doesn't recognise the key, try with "XF86" prefixed, to keep
+	compatible with GNOME/unity-control-center.
+	
+	See: https://git.gnome.org/browse/mutter/commit/src/core/meta-accel-parse.c?id=8d29d22e991f8816f47529e366a947b3565993e8
+
[phone]  handsome_feng<[e-mail]>
+
+	added support for getting the distro name from /etc/os-release Fixes: 1329584
+	Approved by: Anthony Wong, Marco Trevisan (Treviño)
+
[phone]  handsome_feng<[e-mail]>
+
+	fix a leak and add a comment
+
[phone]  handsome_feng<[e-mail]>
+
+	move the function out from the constructor and get the string in a better way
+
[phone]  handsome_feng<[e-mail]>
+
+	Add support for getting the distro name from /etc/os-release
+
[phone]  Tim Lunn  <[e-mail]>
+
+	No change rebuild for gnome-desktop 3.12
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.1+14.10.20140915-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use COMPIZ_METAKEY where needed. Fixes: 1363534
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use COMPIZ_METAKEY where needed.
+
[phone]  Michael Zanetti  <[e-mail]>
+
+	add "items" key to Launcher schema to be used by unity8 Fixes: 1300650
+	Approved by: Michał Sawicz, Stephen M. Webb, PS Jenkins bot, Albert Astals Cid
+
[phone]  Michael Zanetti  <[e-mail]>
+
+	update camera and gallery to be click apps
+
[phone]  Michael Zanetti  <[e-mail]>
+
+	add some defaults
+
[phone]  Michael Zanetti  <[e-mail]>
+
+	3 slashes
+
[phone]  Michael Zanetti  <[e-mail]>
+
+	add empty default
+
[phone]  Michael Zanetti  <[e-mail]>
+
+	added "items" key in launcher schema for unity8's launcher
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.1+14.10.20140904-0ubuntu1
+
[phone]  Martin Pitt  <[e-mail]>
+
+	Adjust upstart dependency to upstart-bin. Fixes: 1351306
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Martin Pitt  <[e-mail]>
+
+	Adjust upstart dependency to upstart-bin
+	
+	unity-services is only concerned about session upstart, it does not care about
+	pid 1. Adjust the dependency to upstart-bin to allow uninstalling upstart and
+	installing systemd-sysv.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	update the unity manpage Fixes: 1059275
+	Approved by: Christopher Townsend, PS Jenkins bot
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	fixed typo
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	updated unity manpage
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Use CONFIG instead of CACHE to store the first_run.stamp
+	
+	Create a migration script to move the new stamp to the new location Fixes: 1328677
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Create a migration script to move the old stamp to the new location
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Change location first run stamp is stored
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When Show Desktop is active, it will set the tooltip icon as "Restore Windows". This is per workspace. So each time show_destop bool is updated in PluginAdapter, the Show Desktop icon will update its tooltip if needed. Fixes: 1237132
+	Approved by: Christopher Townsend, PS Jenkins bot
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* When Show Deskop is active (ie. the next time you pess the icon), it will show the tooltis: Restore Windows.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar, ActionButtons, IconRenderer: include the font scaling when scaling textual items
+	
+	User font scaling settings should be applied to all the items containing text.
+	Fixed some elements missing support. Fixes: 1332947, 1361713, 1362162, 1362346
+	Approved by: Andrea Azzarone, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: add some delay to wait gsettings changes
+	
+	Without this delay, in some cases, unity might be notified of changes that have not been really done, but
+	triggered by some internal component. This race was causing problems to the users using a floating
+	scaling setting.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: Update size based on font scaling options
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: use point-size for hint font
+	
+	In this way it supports font scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Tooltip: update the top/bottom spaces also when the text is bigger than default value
+	
+	Fixes small tooltips with scaled text
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterBasicButton: resize buttons based on the text scaling, and redraw them when it changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ActionButton: resize buttons based on the text scaling, and redraw them when it changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: set text absolute size keeping in account the user font scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconRenderer: share the icon labels only if they've the same size in multiple instances
+	
+	Otherwise generate each one for the provided size.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconRenderer: take in account the text scaling when building the icons overlay labels
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: set progress on icon render args Fixes: 1361679
+	Approved by: Christopher Townsend, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: set progress on icon render args
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Lockscreen: scale the UI elements based on current monitor scaling Fixes: 1292218
+	Approved by: PS Jenkins bot, Andrea Azzarone
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent lp:~andyrock/unity/fix-1308540 again
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextInput: resize the input item based on text scaling as well
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextInput: Use correct font scaling, based on settings to draw the lockscreen warning tooltip
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: foward declare SpaceLayout
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityShell: fix compilation issue
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Tests: fix compilation issues
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BackgroundSettings: use double value for size
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: update scaling if global settings change
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: rebuild the background if the scale changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BackgroundSettings: scale the background to match current monitor settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Lockscreen: some cleanup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the primary shield at the end of iteration
+	
+	It's the safer way, since otherwise we might set two primary shields at the same time,
+	and this might cause unparenting the Prompt View from the wrong parent, and thus
+	to destroy it.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: remove child prompt view when it's not primary anymore
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextInput: fix logic in toggling the activator visibility on spinner showing
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextInput: only show tooltip after a timeout
+	
+	The wait value is hardcoded to match the Gdk and unity tooltips value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UserPromptView: scale the text input to match the prompt view state
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextInput: add scaling support
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~andyrock/unity/fix-1332509
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextInput: cleanup unneeded includes in header file
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: cleanup unneeded includes in header file
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UserPromptView: keep track of scalable elements and apply scale updates when needed
+	
+	Also, avoid to recreate the background at every redraw, just do it when size changes.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTexture: better check for URI scheme
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: update scaling on prompt view only on primary shield
+	
+	Being a shared object it might cause troubles otherwise
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UserPromptView: basic scaling updating support
+	
+	Beware, when scale chages, the field seems to go away!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: setup scaling based on monitor, keep track of the CofView
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: correctly set the number of lines we want for the icon description
+	
+	Using the pango way
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UserPromptView: add scale property
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CofView: make the icon scalable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: Use RawPixel for GRID_SIZE
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: also adjust the layout padding based on scaling when monitor changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: don't keep a reference of the prompt view, just keep track of it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UserPromptView: initialize size inside the view itself
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: define lockscreen::Controller::Ptr for nicer usage
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: fix unityshell compilation, due to missing UserPromptView definition...
+	
+	Oh nux, I hate you when you behave like that!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~andyrock/unity/fix-1308540
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Share lockscreen password entry between screens. Fixes: 1308540
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge Marco's patch.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove un-needed include.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Revert po/* changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge with trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Share the lockscreen password entry between screens.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: make the Icon count width depending on the text value width Fixes: 796527, 1066971, 1361713
+	Approved by: Brandon Schaefer
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestLauncherModel: move to XTests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTextureSource: reset the cached count value when scaling settings change
+	
+	In this way we make sure we properly reset the icons matrices
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: honour the text scaling when drawing the launcher icon count emblem
+	
+	And update it when it changes.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: setting text is enough for count, no need accel
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: make count size even more dynamic, just base anything on font and icon sizes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTextureSource: remember the count value, so that we redraw when values change
+	
+	The emblem matrix needs to be updated accordingly.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: make the Icon count width depending on the text width
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconRenderer: draw count texture at proper scaling, built by LauncherIcon Fixes: 1353070, 1354498
+	Approved by: Christopher Townsend, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconRenderer: Use smaller sized emblem for Switcher icons
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: build scaled icon texture on IconRenderer request
+	
+	In this way we can scale also switcher icons with a different scale value than the one used
+	by the launcher.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: set the scaling based on the icon size as well
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: just use pixel ink size to position the count number
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: use GdkPango utilities
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconRenderer: draw count texture at proper scaling if available
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: build multiple count textures per each scaling value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTextureSource: add Count related functions
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconRenderer: scale the Emblem based on monitor scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher, Switcher: properly update the scale value of IconRenderer
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: only care about to the last connected remote entry
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.1+14.10.20140811-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Allow a distinct pam config file for greeter and for lock-screen. Fixes: 1305440
+	Approved by: Stephen M. Webb, PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add -DCMAKE_SYSCONFDIR=/etc to cmake_base_options id debian/rules.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add etc/pam.d to unity.install
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use CMAKE_SYSCONFDIR.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix typo.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add /etc/pam.d director to unity.install
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge lp:~3v1n0/unity/handle-gtk3.12-deprecations.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add missing file.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Revert unwanted change.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Avoid renaming.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Revert unwanted revision.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use unity config file in UserAuthenticatorPam
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Install the unity.pam file.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add data/pam/unity pam config file for unity lockscreen.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add an arrow activator in the lockscreen. Fixes: 1332509
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add missing media file.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable activator by default. Fix typo.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add an arrow activator in the lockscreen.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Split gsettings schemas into a separate binary package. Added a key for unity8. 
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix packaging
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix description
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Use scope schema for favorite scopes
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Split schemas into a separate package
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	Changed log message on failure to open xpathselect library from an error to a warning.
+	
+	The xpathselect library is used for introspection during automated test runs. It is not an error for this library to be unavailable in normal successful operating conditions. Fixes: 1345296
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	Changed log message on failure to open xpathselect library from an error to a warning.
+	
+	The xpathselect library is used for introspection during automated test runs.  It is not an error for this library to be unavailable in normal successful operating conditions.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: make sure we close the dash if DnD is accepted
+	
+	And we're about to focus the application window(s) Fixes: 1350331
+	Approved by: PS Jenkins bot, Andrea Azzarone
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: make sure we close the dash if DnD is accepted
+	
+	And we're about to focus the application window(s)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen, PanelService: get monitor at position, ignoring pre-multipled Gdk scale factor
+	
+	Get monitor position based on absolute coordinates, ignoring the pre-multipled
+	scaling factor that Gdk applies to all the monitor sizes.
+	
+	In this way we get the proper monitor index for absolute coordinates,
+	independently from the scaling factor. Fixes: 1351591
+	Approved by: Brandon Schaefer, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: get monitor at position, ignoring pre-multipled Gdk scale factor
+	
+	Get monitor position based on absolute coordinates, ignoring the pre-multipled
+	scaling factor that Gdk applies to all the monitor sizes.
+	
+	In this way we get the proper monitor index, independently from the scaling factor.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: get monitor at position, ignoring pre-multipled Gdk scale factor
+	
+	Get monitor position based on absolute coordinates, ignoring the pre-multipled
+	scaling factor that Gdk applies to all the monitor sizes.
+	
+	In this way we get the proper monitor index to attach the menu
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Make sure we check if the Quicklist or Alt+F1 key nav is open (so we can close them)
+	
+	Bore checking if something as a WM grab. As we cant open the hud is in Quicklist or KeyNav anymore. Fixes: 1353167
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Make sure we check if the Quicklist or Alt+F1 key nav is open (so we can close them)
+	before checking if something as a WM grab. As we cant open the hud is in Quicklist or KeyNav anymore.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, Switcher: use correct right/left scroll buttons for next/prev mouse selection Fixes: 1353383
+	Approved by: PS Jenkins bot, Andrea Azzarone
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Autopilot, Switcher: use correct right/left scroll buttons for next/prev mouse selection
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.0+14.10.20140731.1-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	This has a "soft" dependency on lp:~3v1n0/nux/horizontal-scroll-delta/+merge/227070, this means that this code would just work as it used to do (except for the SwitcerView fix) if that nux branch is not used, while it will support correctly horizontal scroll events when both the branches are used. Fixes: 1342208, 1342731
+	Approved by: Christopher Townsend, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: enable horizontal scrolling for icons
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: correctly handle nux horizontal scrolling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: switch to next icon on down/right scrolls, to previous icon on up/left
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: ignore horizontal scrolling
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	== Problem ==
+	Lockscreen capslock detection doesn't work well with remapped capslocks
+	
+	== Fix ==
+	Use gdk keymap to get the state of the caps lock. Fixes: 1347735
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix spacing and cb args.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove comments.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge lp:~andyrock/unity/fix-lp-1347735.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesOverlayVScrollBar: redirect the mouse wheel scroll events coming from the thumb to the scrollview
+	
+	This will make the scrollview to handle then and perform the same scrolling action it would do otherwise. Fixes: 1340992
+	Approved by: Brandon Schaefer, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesOverlayVScrollBar: redirect the mouse wheel scroll events coming from the thumb to the scrollview
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	VScrollBarOverlayWindow: accept mouse scroll events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: Add GrabScreen function and retry to make sure we really get grab
+	
+	It might happen that the grab is not possible because the PluginAdapter::IsScreenGrabbed
+	request has still not being fully processed, and thus nux is not able to grab the
+	pointer/keyboard. By doing this we instead try to grab the screen, and if this is
+	not happening, we wait a little until we don't get the ungrab event.
+	
+	In this way, if we eventually get the grab, all will work as expected.
+	Otherwise, we cancel the lock request (very unlikely to happen). Fixes: 1349128
+	Approved by: Brandon Schaefer
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: define max timeout to wait for grab as a const
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: make GrabScreen recursive
+	
+	In this way we call it both as callback of screen_ungrabbed signal and
+	as standalone function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: Add GrabScreen function and retry to make sure we really get grab
+	
+	It might happen that the grab is not possible because the PluginAdapter::IsScreenGrabbed
+	request has still not being fully processed, and thus nux is not able to grab the
+	pointer/keyboard. By doing this we instead try to grab the screen, and if this is
+	not happening, we wait a little until we don't get the ungrab event.
+	
+	In this way, if we eventually get the grab, all will work as expected.
+	Otherwise, we cancel the lock request (very unlikely to happen).
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: flush after ungrabbing the keyboard, or we might get into troubles
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesOverlayVScrollBar and VScrollBarOverlayWindow: add support for scaling
+	
+	Add a new ScrollView class to create ScrollViews with an OverlayScrollbar and with scaling support.
+	Using them in dash Scopes and Previews.
+	Fixes: 1340996
+	Approved by: Brandon Schaefer, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayScrollView: scale also the mouse-wheel scroll steps
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Tracks: extend our ScrollView, removing features we already handled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Previews: use dash::ScrollView for creating scrolled areas and set/update scaling on it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScopeView: rebase ScopeScrollView on unity::ScrollView
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayScrollView: a simple class to create nux scroll views that use our Overlay Scrollbars
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Preview: add a protected ScrollView class that children can use to create overlay scrollbars
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScopeView: just use a ROProperty for scale in the ScopeScrollView
+	
+	It's just a proxy class, so it doesn't need to have it's own value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScopeView: scale the scrolling views, and so the scroll bars to match the monitor scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	VScrollBarOverlayWindow: add support for scaling the Scrollbars thumbs
+	
+	\o/
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesOverlayVScrollBar: add support for scaling
+	
+	The nux::InputAreaProximity doesn't allow to change the proximity value, so extending it
+	(that it supports) is the best approach to update the internal values.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesVScrollBar: add support for scaling, don't build texture at every redraw, code cleanup
+	
+	The code was very old and buggy, now it doesn't redraw the textures everytime and uses smart
+	pointers
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixes FTBFS caused by gcc 4.9. Mostly unused functions. Fixes: 1350052
+	Approved by: PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Hopefully fixes arm issues
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixes FTBFS when moving to gcc 4.9. Mainly remove unused functions.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.0+14.10.20140711-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Hud: scale to match current DPI settings for monitor Fixes: 1340477
+	Approved by: PS Jenkins bot, Eleni Maria Stea
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestPaymentPreview: make sure that the header gets deleted or we'd get a CoverArt leak
+	
+	And that will break the TextureCache tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudButton: change the label property as a Read-only, fix failing test
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudController: set HudView scale to match current scaling factor for monitor and listen changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneHud: add scaling factor parameter
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudView: add scaling support
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudIcon: makesure we set the the proper icon size, to a fixed value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudButton: add scaling support
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayRendering: correctly scale the overlays borders and edges to match settings
+	
+	DashStyle has been modified to return smart pointers of textures that are loaded
+	depending on the scale level. The cache will make sure that we don't duplicate
+	the textures and that they get removed when not needed anymore.
+	
+	Also thanks to this the SearchBarSpinner textures (and the other spinners as well)
+	uses the SVGs scaled at the proper size (I desgined a new SVG for the magnifier,
+	as we only had a PNG). Fixes: 1283415, 1340394
+	Approved by: Eleni Maria Stea, PS Jenkins bot
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CoverArt: make possible the image to be stretched again
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestPaymentPreview: make sure that the header gets deleted or we'd get a CoverArt leak
+	
+	And that will break the TextureCache tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TextureCache: it looks like our Hash function was flawed, and in some cases gave false positive
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	RawPixel: add default parameter set to 0
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestPlacesGroup: correctly implement the mock style to match new API
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	resources: remove obsolete files
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: make sure we update the launcher size also on launchers added later
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: properly scale the launcher width to match monitor scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayRenderer: initialze scaling to match the default monitor settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: load the Spinner textures scaling the SVGs
+	
+	Added a new svg texture for the search magnifier, and load all the textures at the proper scaling level
+	to have better looking textures.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: add support for loading scaled dash corners, and use them in OverlayRenderer
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayRenderer: scale dash borders to match current scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: return ObjectPtr of textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterWidgets: add support for scaling Fixes: 1340171
+	Approved by: PS Jenkins bot, Eleni Maria Stea
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterRatingsWidget: add support for scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterMultiRangeButton: ensure that we redraw on scale changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterRatingsButton: simply extend RatingsButton, remove a lot of duplicated code
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	RatingsButton: make sure we always pull the virtual function to get/set ratings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	RatingsButton: correctly scale the ratings button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestPlacesGroup: fix RawPixel's initialization
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterMultiRangeWidget: scale buttons
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterMultiRangeButton: add scalability support
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterBasicButton: correctly scale down the button, set fixed height
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterGenreWidget: add scaling support for internal Genre butttons
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Filter{Genre,MultiRange,Ratings}Widget: Scale the "All" button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterBasicButton: add ability to draw scaled buttons
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Mergin with lp:~3v1n0/unity/dash-style-rawpixel
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterExpanderLabel: actually scale content
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterBar: correctly scale elements
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashView, HudView, SpreadFilter: adapt to the SearchBar changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: correctly scale the filter layout and the expander view
+	
+	Also set the search bar height by default.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScopeBar: make sure it gets redrawn on scale changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: return RawPixel's instead of integers for sizes, and avoid duplication in code 
+	Approved by: PS Jenkins bot, Eleni Maria Stea
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestPlacesGroup: fix RawPixe's initialization
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Dash: remove duplicated RawPixel.h inclusions
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~unity-team/unity/previews-scaling-final
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Dash: avoid unneeded duplication of RawPixel's
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: use property when convenient, remove obsolete methods
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneHud: fix initialization crashes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayRenderer: add first basic scaling support
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBarSpinner: make sure we set the scaling (and min/max size) on startup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: return RawPixel's instead of integers for sizes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Previews: scale the dash preview contents to match current monitor scaling
+	
+	Improved also the scaling of search-bar, spinner, categories and many other components. Fixes: 1339629
+	Approved by: PS Jenkins bot, Eleni Maria Stea, Marco Trevisan (Treviño)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneDash: fix crash on close
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CoverArt: correclty scale thumbnails and spinner
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PreviewContainer: make sure we redraw when scale has been updated
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: make sure we don't call a not initialized pimpl value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Previews: add support for --scaling-factor=X.Y parameter to standalone versions
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Fix standalone previews icon paths
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Previews: Lots of fixes to Social, Tracks and General previews and dash views
+	
+	Merging lp:~3v1n0/unity/previews-scaling-improved
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: correctly scale the cairo generated-texture
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PreviewStyle: reduce the default size for status icons
+	
+	As they were using 1px border
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTexture: remove hardcoded border
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBarSpinner: make sure we set the scaling (and min/max size) on startup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScopeView: scale the "No results" message
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ResultRendererHorizontalTile: correctly scale the width/height of the selected texture
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: initialize scaling on filters
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Track: set min/max sizes, not only max twice
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesGroup, SearchBar: reset min/max sizes when updating the scale
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: set the spinner scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBarSpinner: draw the spinner at scaled size
+	
+	This is fine for now, but for better quality we should reload the textures at scaled size
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PreviewContainer: use layout padding instead of a space, and update it to match scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Track: correctly set the maximum duration width considering the scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Tracks: don't limit the track width, make sure we relayout and cleanup code
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Track: correctly resize play/pause icons
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesGroup: update expand icon size when scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTexture: use view geometry if drawing in STRETCH_WITH_ASPECT mode
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesGroup: make name to correctly resize down when scaling down
+	
+	Also correctly scale some missing bits
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: consider monitor scaling when defining the form factor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Preview: don't use first monitor scale as default, or we'll break other assumptions
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneSocialPreview: add retweet icon
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneDash: add support for parsing arguments and setting default scope
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	StandaloneDash: support passing the scaling parameter
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashView: don't use EMConverter, just a scale property
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Preview: initialize scaling to default settings value
+	
+	In this way we don't have to update scaling again if things don't change later
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PreviewNavigator: make sure that we update the ImageTexture view size, not the img size
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ActionButton: re-initialize theme on scale changes
+	
+	This makes the textures to be regenerated with correct device scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ActionButton: set the button device scaling, to make sure they get properly scaled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashStyle: get the proper width value based on the surface scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Dash previews: various code cleanups and improvements
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SocialPreview: fix pre-layouting to correcty resize and put items
+	
+	And avoid crashes for unset comments_layout_
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SocialPreviewComments: correctly scale all the comments (not only the last one)
+	
+	There's no need to update the scaling here, it's just better to rebuild the whole view
+	if the scale changes.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SocialPreviewContent: use proper cairo scaling when drawing the bubble
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PaymentPreview: avoid startup crash, make sure that views are set before scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~hikiko/unity/unity.scale-track
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	merged music preview changes
+	(removed unnecessary check in DashView)
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	removed unnecessary check
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed problems in SocialPreview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed stars size
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	set Maximum/Minimum width in tracks.cpp just in case
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed track size in album in music preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixes
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled PreviewNavigator
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes in ApplicationPreview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes in ApplicationPreview.cpp
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed application preview setup views
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	undo last change
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes in infohint layout
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed space layout in Preview container
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scale fixes in MusicPreview and Tracks.cpp
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed album_data_layout in music preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	changed MusicPreview to scale tracks
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled tracks
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled track and components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	text 
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	added signal update scale - backup
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.scale-social-preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled social preview content
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled SocialPreviewComments and components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled SocialPreview and widgets except SocialComments, SocialContent
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.scale-payment-musicpayment
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scale ActionLinks in Preview base class,
+	other minor fixes
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed more music payment previews widgets
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled more components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	call update scale in ctor
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled MusicPaymentPreview components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled PaymentPreview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.layouts-fix
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	initialized all layouts to avoid seg faults
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge lp:~hikiko/unity/unity.scale-music-preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes, fixed all segmentation faults by uninitialized values
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed more segmentation faults
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed scaling issues
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled MusicPreview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.scale-movie-preview 
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.3.0+14.10.20140708-0ubuntu1
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	Scaled MoviePreview and widgets 
+	Approved by: Marco Trevisan (Treviño), PS Jenkins bot
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge lp:~hikiko/unity/unity.scale-error-preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled MoviePreview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge lp:~hikiko/unity/unity.scale-error-preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled ErrorPreview 
+	Approved by: PS Jenkins bot, PS Jenkins bot, Marco Trevisan (Treviño), PS Jenkins bot
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge  lp:~hikiko/unity/unity.scale-generic-preview-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.scale-generic-preview-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	more fixes
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed PreLayoutManagement
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	coding style changes to match the other previews
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.scale-generic-preview-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed comp error
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge to:  lp:~hikiko/unity/unity.scale-generic-preview-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled ErrorPreview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge: lp:~hikiko/unity/unity.scale-generic-preview-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	Scaled GenericPreview and its widgets. 
+	Approved by: PS Jenkins bot, PS Jenkins bot, PS Jenkins bot, PS Jenkins bot, Marco Trevisan (Treviño)
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge lp:~hikiko/unity/unity.scale-application-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed PreLayoutManagement
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge lp:~hikiko/unity/unity.scale-application-components 
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed PreLayout management to match the app-preview
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed comp error 
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge to https://code.launchpad.net/~hikiko/unity/unity.scale-application-components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	scaled GenericPreview and its components
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	local merge https://code.launchpad.net/~hikiko/unity/unity.scale-application-components/+merge/223208
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	merged: https://code.launchpad.net/~hikiko/unity/unity.preview-container-components/+merge/222906
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	locally merged:      bzr branch lp:~hikiko/unity/unity.em-size-in-preview-style 
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	Scaled the ApplicationPreview and the containing widgets and components.