Bump mce-dev version to 1.19.0

Merge branch 'jb20728_blank_ignored_call' into 'master'
Add D-Bus method for ignoring incoming call See merge request !1
2016-05-04 12:56:55 +03:00 · 2016-05-04 09:53:47 +00:00 · 2016-04-12 14:31:19 +03:00 · 2015-09-14 11:45:58 +03:00 · 2015-09-14 11:43:42 +03:00 · 2015-09-13 21:03:22 +03:00
5 changed files with 47 additions and 7 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mce-dev (1.19.0) unstable; urgency=low
+
+  * [powerkey] Add method for ignoring incoming call. JB#20728
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Wed, 04 May 2016 12:54:34 +0300
+
+mce-dev (1.18.0) unstable; urgency=low
+
+  * [powerkey] Add constants for powerkey events. Fixes MER#1310
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 14 Sep 2015 11:44:27 +0300
+
 mce-dev (1.17.0) unstable; urgency=low

  * [mce] Add D-Bus constants for exposing display blanking policy.
--- a/include/mce/dbus-names.h
+++ b/include/mce/dbus-names.h
@@ -241,6 +241,19 @@
 */
 #define MCE_CALL_STATE_CHANGE_REQ	"req_call_state_change"

+/** Inform mce that incoming call has been ignored by ui
+ *
+ * When there is an incoming call, mce reserves the power key
+ * for silencing the ringing tone.
+ *
+ * This method can be used by the call ui to inform mce that the
+ * call has been ignored and power key can be used for display
+ * power control even though there are calls in ringing state.
+ *
+ * @since v1.19.0
+ */
+#define MCE_IGNORE_INCOMING_CALL_REQ	"req_ignore_incoming_call"
+
 /**
 * Unblank display
 *
@@ -345,10 +358,8 @@
 *                trigger; @c FALSE == short powerkey press,
 *                         @c TRUE == long powerkey press
 * @since v1.10.54
- * @param type @c dbus_uint32_t with the type of powerkey event to
- *                trigger; @c 0 == short powerkey press,
- *                         @c 1 == long powerkey press,
- *                         @c 2 == double powerkey press
+ * @param type @c dbus_uint32_t with the type of powerkey event to trigger
+ *             (see @ref mce/mode-names.h for valid events)
 */
 #define MCE_TRIGGER_POWERKEY_EVENT_REQ	"req_trigger_powerkey_event"

@@ -595,7 +606,6 @@
 */
 #define MCE_CONFIG_CHANGE_SIG		"config_change_ind"

-
 /*@}*/

 /**
--- a/include/mce/mode-names.h
+++ b/include/mce/mode-names.h
@@ -239,5 +239,23 @@
 * @since v1.8.88
 */
 #define MCE_CABC_MODE_MOVING_IMAGE		"moving-image"
+/**
+ * POWERKEY EVENT for single powerkey press
+ *
+ * @since v1.10.54
+ */
+#define MCE_POWERKEY_EVENT_SHORT_PRESS        (0u)
+/**
+ * POWERKEY EVENT for long powerkey press
+ *
+ * @since v1.10.54
+ */
+#define MCE_POWERKEY_EVENT_LONG_PRESS         (1u)
+/**
+ * POWERKEY EVENT for double powerkey press
+ *
+ * @since v1.10.54
+ */
+#define MCE_POWERKEY_EVENT_DOUBLE_PRESS       (2u)

 #endif /* _MCE_MODE_NAMES_H_ */
--- a/mce.pc
+++ b/mce.pc
@@ -3,7 +3,7 @@ includedir=${prefix}/include

 Name: mce
 Description: Mode Control Entity
-Version: 1.17.0
+Version: 1.19.0
 Requires:
 Libs:
 Cflags: -I${includedir}
--- a/rpm/mce-headers.spec
+++ b/rpm/mce-headers.spec
@@ -1,6 +1,6 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.17.0
+Version:    1.19.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
Author	SHA1	Message	Date
Simo Piiroinen	13e1c2b3c0	Bump mce-dev version to 1.19.0	2016-05-04 12:56:55 +03:00
spiiroin	34edc46e9e	Merge branch 'jb20728_blank_ignored_call' into 'master' Add D-Bus method for ignoring incoming call See merge request !1	2016-05-04 09:53:47 +00:00
Simo Piiroinen	358243f960	[powerkey] Add method for ignoring incoming call. JB#20728	2016-04-12 14:31:19 +03:00
Simo Piiroinen	e6e96ef67f	Bump mce-dev version to 1.18.0	2015-09-14 11:45:58 +03:00
Simo Piiroinen	002e5fd865	Merge pull request #11 from kimmoli/powerkeytriggers Add constants for powerkey events	2015-09-14 11:43:42 +03:00
Kimmo Lindholm	62d5ea325f	[powerkey] Add constants for powerkey events. Fixes MER#1310 New constants * MCE_POWERKEY_EVENT_SHORT_PRESS * MCE_POWERKEY_EVENT_LONG_PRESS * MCE_POWERKEY_EVENT_DOUBLE_PRESS	2015-09-13 21:03:22 +03:00