Attachment 88645 Details for Bug 71230 – [3/4] Remove remnants of integration with Maemo MCE

[patch] [3/4] Remove remnants of integration with Maemo MCE

0003-Remove-remnants-of-integration-with-Maemo-MCE.patch (text/plain), 2.58 KB, created by Simon McVittie on 2013-11-04 18:52:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-04 18:52:20 UTC

Size: 2.58 KB

patch

obsolete

>From b8be40b5e05fb9cb97e9a45423a270b3194958b7 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 4 Nov 2013 18:41:29 +0000
>Subject: [PATCH 3/5] Remove remnants of integration with Maemo MCE
>
>---
> configure.ac              | 8 --------
> src/mcd-connection.c      | 2 +-
> tests/twisted/Makefile.am | 8 --------
> 3 files changed, 1 insertion(+), 17 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 36452b7..da943f2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -178,13 +178,6 @@ PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0],
> AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
> AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], [Prevent post 2.36 APIs])
> 
>-dnl Check for MCE, a Maemo service used to determine when the device is idle.
>-PKG_CHECK_MODULES([MCE], mce >= 1.5, [HAVE_MCE=yes], [HAVE_MCE=no])
>-AM_CONDITIONAL([HAVE_MCE], [test x"$HAVE_MCE" = xyes])
>-if test x"$HAVE_MCE" = xyes; then
>-  AC_DEFINE([HAVE_MCE], [1], [Define if mce is available])
>-fi
>-
> # -----------------------------------------------------------
> # Connectivity integration
> # -----------------------------------------------------------
>@@ -281,5 +274,4 @@ Configure summary:
>         Network Manager integration..:  ${have_nm}
>         ConnMan integration..........:  ${have_connman}
>         Connectivity GSetting........:  ${enable_conn_setting}
>-        Nokia Mode Control Entity....:  ${HAVE_MCE}
> "
>diff --git a/src/mcd-connection.c b/src/mcd-connection.c
>index cf8044e..78b25b9 100644
>--- a/src/mcd-connection.c
>+++ b/src/mcd-connection.c
>@@ -1879,7 +1879,7 @@ mcd_connection_class_init (McdConnectionClass * klass)
>     g_object_class_install_property
>         (object_class, PROP_SLACKER,
>          g_param_spec_object ("slacker",
>-                              "MCE slacker",
>+                              "Slacker",
>                               "Slacker object notifies us of user inactivity",
>                               MCD_TYPE_SLACKER,
>                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
>diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
>index 67f7721..d62c521 100644
>--- a/tests/twisted/Makefile.am
>+++ b/tests/twisted/Makefile.am
>@@ -143,13 +143,6 @@ nobase_nodist_twistedtests_DATA = \
> 	$(NULL)
> endif
> 
>-
>-if HAVE_MCE
>-HAVE_MCE_PYBOOL = True
>-else
>-HAVE_MCE_PYBOOL = False
>-endif
>-
> if HAVE_NM
> HAVE_NM_PYBOOL = True
> else
>@@ -158,7 +151,6 @@ endif
> 
> config.py: Makefile
> 	$(AM_V_GEN) { \
>-		echo "HAVE_MCE = $(HAVE_MCE_PYBOOL)"; \
> 		echo "HAVE_NM = $(HAVE_NM_PYBOOL)"; \
> 	} > $@
> 
>-- 
>1.8.4.2
>

Actions: View | Splinter Review

Attachments on bug 71230: 88643 | 88644 | 88645 | 88646 | 88696

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.