Import upstream version 3.1.3upstream-3.1.3

(bzr r55.4.32)

41 files changed, 33 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 925aeb581..ebf411b67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (unity)
 cmake_minimum_required(VERSION 2.8)
 
-subdirs (unity services tests)
+subdirs (libunity services tests)
 
 #
 # Base bits
@@ -9,7 +9,7 @@ subdirs (unity services tests)
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 3)
 set (UNITY_MINOR 1)
-set (UNITY_MICRO 1)
+set (UNITY_MICRO 3)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "3.0")
 
@@ -51,7 +51,7 @@ configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 #
 # Data
 #
-file (GLOB _datafiles "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
+file (GLOB _datafiles "${CMAKE_CURRENT_SOURCE_DIR}/resources/*")
 install (FILES ${_datafiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/${UNITY_MAJOR}/)
 
 #
@@ -78,7 +78,7 @@ set (UNITY_PLUGIN_DEPS "nux-0.9 libbamf dbus-glib-1 dee-1.0 gio-2.0 gio-unix-2.0
 
 find_package (Compiz REQUIRED)
 include (CompizPlugin)
-compiz_plugin (unity 
+compiz_plugin (unityshell
 PKGDEPS ${UNITY_PLUGIN_DEPS}
 PLUGINDEPS composite opengl
 CFLAGSADD "-DINSTALLPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -DPKGDATADIR='\"${CMAKE_INSTALL_PREFIX}/share/unity/3\"' -I${CMAKE_BINARY_DIR}"
diff --git a/unity/CMakeLists.txt b/libunity/CMakeLists.txt
index 593feb6b6..b7c6746e2 100644
--- a/unity/CMakeLists.txt
+++ b/libunity/CMakeLists.txt
@@ -1,12 +1,12 @@
-set (PKGNAME "unity-${UNITY_API_VERSION}")
+set (PKGNAME unity)
 
 #
 # unity.pc
 #
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$") # You hear that? It's kittens being killed by the gods of cmake
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.pc.cmake ${CMAKE_BINARY_DIR}/unity/${PKGNAME}.pc)
-install (FILES ${CMAKE_BINARY_DIR}/unity/${PKGNAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.pc.cmake ${CMAKE_BINARY_DIR}/libunity/${PKGNAME}.pc)
+install (FILES ${CMAKE_BINARY_DIR}/libunity/${PKGNAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/)
 
 #
 # libunity
@@ -14,6 +14,17 @@ install (FILES ${CMAKE_BINARY_DIR}/unity/${PKGNAME}.pc DESTINATION ${CMAKE_INSTA
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 dee-1.0 gee-1.0 dbus-glib-1 clutter-1.0 clutk-0.3 gconf-2.0)
 
+# Bump this one when a binary-incompatible change is introduced
+set (libunity_SOVERSION ${UNITY_MAJOR})
+
+# Bump this one when the API is extended in a binary-compatible way
+set (libunity_API_VERSION 0)
+
+# Bump this one when changes do not extend the API
+set (libunity_PATCH_VERSION 0)
+
+set (libunity_VERSION ${libunity_SOVERSION}.${libunity_API_VERSION}.${libunity_PATCH_VERSION})
+
 set(CFLAGS
	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
 "-I/usr/include/gee-1.0" -DGETTEXT_PACKAGE=\"unity\" -I${CMAKE_BINARY_DIR}
@@ -65,5 +76,11 @@ vala_precompile (VALA_C chrome-handler.vala
 )
 
 add_library (${PKGNAME} SHARED ${VALA_C})
+set_target_properties (${PKGNAME} PROPERTIES
+ VERSION ${libunity_VERSION}
+ SOVERSION ${libunity_SOVERSION}
+ )
+
+
 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
-install (FILES ${CMAKE_BINARY_DIR}/unity/unity.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PKGNAME}/unity/)
+install (FILES ${CMAKE_BINARY_DIR}/libunity/unity.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PKGNAME}/unity/)
diff --git a/unity/chrome-handler.vala b/libunity/chrome-handler.vala
index e08c22565..e08c22565 100644
--- a/unity/chrome-handler.vala
+++ b/libunity/chrome-handler.vala
diff --git a/unity/drag-controller.vala b/libunity/drag-controller.vala
index e31078ab4..e31078ab4 100644
--- a/unity/drag-controller.vala
+++ b/libunity/drag-controller.vala
diff --git a/unity/drag-view.vala b/libunity/drag-view.vala
index a8996d4cf..a8996d4cf 100644
--- a/unity/drag-view.vala
+++ b/libunity/drag-view.vala
diff --git a/unity/entry.vala b/libunity/entry.vala
index 21130bb60..21130bb60 100644
--- a/unity/entry.vala
+++ b/libunity/entry.vala
diff --git a/unity/icon-postprocessor.vala b/libunity/icon-postprocessor.vala
index f4c21f58d..f4c21f58d 100644
--- a/unity/icon-postprocessor.vala
+++ b/libunity/icon-postprocessor.vala
diff --git a/unity/prism-handler.vala b/libunity/prism-handler.vala
index 14312e5d4..14312e5d4 100644
--- a/unity/prism-handler.vala
+++ b/libunity/prism-handler.vala
diff --git a/unity/quicklist-rendering.vala b/libunity/quicklist-rendering.vala
index 652282200..652282200 100644
--- a/unity/quicklist-rendering.vala
+++ b/libunity/quicklist-rendering.vala
diff --git a/unity/shell.vala b/libunity/shell.vala
index 52dff4ccf..52dff4ccf 100644
--- a/unity/shell.vala
+++ b/libunity/shell.vala
diff --git a/unity/theme.vala b/libunity/theme.vala
index c429dbf0b..c429dbf0b 100644
--- a/unity/theme.vala
+++ b/libunity/theme.vala
diff --git a/unity/unity-appinfo-manager.vala b/libunity/unity-appinfo-manager.vala
index 24d82f04b..24d82f04b 100644
--- a/unity/unity-appinfo-manager.vala
+++ b/libunity/unity-appinfo-manager.vala
diff --git a/unity/unity-cairo-canvas.vala b/libunity/unity-cairo-canvas.vala
index 8b1738fef..8b1738fef 100644
--- a/unity/unity-cairo-canvas.vala
+++ b/libunity/unity-cairo-canvas.vala
diff --git a/unity/unity-expanding-bin.vala b/libunity/unity-expanding-bin.vala
index c2ce82f34..c2ce82f34 100644
--- a/unity/unity-expanding-bin.vala
+++ b/libunity/unity-expanding-bin.vala
diff --git a/unity/unity-favorites.vala b/libunity/unity-favorites.vala
index 178495294..178495294 100644
--- a/unity/unity-favorites.vala
+++ b/libunity/unity-favorites.vala
diff --git a/unity/unity-io.vala b/libunity/unity-io.vala
index 20d6938d1..20d6938d1 100644
--- a/unity/unity-io.vala
+++ b/libunity/unity-io.vala
diff --git a/unity/unity-layered-bin.vala b/libunity/unity-layered-bin.vala
index 67bd013cc..67bd013cc 100644
--- a/unity/unity-layered-bin.vala
+++ b/libunity/unity-layered-bin.vala
diff --git a/unity/unity-pixbuf-cache.vala b/libunity/unity-pixbuf-cache.vala
index 5b1e630ed..5b1e630ed 100644
--- a/unity/unity-pixbuf-cache.vala
+++ b/libunity/unity-pixbuf-cache.vala
diff --git a/unity/unity-place-activation.vala b/libunity/unity-place-activation.vala
index 2b5602e5b..2b5602e5b 100644
--- a/unity/unity-place-activation.vala
+++ b/libunity/unity-place-activation.vala
diff --git a/unity/unity-place-browser.vala b/libunity/unity-place-browser.vala
index 8fbeed7c7..8fbeed7c7 100644
--- a/unity/unity-place-browser.vala
+++ b/libunity/unity-place-browser.vala
diff --git a/unity/unity-place-renderer.vala b/libunity/unity-place-renderer.vala
index 903d80978..903d80978 100644
--- a/unity/unity-place-renderer.vala
+++ b/libunity/unity-place-renderer.vala
diff --git a/unity/unity-place.vala b/libunity/unity-place.vala
index ea6ad787b..ea6ad787b 100644
--- a/unity/unity-place.vala
+++ b/libunity/unity-place.vala
diff --git a/unity/unity-stripe-texture.vala b/libunity/unity-stripe-texture.vala
index d8979a6e4..d8979a6e4 100644
--- a/unity/unity-stripe-texture.vala
+++ b/libunity/unity-stripe-texture.vala
diff --git a/unity/unity.pc.cmake b/libunity/unity.pc.cmake
index dca6cc0e2..dca6cc0e2 100644
--- a/unity/unity.pc.cmake
+++ b/libunity/unity.pc.cmake
diff --git a/unity/webapp-fetcher.vala b/libunity/webapp-fetcher.vala
index edddbd2af..edddbd2af 100644
--- a/unity/webapp-fetcher.vala
+++ b/libunity/webapp-fetcher.vala
diff --git a/data/2indicate_54x54.png b/resources/2indicate_54x54.png
index 5b89cbc3c..5b89cbc3c 100644
--- a/data/2indicate_54x54.png
+++ b/resources/2indicate_54x54.png
diff --git a/data/3indicate_54x54.png b/resources/3indicate_54x54.png
index 1bfb72bc8..1bfb72bc8 100644
--- a/data/3indicate_54x54.png
+++ b/resources/3indicate_54x54.png
diff --git a/data/4indicate_54x54.png b/resources/4indicate_54x54.png
index 065677772..065677772 100644
--- a/data/4indicate_54x54.png
+++ b/resources/4indicate_54x54.png
diff --git a/data/bfb.png b/resources/bfb.png
index 8ef5a1412..8ef5a1412 100644
--- a/data/bfb.png
+++ b/resources/bfb.png
diff --git a/data/focused_indicator.png b/resources/focused_indicator.png
index 42fdad3b2..42fdad3b2 100644
--- a/data/focused_indicator.png
+++ b/resources/focused_indicator.png
diff --git a/data/round_corner_50x50.png b/resources/round_corner_50x50.png
index 8c29e3a07..8c29e3a07 100644
--- a/data/round_corner_50x50.png
+++ b/resources/round_corner_50x50.png
diff --git a/data/round_corner_54x54.png b/resources/round_corner_54x54.png
index b8eb9597f..b8eb9597f 100644
--- a/data/round_corner_54x54.png
+++ b/resources/round_corner_54x54.png
diff --git a/data/round_outline_50x50.png b/resources/round_outline_50x50.png
index db1dd8010..db1dd8010 100644
--- a/data/round_outline_50x50.png
+++ b/resources/round_outline_50x50.png
diff --git a/data/round_outline_54x54.png b/resources/round_outline_54x54.png
index 1250c9de4..1250c9de4 100644
--- a/data/round_outline_54x54.png
+++ b/resources/round_outline_54x54.png
diff --git a/data/round_shine_54x54.png b/resources/round_shine_54x54.png
index 87697f412..87697f412 100644
--- a/data/round_shine_54x54.png
+++ b/resources/round_shine_54x54.png
diff --git a/data/running_indicator.png b/resources/running_indicator.png
index 3169ec967..3169ec967 100644
--- a/data/running_indicator.png
+++ b/resources/running_indicator.png
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index 183d0b910..66309cc4f 100644
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Panel Service
 #
 find_package(PkgConfig)
-pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator)
+pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator x11)
 
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/src/unity.cpp b/src/unity.cpp
index c9290e7e8..72c2b7fe3 100644
--- a/src/unity.cpp
+++ b/src/unity.cpp
@@ -402,15 +402,15 @@ UnityScreen::onRedrawRequested ()
 
 void
 UnityScreen::optionChanged (CompOption *opt,
- UnityOptions::Options num)
+ UnityshellOptions::Options num)
 {
 switch (num)
 {
- case UnityOptions::LauncherAutohide:
+ case UnityshellOptions::LauncherAutohide:
 launcher->SetAutohide (optionGetLauncherAutohide (),
 (nux::View *) panelView->HomeButton ());
 break;
- case UnityOptions::LauncherFloat:
+ case UnityshellOptions::LauncherFloat:
 launcher->SetFloating (optionGetLauncherFloat ());
 break;
 default:
diff --git a/src/unity.h b/src/unity.h
index e35b1e5fe..9c2027a11 100644
--- a/src/unity.h
+++ b/src/unity.h
@@ -39,7 +39,7 @@
 #include <opengl/opengl.h>
 
 /* This is the options class header created for us automatically on build with BCOP */
-#include "unity_options.h"
+#include "unityshell_options.h"
 
 #include "Launcher.h"
 #include "LauncherController.h"
@@ -71,7 +71,7 @@ class UnityScreen :
 /* And finally, because we are using BCOP to generate our options, it creates a class
 * with a bunch of getters and setters that are added to out class when we inherit it. Yay.
 */
- public UnityOptions
+ public UnityshellOptions
 {
 
 public:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e091abb0a..9b1890638 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Unit tests
 #
 find_package (PkgConfig)
-pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${UNITY_PLUGIN_DEPS} dbus-glib-1)
+pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${UNITY_PLUGIN_DEPS} dbus-glib-1 x11)
 
 set (CFLAGS ${TEST_UNIT_DEPS_CFLAGS} ${TEST_UNIT_DEPS_CFLAGS_OTHER})
 add_definitions (${CFLAGS})
diff --git a/unity.xml.in b/unityshell.xml.in
index 13a18f94a..ce46c42f4 100644
--- a/unity.xml.in
+++ b/unityshell.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <compiz>
- <plugin name="unity" useBcop="true">
+ <plugin name="unityshell" useBcop="true">
	<_short>Ubuntu Unity Plugin</_short>
	<_long>Plugin to draw the Unity Shell</_long>
	<deps>