Merge lp:~xapantu/switchboard-plug-power/fix-brightness-scale-on-debian into lp:~elementary-apps/switchboard-plug-power/trunk

[xapantu]

Update to the new GSD API with conditional compilation

This patch enable Brightness dbus API, to set brightness scale.

On debian Jessie g-s-d is at version 3.14. Works for Archlinux too.

[gandalfn (gandalfn)]

works perfectly on debian, just needs a new build deps on gnome-settings-daemon-dev

review: Approve

[kay van der Zander (kay20)]

i have tested the branch on freya and i doubt you have test it on freya.
with gnome-settings-daemon-dev installed it doesn't compile with g-s-d version 3.8.x

"kay@kay-N55SF:~/Documents/elementary/test/fix-brightness-scale-on-debian/build$ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-- The C compiler identification is GNU 4.8.4
-- The CXX compiler identification is GNU 4.8.4
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26")
-- checking for modules 'gthread-2.0;gtk+-3.0;switchboard-2.0;granite;gnome-settings-daemon'
-- found gthread-2.0, version 2.42.2
-- found gtk+-3.0, version 3.14.15
-- found switchboard-2.0, version 2.0
-- found granite, version 0.3.0
-- found gnome-settings-daemon, version 3.8.6.1
-- Found Vala: /usr/bin/valac
-- checking for a minimum Vala version of 0.22.0
-- found Vala, version 0.28.1
-- Configuring done
-- Generating done
-- Build files have been written to: /home/kay/Documents/elementary/test/fix-brightness-scale-on-debian/build
kay@kay-N55SF:~/Documents/elementary/test/fix-brightness-scale-on-debian/build$ make
Scanning dependencies of target i18n
[ 16%] messages.”
[ 16%] Built target i18n
[ 33%] Generating Plug.c;ActionComboBox.c;TimeoutComboBox.c;/home/kay/Documents/elementary/test/fix-brightness-scale-on-debian/build/src/config.c
Unknown option --defined=OLD_GSD
Run '/usr/bin/valac --help' to see a full list of available command line options.
make[2]: *** [src/pantheon-power_valac.stamp] Error 1
make[1]: *** [src/CMakeFiles/pantheon-power.dir/all] Error 2
make: *** [all] Error 2"

