Attachment #412102 for bug #553946




#----------------------------------------------
# Network Manager Stuff

PKG_CHECK_MODULES(MODEM_MANAGER, mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
                  [have_modemmanager=yes], have_modemmanager=no)
if test "x$have_modemmanager" = xno ; then
        AC_MSG_WARN(*** ModemManager will not be supported ***)
else
    AC_DEFINE(BUILD_MODEM, 1, [Define 1 to build ModemManager support])
fi
AM_CONDITIONAL(BUILD_MODEM, [test x$have_modemmanager = xyes])

PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
                  libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
                  libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION,
                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
                  [have_networkmanager=yes], have_networkmanager=no)
if test "x$have_networkmanager" = xno ; then
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)




	net-device-simple.h				\
	net-device-ethernet.c				\
	net-device-ethernet.h				\
	net-device-mobile.c				\
	net-device-mobile.h				\
	net-device-bond.c				\
	net-device-bond.h				\
	net-device-bridge.c				\

	cc-network-panel.c				\
	cc-network-panel.h

if BUILD_MODEM
libnetwork_la_SOURCES +=			\
	net-device-mobile.c				\
	net-device-mobile.h
NETWORK_PANEL_CFLAGS += -DBUILD_MODEM
endif

TEAM_FILES = net-device-team.c net-device-team.h
EXTRA_DIST = $(TEAM_FILES)
if HAVE_NM_UNSTABLE

Lines 48-54 Link Here

(-)a/a/panels/network/cc-network-panel.c (-2 / +10 lines)
48	#include "network-dialogs.h"	48	#include "network-dialogs.h"
49	#include "connection-editor/net-connection-editor.h"	49	#include "connection-editor/net-connection-editor.h"
50		50
		51	#ifdef BUILD_MODEM
51	#include <libmm-glib.h>	52	#include <libmm-glib.h>
		53	#endif
52		54
53	CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)	55	CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
54		56
Lines 70-76 struct _CcNetworkPanelPrivate Link Here
70	GtkBuilder *builder;	72	GtkBuilder *builder;
71	GtkWidget *treeview;	73	GtkWidget *treeview;
72	NMClient *client;	74	NMClient *client;
		75	#ifdef BUILD_MODEM
73	MMManager *modem_manager;	76	MMManager *modem_manager;
		77	#else
		78	void *modem_manager;
		79	#endif
74	NMRemoteSettings *remote_settings;	80	NMRemoteSettings *remote_settings;
75	gboolean updating_device;	81	gboolean updating_device;
76	guint nm_warning_idle;	82	guint nm_warning_idle;
Lines 1435-1441 cc_network_panel_init (CcNetworkPanel *panel) Link Here
1435	G_CALLBACK (device_added_cb), panel);	1441	G_CALLBACK (device_added_cb), panel);
1436	g_signal_connect (panel->priv->client, "device-removed",	1442	g_signal_connect (panel->priv->client, "device-removed",
1437	G_CALLBACK (device_removed_cb), panel);	1443	G_CALLBACK (device_removed_cb), panel);
1438		1444	#ifdef BUILD_MODEM
1439	/* Setup ModemManager client */	1445	/* Setup ModemManager client */
1440	system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);	1446	system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
1441	if (system_bus == NULL) {	1447	if (system_bus == NULL) {
Lines 1454-1460 cc_network_panel_init (CcNetworkPanel *panel) Link Here
1454	}	1460	}
1455	g_object_unref (system_bus);	1461	g_object_unref (system_bus);
1456	}	1462	}
1457		1463	#else
		1464	panel->priv->modem_manager = NULL;
		1465	#endif
1458	widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,	1466	widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
1459	"add_toolbutton"));	1467	"add_toolbutton"));
1460	g_signal_connect (widget, "clicked",	1468	g_signal_connect (widget, "clicked",

Return to bug 553946

Lines 133-144 PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES) Link Here

(-)a/a/configure.ac (-2 / +10 lines)
133	#----------------------------------------------	133	#----------------------------------------------
134	# Network Manager Stuff	134	# Network Manager Stuff
135		135
		136	PKG_CHECK_MODULES(MODEM_MANAGER, mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
		137	[have_modemmanager=yes], have_modemmanager=no)
		138	if test "x$have_modemmanager" = xno ; then
		139	AC_MSG_WARN(* ModemManager will not be supported *)
		140	else
		141	AC_DEFINE(BUILD_MODEM, 1, [Define 1 to build ModemManager support])
		142	fi
		143	AM_CONDITIONAL(BUILD_MODEM, [test x$have_modemmanager = xyes])
		144
136	PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION	145	PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
137	libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION	146	libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
138	libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION	147	libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
139	libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION	148	libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
140	libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION	149	libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION,
141	mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
142	[have_networkmanager=yes], have_networkmanager=no)	150	[have_networkmanager=yes], have_networkmanager=no)
143	if test "x$have_networkmanager" = xno ; then	151	if test "x$have_networkmanager" = xno ; then
144	AC_MSG_WARN(* Network panel will not be built (NetworkManager or ModemManager not found) *)	152	AC_MSG_WARN(* Network panel will not be built (NetworkManager or ModemManager not found) *)

Lines 32-39 libnetwork_la_SOURCES = \ Link Here

(-)a/a/panels/network/Makefile.am (-2 / +7 lines)
32	net-device-simple.h \	32	net-device-simple.h \
33	net-device-ethernet.c \	33	net-device-ethernet.c \
34	net-device-ethernet.h \	34	net-device-ethernet.h \
35	net-device-mobile.c \
36	net-device-mobile.h \
37	net-device-bond.c \	35	net-device-bond.c \
38	net-device-bond.h \	36	net-device-bond.h \
39	net-device-bridge.c \	37	net-device-bridge.c \
Lines 51-56 libnetwork_la_SOURCES = \ Link Here
51	cc-network-panel.c \	49	cc-network-panel.c \
52	cc-network-panel.h	50	cc-network-panel.h
53		51
		52	if BUILD_MODEM
		53	libnetwork_la_SOURCES += \
		54	net-device-mobile.c \
		55	net-device-mobile.h
		56	NETWORK_PANEL_CFLAGS += -DBUILD_MODEM
		57	endif
		58
54	TEAM_FILES = net-device-team.c net-device-team.h	59	TEAM_FILES = net-device-team.c net-device-team.h
55	EXTRA_DIST = $(TEAM_FILES)	60	EXTRA_DIST = $(TEAM_FILES)
56	if HAVE_NM_UNSTABLE	61	if HAVE_NM_UNSTABLE