Attachment 88646 Details for Bug 71230 – [4/4] Remove remnants of ConnMan integration, we now use GLib-Networking

[patch] [4/4] Remove remnants of ConnMan integration, we now use GLib-Networking

0004-Remove-remnants-of-ConnMan-integration-we-now-use-GL.patch (text/plain), 1.32 KB, created by Simon McVittie on 2013-11-04 18:52:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

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

Size: 1.32 KB

patch

obsolete

>From 13de3f148446e493a82b1fca647956b956b931b8 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 4 Nov 2013 18:42:21 +0000
>Subject: [PATCH 4/5] Remove remnants of ConnMan integration, we now use
> GLib-Networking
>
>---
> configure.ac    | 1 -
> src/Makefile.am | 2 --
> 2 files changed, 3 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index da943f2..6a2f35a 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -272,6 +272,5 @@ Configure summary:
>     Features:
>         Plugin API documentation.....:  ${enable_gtk_doc}
>         Network Manager integration..:  ${have_nm}
>-        ConnMan integration..........:  ${have_connman}
>         Connectivity GSetting........:  ${enable_conn_setting}
> "
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 3c19b00..b89b973 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
> 	   $(DBUS_CFLAGS) \
> 	   $(GLIB_CFLAGS) \
> 	   $(NETWORK_MANAGER_CFLAGS) \
>-	   $(CONNMAN_CFLAGS) \
> 	   -DG_LOG_DOMAIN=\"mcd\" \
> 	   -DMCD_PLUGIN_LOADER_DIR=\"@libdir@/mission-control-plugins.@MCP_ABI_VERSION@\" \
> 	   -DMC_DISABLE_DEPRECATED -I$(top_srcdir)
>@@ -65,7 +64,6 @@ libmcd_convenience_la_LIBADD = \
> 	$(DBUS_LIBS) \
> 	$(GLIB_LIBS) \
> 	$(NETWORK_MANAGER_LIBS) \
>-	$(CONNMAN_LIBS) \
> 	$(NULL)
> 
> noinst_LTLIBRARIES = libmcd-convenience.la
>-- 
>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.