line 41 comment contradicts the cmakelists file (i know you didn't touch it but update it than)
is it >=3.10 or >=3.14

good that you used the current code style it wouldn't look good if you used the new code style.

review: Needs Fixing (not compilable)

[kay van der Zander (kay20)]

it compiles on debian jessie 8.1

[gandalfn (gandalfn)]

> i have tested the branch on freya and i doubt you have test it on freya.
> with gnome-settings-daemon-dev installed it doesn't compile with g-s-d version
> 3.8.x
>
> "kay@kay-N55SF:~/Documents/elementary/test/fix-brightness-scale-on-
> debian/build$ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
> -- The C compiler identification is GNU 4.8.4
> -- The CXX compiler identification is GNU 4.8.4
> -- Check for working C compiler: /usr/bin/cc
> -- Check for working C compiler: /usr/bin/cc -- works
> -- Detecting C compiler ABI info
> -- Detecting C compiler ABI info - done
> -- Check for working CXX compiler: /usr/bin/c++
> -- Check for working CXX compiler: /usr/bin/c++ -- works
> -- Detecting CXX compiler ABI info
> -- Detecting CXX compiler ABI info - done
> -- Found PkgConfig: /usr/bin/pkg-config (found version "0.26")
> -- checking for modules 'gthread-2.0;gtk+-3.0;switchboard-2.0;granite;gnome-
> settings-daemon'
> -- found gthread-2.0, version 2.42.2
> -- found gtk+-3.0, version 3.14.15
> -- found switchboard-2.0, version 2.0
> -- found granite, version 0.3.0
> -- found gnome-settings-daemon, version 3.8.6.1
> -- Found Vala: /usr/bin/valac
> -- checking for a minimum Vala version of 0.22.0
> -- found Vala, version 0.28.1
> -- Configuring done
> -- Generating done
> -- Build files have been written to: /home/kay/Documents/elementary/test/fix-
> brightness-scale-on-debian/build
> kay@kay-N55SF:~/Documents/elementary/test/fix-brightness-scale-on-
> debian/build$ make
> Scanning dependencies of target i18n
> [ 16%] messages.”
> [ 16%] Built target i18n
> [ 33%] Generating
> Plug.c;ActionComboBox.c;TimeoutComboBox.c;/home/kay/Documents/elementary/test
> /fix-brightness-scale-on-debian/build/src/config.c
> Unknown option --defined=OLD_GSD
> Run '/usr/bin/valac --help' to see a full list of available command line
> options.
> make[2]: *** [src/pantheon-power_valac.stamp] Error 1
> make[1]: *** [src/CMakeFiles/pantheon-power.dir/all] Error 2
> make: *** [all] Error 2"
>
>
> line 41 comment contradicts the cmakelists file (i know you didn't touch it
> but update it than)
> is it >=3.10 or >=3.14
>
> good that you used the current code style it wouldn't look good if you used
> the new code style.

To build package a new build-deps under gnome-settings-daemon-dev is needed

[kay van der Zander (kay20)]

The else case provided in the CmakeLists.txt is not working. It is made that it should work with older and newer packages of g-s-d, it still needs fixing.
Otherwise you could remove the old code if there is not intention to have backward compatibility.
But there must be backward compatibility at this point.

[xapantu (xapantu)]

Yes I couldn't test it with a so old version of GSD. I made a typo, I just updated the patch, it should work now.

I did not test in GSD 3.10, I assume the one who wrote that comment was right.

[kay van der Zander (kay20)]

oke it works. please repull from trunk to avoid revision problems

[lp:~xapantu/switchboard-plug-power/fix-brightness-scale-on-debian]

250. By xapantu on 2015-08-20

Update to the new gsd api with conditional compilation

[kay van der Zander (kay20)]

meets the requirements.
tested on freya 3.0 and debian 8.1

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-03-04 09:11:56 +0000
+++ debian/control	2015-08-20 10:55:21 +0000
@@ -6,7 +6,8 @@
                debhelper (>= 9),
                libgranite-dev,
                libswitchboard-2.0-dev,
-               valac (>= 0.22)
+               valac (>= 0.22),
+               gnome-settings-daemon-dev
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/switchboard-plug-power
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-12-04 15:05:06 +0000
+++ src/CMakeLists.txt	2015-08-20 10:55:21 +0000
@@ -1,7 +1,13 @@
 find_package (PkgConfig)
 
 # Add all your dependencies to the list below
-pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 switchboard-2.0 granite)
+pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 switchboard-2.0 granite gnome-settings-daemon)
+
+if(${DEPS_gnome-settings-daemon_VERSION} VERSION_GREATER 3.10 OR ${DEPS_gnome-settings-daemon_VERSION} VERSION_EQUAL 3.10)
+	set(VALA_DEFINED_VAR "")
+else()
+	set(VALA_DEFINED_VAR "--define=OLD_GSD")
+endif()
 
 add_definitions (${DEPS_CFLAGS})
 link_directories (${DEPS_LIBRARY_DIRS})
@@ -23,6 +29,7 @@
     granite
 OPTIONS
     --thread
+	${VALA_DEFINED_VAR}
 )
 
 add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C})

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-08-19 17:44:41 +0000
+++ src/Plug.vala	2015-08-20 10:55:21 +0000
@@ -4,12 +4,14 @@
 	Gtk.Box stack_container;
 	
 	[DBus (name = "org.gnome.SettingsDaemon.Power.Screen")]
-
 	interface PowerSettings : GLib.Object {
+#if OLD_GSD
 		public abstract uint GetPercentage () throws IOError;
 		public abstract uint SetPercentage (uint percentage) throws IOError;
+#else
 		// use the Brightness property after updateing g-s-d to 3.10 or above
-		// public abstract int Brightness {get; set; }
+		public abstract int Brightness {get; set; }
+#endif
 	}
 
 	[DBus (name = "org.freedesktop.UPower")]
@@ -151,7 +153,11 @@
 				}
 
 				if (show_brightness) {
+#if OLD_GSD
 					scale.set_value (screen.GetPercentage ());
+#else
+					scale.set_value (screen.Brightness);
+#endif
 				} else {
 					warning ("No battery found, hiding brightness settings");
 				}
@@ -171,8 +177,11 @@
 			scale.value_changed.connect (() => {
 				var val = (int) scale.get_value ();
 				try {
-					// screen.Brightness = val;
+#if OLD_GSD
 					screen.SetPercentage (val);
+#else
+					screen.Brightness = val;
+#endif
 				} catch (IOError ioe) {
 					// ignore, because if we have GetPercentage, we have SetPercentage
 					// otherwise the scale won't be visible to change