I have made the following changes intended for : CE:MW:Shared / mce-headers CE:MW:Shared / mce
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7223 Thank You, Islam Amer [This message was auto-generated] --- Request # 7223: Messages from BOSS: State: review at 2012-10-31T18:37:39 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:iamer:branches:CE:MW:Shared / mce-headers -> CE:MW:Shared / mce-headers changes files: -------------- --- mce-headers.changes +++ mce-headers.changes @@ -0,0 +1,4 @@ +* Wed Oct 31 2012 Islam Amer <[email protected]> - 1.12.2 +- Version bump to 1.12.2 to sync with mce version +- Added MCE_TK_LOCKED_DELAY + old: ---- mce-dev-1.11.0.tar.bz2 new: ---- mce-dev-1.12.2.tar.bz2 spec files: ----------- --- mce-headers.spec +++ mce-headers.spec @@ -10,11 +10,11 @@ # << macros Summary: Development files for mce -Version: 1.11.0 +Version: 1.12.2 Release: 1 Group: Development/Libraries License: LGPLv2 -URL: http://meego.gitorious.org/meego-middleware/mce-dev/ +URL: https://github.com/nemomobile/mce-dev Source0: %{_shortname}-%{version}.tar.bz2 Source100: mce-headers.yaml Patch0: %{name}-1.10.24-no-ownership.patch other changes: -------------- ++++++ mce-dev-1.11.0.tar.bz2 -> mce-dev-1.12.2.tar.bz2 --- debian/changelog +++ debian/changelog @@ -1,3 +1,10 @@ +mce-dev (1.12.2) oneiric; urgency=low + + * Added MCE_TK_LOCKED_DELAY + * Version sync with mce itself + + -- Simo Piiroinen <[email protected]> Wed, 31 Oct 2012 19:38:56 +0200 + mce-dev (1.11.0) unstable; urgency=low * Added MCE_COLOR_PROFILE_GET, MCE_COLOR_PROFILE_IDS_GET, --- include/mce/mode-names.h +++ include/mce/mode-names.h @@ -120,6 +120,12 @@ */ #define MCE_TK_LOCKED_DIM "locked-dim" /** + * Touchscreen/Keypad locked with delay + * + * @since v1.12.2 + */ +#define MCE_TK_LOCKED_DELAY "locked-delay" +/** * Touchscreen/Keypad silently locked with fadeout * * @since v1.4.15 --- mce.pc +++ mce.pc @@ -3,7 +3,7 @@ Name: mce Description: Mode Control Entity -Version: 1.11.0 +Version: 1.12.2 Requires: Libs: Cflags: -I${includedir} ++++++ mce-headers.yaml --- mce-headers.yaml +++ mce-headers.yaml @@ -1,10 +1,10 @@ Name: mce-headers Summary: Development files for mce -Version: 1.11.0 +Version: 1.12.2 Release: 1 Group: Development/Libraries License: LGPLv2 -URL: http://meego.gitorious.org/meego-middleware/mce-dev/ +URL: https://github.com/nemomobile/mce-dev Sources: - "%{_shortname}-%{version}.tar.bz2" Patches: submit: home:iamer:branches:CE:MW:Shared / mce -> CE:MW:Shared / mce changes files: -------------- --- mce.changes +++ mce.changes @@ -0,0 +1,5 @@ +* Wed Oct 31 2012 Islam Amer <[email protected]> - 1.12.2 +- New git tag +- Support for locking the touch screen without blanking the display +- Depends on new mce-dev version + old: ---- mce-1.12.1.tar.bz2 new: ---- mce-1.12.2.tar.bz2 spec files: ----------- --- mce.spec +++ mce.spec @@ -1,6 +1,6 @@ Name: mce Summary: Mode Control Entity for Nokia mobile computers -Version: 1.12.1 +Version: 1.12.2 Release: 1 Group: System/System Control License: LGPLv2 @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(dsme) >= 0.58 BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.18.0 -BuildRequires: pkgconfig(mce) >= 1.10.21 +BuildRequires: pkgconfig(mce) >= 1.12.2 BuildRequires: kernel-headers >= 2.6.32 BuildRequires: libi2c-devel other changes: -------------- ++++++ mce-1.12.1.tar.bz2 -> mce-1.12.2.tar.bz2 --- Makefile +++ Makefile @@ -3,7 +3,7 @@ # Written by David Weinehall # Modified by Tuomo Tanskanen -VERSION := 1.12.1 +VERSION := 1.12.2 INSTALL := install --mode=755 INSTALL_DIR := install -d --- debian/changelog +++ debian/changelog @@ -1,3 +1,9 @@ +mce (1.12.2) unstable; urgency=low + + * Support for locking the touch screen without blanking the display + + -- Simo Piiroinen <[email protected]> Wed, 31 Oct 2012 19:48:24 +0200 + mce (1.12.1) unstable; urgency=low * Added updates from Mer/Nemo to upstream git --- debian/control +++ debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Santtu Lakkala <[email protected]> Uploaders: Philippe De Swert <[email protected]>, Pekka Lundström <[email protected]>, Tuomo Tanskanen <[email protected]>, Jukka Turunen <[email protected]>, Jyrki Hämäläinen <[email protected]> -Build-Depends: debhelper (>= 5.0.0), mce-dev (>= 1.11.0), pkg-config, libglib2.0-dev (>= 2.18.0), libdbus-1-dev (>= 1.0.2), libdbus-glib-1-dev, libdsme0.2.0-dev (>= 0.58), libgconf2-dev, linux-kernel-headers (>= 2.6.32-20100102) | linux-libc-dev (>= 2.6.32), dpkg-dev (>= 1.13.19), libi2c-dev, aegis-builder (>= 1.4), libcal-dev (>= 0.2.4) +Build-Depends: debhelper (>= 5.0.0), mce-dev (>= 1.12.2), pkg-config, libglib2.0-dev (>= 2.18.0), libdbus-1-dev (>= 1.0.2), libdbus-glib-1-dev, libdsme0.2.0-dev (>= 0.58), libgconf2-dev, linux-kernel-headers (>= 2.6.32-20100102) | linux-libc-dev (>= 2.6.32), dpkg-dev (>= 1.13.19), libi2c-dev, aegis-builder (>= 1.4), libcal-dev (>= 0.2.4) Standards-Version: 3.8.4 Package: mce --- mce.h +++ mce.h @@ -213,7 +213,9 @@ /** Enable proximity lock (no UI); write only */ LOCK_ON_PROXIMITY = 5, /** Toggle lock state; write only */ - LOCK_TOGGLE = 6 + LOCK_TOGGLE = 6, + /** Delayed lock; write only */ + LOCK_ON_DELAYED = 7 } lock_state_t; /** Battery status */ --- tklock.c +++ tklock.c @@ -1722,6 +1722,7 @@ case LOCK_ON: case LOCK_ON_DIMMED: case LOCK_ON_PROXIMITY: + case LOCK_ON_DELAYED: if (((submode & MCE_BOOTUP_SUBMODE) != 0) && (is_malf_state_enabled() == FALSE) && ((lock_state != LOCK_ON_PROXIMITY) || @@ -1784,6 +1785,14 @@ setup_tklock_visual_blank_timeout(); break; + case LOCK_ON_DELAYED: + synthesise_inactivity(); + enable_tklock(); + + saved_tklock_state = MCE_TKLOCK_LOCKED_STATE; + setup_tklock_visual_blank_timeout(); + break; + case LOCK_TOGGLE: /* Touchscreen/keypad lock */ if ((is_tklock_enabled() == FALSE) || @@ -1931,6 +1940,8 @@ set_tklock_state(LOCK_ON); } else if (!strcmp(MCE_TK_LOCKED_DIM, mode)) { set_tklock_state(LOCK_ON_DIMMED); + } else if (!strcmp(MCE_TK_LOCKED_DELAY, mode)) { + set_tklock_state(LOCK_ON_DELAYED); } else if (!strcmp(MCE_TK_UNLOCKED, mode)) { set_tklock_state(LOCK_OFF); --- tools/mcetool.c +++ tools/mcetool.c @@ -221,6 +221,7 @@ " valid modes are:\n" " ``locked'', " "``locked-dim'',\n" + " ``locked-delay'',\n" " and ``unlocked''\n" " --enable-led enable LED framework\n" " --disable-led disable LED framework\n" @@ -852,7 +853,7 @@ * Enable/disable the tklock * * @param mode The mode to change to; valid modes: - * "locked", "locked-dim", "unlocked" + * "locked", "locked-dim", "locked-delay", "unlocked" * @return TRUE on success, FALSE on FAILURE */ static gboolean set_tklock_mode(gchar **mode)
