[gnome-control-center] Revert "network: Allow compiling against NM 0.9.6"
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Revert "network: Allow compiling against NM 0.9.6"
- Date: Tue, 12 Feb 2013 16:43:25 +0000 (UTC)
commit f094cc0e6ec0929354837d9de00ddc79af38edf8
Author: Aleksander Morgado <aleksander lanedo com>
Date: Tue Feb 12 17:27:23 2013 +0100
Revert "network: Allow compiling against NM 0.9.6"
This reverts commit ec704ab62f0ad6b96736e04375d9af851c146217.
This will effectively bump again the NM requirement to 0.9.7.995.
configure.ac | 13 +-----
panels/network/cc-network-panel.c | 21 ----------
.../connection-editor/net-connection-editor.c | 2 -
panels/network/net-device-bridge.c | 4 --
panels/network/net-device-wifi.c | 2 -
panels/network/panel-common.c | 41 --------------------
panels/network/panel-common.h | 2 -
7 files changed, 3 insertions(+), 82 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index da7a568..d5f39aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,10 +99,8 @@ CANBERRA_REQUIRED_VERSION=0.13
GDKPIXBUF_REQUIRED_VERSION=2.23.0
POLKIT_REQUIRED_VERSION=0.103
GSD_REQUIRED_VERSION=3.7.3
-NETWORK_MANAGER_REQUIRED_VERSION=0.9.6.4
-NETWORK_MANAGER_DESIRED_VERSION=0.9.7.995
-NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.6
-NETWORK_MANAGER_APPLET_DESIRED_VERSION=0.9.7.995
+NETWORK_MANAGER_REQUIRED_VERSION=0.9.7.995
+NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.7.995
LIBNOTIFY_REQUIRED_VERSION=0.7.3
GNOME_DESKTOP_REQUIRED_VERSION=3.7.5
SCHEMAS_REQUIRED_VERSION=3.7.2.2
@@ -185,7 +183,7 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_V
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,
+ libnm-gtk >= $NETWORK_MANAGER_APPLET_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 $NETWORK_MANAGER_REQUIRED_VERSION or newer not found) ***)
@@ -199,11 +197,6 @@ if test x${have_networkmanager} = xyes; then
NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
AC_SUBST(NM_VPN_CONFIG_DIR)
AC_SUBST(NM_VPN_MODULE_DIR)
-
- PKG_CHECK_MODULES(NM_UNSTABLE, NetworkManager >= $NETWORK_MANAGER_DESIRED_VERSION
- libnm-gtk >= $NETWORK_MANAGER_APPLET_DESIRED_VERSION,
- [AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define if using NetworkManager and network-manager-applet from git master])],
- [:])
fi
# Check for gnome-bluetooth
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index e40e9fa..dee9af4 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -30,9 +30,7 @@
#include "nm-client.h"
#include "nm-device.h"
#include "nm-device-modem.h"
-#ifdef HAVE_NM_UNSTABLE
#include "nm-ui-utils.h"
-#endif
#include "net-device.h"
#include "net-device-mobile.h"
@@ -486,7 +484,6 @@ cc_network_panel_get_devices (CcNetworkPanel *panel)
static void
panel_refresh_device_titles (CcNetworkPanel *panel)
{
-#ifdef HAVE_NM_UNSTABLE
GPtrArray *ndarray, *nmdarray;
NetDevice **devices;
NMDevice **nm_devices, *nm_device;
@@ -520,10 +517,8 @@ panel_refresh_device_titles (CcNetworkPanel *panel)
g_free (titles);
g_ptr_array_free (ndarray, TRUE);
g_ptr_array_free (nmdarray, TRUE);
-#endif
}
-
static gboolean
handle_argv_for_device (CcNetworkPanel *panel,
NMDevice *device,
@@ -637,7 +632,6 @@ state_changed_cb (NMDevice *device,
static gboolean
panel_add_device (CcNetworkPanel *panel, NMDevice *device)
{
- const gchar *title;
GtkListStore *liststore_devices;
GtkTreeIter iter;
NMDeviceType type;
@@ -668,9 +662,7 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
device_g_type = NET_TYPE_DEVICE_WIFI;
break;
case NM_DEVICE_TYPE_BOND:
-#ifdef HAVE_NM_UNSTABLE
case NM_DEVICE_TYPE_BRIDGE:
-#endif
case NM_DEVICE_TYPE_VLAN:
goto out;
default:
@@ -679,7 +671,6 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
}
/* create device */
- title = panel_device_to_localized_string (device);
net_device = g_object_new (device_g_type,
"panel", panel,
"removable", FALSE,
@@ -688,7 +679,6 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
"remote-settings", panel->priv->remote_settings,
"nm-device", device,
"id", nm_device_get_udi (device),
- "title", title,
NULL);
/* add as a panel */
@@ -1097,10 +1087,8 @@ panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection)
connection_type = nm_setting_connection_get_connection_type (s_con);
if (!strcmp (connection_type, NM_SETTING_BOND_SETTING_NAME))
device_g_type = NET_TYPE_DEVICE_BOND;
-#ifdef HAVE_NM_UNSTABLE
else if (!strcmp (connection_type, NM_SETTING_BRIDGE_SETTING_NAME))
device_g_type = NET_TYPE_DEVICE_BRIDGE;
-#endif
else
device_g_type = NET_TYPE_VIRTUAL_DEVICE;
@@ -1126,16 +1114,7 @@ panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection)
liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
"liststore_devices"));
-#ifdef HAVE_NM_UNSTABLE
title = nma_utils_get_connection_device_name (connection);
-#else
- if (!strcmp (connection_type, NM_SETTING_BOND_SETTING_NAME))
- title = g_strdup (_("Bond"));
- else if (!strcmp (connection_type, NM_SETTING_VLAN_SETTING_NAME))
- title = g_strdup (_("VLAN"));
- else
- title = g_strdup (_("Unknown"));
-#endif
net_object_set_title (NET_OBJECT (net_virt), title);
gtk_list_store_append (liststore_devices, &iter);
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index 4f78bd9..3e667e8 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -584,9 +584,7 @@ typedef struct {
static const NetConnectionType connection_types[] = {
{ N_("VPN"), nm_setting_vpn_get_type },
{ N_("Bond"), nm_setting_bond_get_type },
-#ifdef HAVE_NM_UNSTABLE
{ N_("Bridge"), nm_setting_bridge_get_type },
-#endif
{ N_("VLAN"), nm_setting_vlan_get_type }
};
static const NetConnectionType *vpn_connection_type = &connection_types[0];
diff --git a/panels/network/net-device-bridge.c b/panels/network/net-device-bridge.c
index d0a660f..ad850e9 100644
--- a/panels/network/net-device-bridge.c
+++ b/panels/network/net-device-bridge.c
@@ -21,8 +21,6 @@
#include "config.h"
-#ifdef HAVE_NM_UNSTABLE
-
#include <glib-object.h>
#include <glib/gi18n.h>
@@ -190,5 +188,3 @@ net_device_bridge_init (NetDeviceBridge *device_bridge)
{
device_bridge->priv = NET_DEVICE_BRIDGE_GET_PRIVATE (device_bridge);
}
-
-#endif /* HAVE_NM_UNSTABLE */
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 051856a..9ed1713 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -1015,12 +1015,10 @@ start_shared_connection (NetDeviceWifi *device_wifi)
sw = (NMSettingWireless *)nm_setting_wireless_new ();
-#ifdef HAVE_NM_UNSTABLE
/* Use real AP mode if the device supports it */
if (nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (device)) & NM_WIFI_DEVICE_CAP_AP)
mode = NM_SETTING_WIRELESS_MODE_AP;
else
-#endif
mode = NM_SETTING_WIRELESS_MODE_ADHOC;
g_object_set (sw,
diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c
index 452f02d..526a6fc 100644
--- a/panels/network/panel-common.c
+++ b/panels/network/panel-common.c
@@ -77,47 +77,6 @@ panel_device_to_icon_name (NMDevice *device, gboolean symbolic)
}
/**
- * panel_device_to_localized_string:
- **/
-const gchar *
-panel_device_to_localized_string (NMDevice *device)
-{
- const gchar *value = NULL;
- NMDeviceModemCapabilities caps;
- switch (nm_device_get_device_type (device)) {
- case NM_DEVICE_TYPE_ETHERNET:
- /* TRANSLATORS: device type */
- value = _("Wired");
- break;
- case NM_DEVICE_TYPE_WIFI:
- /* TRANSLATORS: device type */
- value = _("Wi-Fi");
- break;
- case NM_DEVICE_TYPE_MODEM:
- caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
- if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
- (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
- /* TRANSLATORS: device type */
- value = _("Mobile broadband");
- }
- break;
- case NM_DEVICE_TYPE_BT:
- /* TRANSLATORS: device type */
- value = _("Bluetooth");
- break;
- case NM_DEVICE_TYPE_OLPC_MESH:
- /* TRANSLATORS: device type */
- value = _("Mesh");
- break;
- default:
- /* TRANSLATORS: device type */
- value = _("Unknown");
- break;
- }
- return value;
-}
-
-/**
* panel_device_to_sortable_string:
*
* Try to return order of approximate connection speed.
diff --git a/panels/network/panel-common.h b/panels/network/panel-common.h
index 279abe2..866c4e7 100644
--- a/panels/network/panel-common.h
+++ b/panels/network/panel-common.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
const gchar *panel_device_to_icon_name (NMDevice *device,
gboolean symbolic);
-const gchar *panel_device_to_localized_string (NMDevice *device);
const gchar *panel_device_to_sortable_string (NMDevice *device);
const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);
const gchar *panel_vpn_state_to_localized_string (NMVPNConnectionState type);
@@ -56,4 +55,3 @@ gchar *panel_get_ip6_address_as_string (NMIP6Config *con
G_END_DECLS
#endif /* PANEL_COMMON_H */
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
