diff options
| author | Eleni Maria Stea <elenimaria.stea@canonical.com> | 2017-03-17 13:08:54 +0200 |
|---|---|---|
| committer | Eleni Maria Stea <elenimaria.stea@canonical.com> | 2017-03-17 13:08:54 +0200 |
| commit | fe1bdcc4e37eb9a8a6661d49106552d4986fe87f (patch) | |
| tree | 4588be492b1cb33684ebb47013bcda43b00a644f | |
| parent | 66b5ff362f69898e758bb690da68ce45b63e63b7 (diff) | |
indentation and bash fixes
(bzr r4213.3.11)
| -rw-r--r-- | decorations/DecorationsWindowButton.cpp | 2 | ||||
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 9 | ||||
| -rwxr-xr-x | tools/compiz-profile-selector.in | 4 | ||||
| -rw-r--r-- | unity-shared/UnitySettings.cpp | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/decorations/DecorationsWindowButton.cpp b/decorations/DecorationsWindowButton.cpp index c7bbbb73b..4a0302d58 100644 --- a/decorations/DecorationsWindowButton.cpp +++ b/decorations/DecorationsWindowButton.cpp @@ -46,7 +46,7 @@ WindowButton::WindowButton(CompWindow* win, WindowButtonType wbt) void WindowButton::UpdateTexture() { if (auto tex = DataPool::Get()->ButtonTexture(scale(), type(), GetCurrentState())) - SetTexture(DataPool::Get()->ButtonTexture(scale(), type(), GetCurrentState())); + SetTexture(tex); } WidgetState WindowButton::GetCurrentState() const diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 591fb8e70..12c426a21 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -297,11 +297,10 @@ UnityScreen::UnityScreen(CompScreen* screen) renderer.find("Mesa X11") != std::string::npos || renderer.find("llvmpipe") != std::string::npos || renderer.find("softpipe") != std::string::npos || - (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1) - ) - { - unity_settings_.low_gfx = true; - } + (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1)) + { + unity_settings_.low_gfx = true; + } if (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 0) { diff --git a/tools/compiz-profile-selector.in b/tools/compiz-profile-selector.in index 2cd08261f..9c4fbce9d 100755 --- a/tools/compiz-profile-selector.in +++ b/tools/compiz-profile-selector.in @@ -7,7 +7,7 @@ if [ -z "$config_dir" ]; then fi default_ini="$config_dir/compiz-1/compizconfig/Default.ini" -if [ -f default_ini ]; then +if [ -f "$default_ini" ]; then rm "$default_ini" fi @@ -17,7 +17,7 @@ if ! /usr/lib/nux/unity_support_test -p; then compiz_profile="ubuntu-lowgfx" fi -if [ "$(gsettings get com.canonical.Unity lowgfx)" == true ]; then +if [ "$(gsettings get com.canonical.Unity lowgfx)" == "true" ]; then compiz_profile="ubuntu-lowgfx" fi diff --git a/unity-shared/UnitySettings.cpp b/unity-shared/UnitySettings.cpp index f7a71966f..da719ca0e 100644 --- a/unity-shared/UnitySettings.cpp +++ b/unity-shared/UnitySettings.cpp @@ -295,7 +295,7 @@ public: bool GetLowGfx() const { - return g_settings_get_boolean(usettings_, LOWGFX.c_str()); + return g_settings_get_boolean(usettings_, LOWGFX.c_str()); } int GetFontSize() const |