Merge lp:~phablet-team/network-manager/ofono-format-cleanup into lp:~network-manager/network-manager/ubuntu

[Tony Espy]

Cleanup code format and fix indentation ( ie. usage of tabs vs. spaces ).

[lp:~phablet-team/network-manager/ofono-format-cleanup]

958. By Tony Espy on 2015-04-06

Remove unused nm-modem-ofono.c function: do_context_prepare()

959. By Tony Espy on 2015-04-06

Cleanup nm-modem-ofono.c formating and tabs/spaces.

[Ricardo Salveti (rsalveti)]

+1, no functional changes but it makes it easier to maintain and change the patch set as we go.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Changeset is fine, but given that the code style isn't being in the way, I'd rather avoid making cosmetic changes two weeks away from Vivid release, even when bundled with bugfixes. I don't see why it couldn't wait two more weeks and land in the next release cycle.

Call me extra careful, but it's *very* late in the release so I'd defer the decision of landing this despite it being cosmetic changes to the release team. Could you please bring it up to them?

review: Abstain

[Ricardo Salveti (rsalveti)]

The thing about not waiting for two more extra weeks (for next release) is because we're still going to maintain this code base (vivid based) for RTM for a few months.

=== modified file 'debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch'
--- debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch	2015-04-06 22:20:31 +0000
+++ debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch	2015-04-06 22:20:31 +0000
@@ -304,7 +304,7 @@
 ===================================================================
 --- /dev/null
 +++ network-manager-0.9.10.0/src/devices/wwan/nm-modem-ofono.c
-@@ -0,0 +1,1144 @@
+@@ -0,0 +1,1140 @@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* NetworkManager -- Network link manager
 + *
@@ -376,37 +376,37 @@
 +static GQuark
 +nm_ofono_error_quark (void)
 +{
-+        static GQuark quark = 0;
-+        if (!quark)
-+                quark = g_quark_from_static_string ("nm-ofono-error");
-+        return quark;
++	static GQuark quark = 0;
++	if (!quark)
++		quark = g_quark_from_static_string ("nm-ofono-error");
++	return quark;
 +}
 +
 +static gboolean
 +ip_string_to_network_address (const gchar *str,
 +                              guint32 *out)
 +{
-+        struct in_addr addr;
-+
-+        /* IP address */
-+        if (inet_pton (AF_INET, str, &addr) <= 0)
-+                return FALSE;
-+
-+        *out = (guint32)addr.s_addr;
-+        return TRUE;
++	struct in_addr addr;
++
++	/* IP address */
++	if (inet_pton (AF_INET, str, &addr) <= 0)
++		return FALSE;
++
++	*out = (guint32)addr.s_addr;
++	return TRUE;
 +}
 +
 +/* Disconnect stuff */
 +typedef struct {
-+        NMModemOfono *self;
-+        gboolean warn;
++	NMModemOfono *self;
++	gboolean warn;
 +} SimpleDisconnectContext;
 +
 +static void
 +simple_disconnect_context_free (SimpleDisconnectContext *ctx)
 +{
-+        g_object_unref (ctx->self);
-+        g_slice_free (SimpleDisconnectContext, ctx);
++	g_object_unref (ctx->self);
++	g_slice_free (SimpleDisconnectContext, ctx);
 +}
 +
 +static void
@@ -427,7 +427,7 @@
 +		g_clear_error (&error);
 +	}
 +
-+        simple_disconnect_context_free (ctx);
++	simple_disconnect_context_free (ctx);
 +
 +	if (state != NM_MODEM_STATE_SEARCHING)
 +		nm_modem_set_state (NM_MODEM (self),
@@ -440,14 +440,14 @@
 +            gboolean warn)
 +{
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+        SimpleDisconnectContext *ctx;
++	SimpleDisconnectContext *ctx;
 +	GValue value = G_VALUE_INIT;
 +
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
 +
-+        ctx = g_slice_new (SimpleDisconnectContext);
-+        ctx->self = g_object_ref (self);
-+        ctx->warn = warn;
++	ctx = g_slice_new (SimpleDisconnectContext);
++	ctx->self = g_object_ref (self);
++	ctx->warn = warn;
 +
 +	g_value_init (&value, G_TYPE_BOOLEAN);
 +	g_value_set_boolean (&value, FALSE);
@@ -582,8 +582,7 @@
 +
 +	if (g_strcmp0 (key, "Powered") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
 +		priv->gprs_powered = g_value_get_boolean (value);
-+	}
-+	else if (g_strcmp0 (key, "Attached") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
++	} else if (g_strcmp0 (key, "Attached") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
 +		priv->gprs_attached = g_value_get_boolean (value);
 +	} else
 +		/* No need to update enabled for other property changes */
@@ -724,8 +723,7 @@
 +				                                          nm_modem_get_path (NM_MODEM (self)),
 +				                                          OFONO_DBUS_INTERFACE_SIM_MANAGER);
 +			}
-+		}
-+		else {
++		} else {
 +			if (priv->simmanager_proxy) {
 +				nm_log_info (LOGD_MB, "(%s): SimManager interface disappeared",
 +				             nm_modem_get_path (NM_MODEM (self)));
@@ -746,31 +744,30 @@
 +					get_ofono_conn_manager_properties (self);
 +
 +					dbus_g_proxy_add_signal (priv->connman_proxy, "PropertyChanged",
-+				                         	G_TYPE_STRING, G_TYPE_VALUE,
-+				                         	G_TYPE_INVALID);
++					                         G_TYPE_STRING, G_TYPE_VALUE,
++					                         G_TYPE_INVALID);
 +					dbus_g_proxy_connect_signal (priv->connman_proxy, "PropertyChanged",
-+				                             	G_CALLBACK (ofono_conn_properties_changed),
-+				                             	self,
-+				                             	NULL);
++					                             G_CALLBACK (ofono_conn_properties_changed),
++					                             self,
++					                             NULL);
 +
 +					dbus_g_proxy_add_signal (priv->connman_proxy, "ContextAdded",
-+				                         	DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT,
-+				                         	G_TYPE_INVALID);
++					                         DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT,
++					                         G_TYPE_INVALID);
 +					dbus_g_proxy_connect_signal (priv->connman_proxy, "ContextAdded",
-+				                             	G_CALLBACK (ofono_context_added),
-+				                             	self,
-+				                             	NULL);
++					                             G_CALLBACK (ofono_context_added),
++					                             self,
++					                             NULL);
 +					dbus_g_proxy_add_signal (priv->connman_proxy, "ContextRemoved",
-+				                         	DBUS_TYPE_G_OBJECT_PATH,
-+				                         	G_TYPE_INVALID);
++					                         DBUS_TYPE_G_OBJECT_PATH,
++					                         G_TYPE_INVALID);
 +					dbus_g_proxy_connect_signal (priv->connman_proxy, "ContextRemoved",
-+				                             	G_CALLBACK (ofono_context_removed),
-+				                             	self,
-+				                             	NULL);
++					                             G_CALLBACK (ofono_context_removed),
++					                             self,
++					                             NULL);
 +				}
 +			}
-+		}
-+		else {
++		} else {
 +			if (priv->connman_proxy) {
 +				nm_log_info (LOGD_MB, "(%s): ConnectionManager interface disappeared",
 +				             nm_modem_get_path (NM_MODEM (self)));
@@ -923,9 +920,9 @@
 +			dns = (char **) g_value_get_boxed (g_hash_table_lookup (ip_settings, "DomainNameServers"));
 +			for (i = 0; dns[i]; i++) {
 +				if (   ip_string_to_network_address (dns[i], &address_network)
-+			    	&& address_network > 0) {
-+					nm_ip4_config_add_nameserver (priv->ip4_config, address_network);
-+					nm_log_info (LOGD_MB, "  DNS %s", dns[i]);
++				    && address_network > 0) {
++				    nm_ip4_config_add_nameserver (priv->ip4_config, address_network);
++				    nm_log_info (LOGD_MB, "  DNS %s", dns[i]);
 +				}
 +			}
 +
@@ -1072,8 +1069,8 @@
 +	} else {
 +		nm_log_warn (LOGD_MB, "could not set context property '%s': %s", (char*)key,
 +		             priv->property_error
-+		                 && priv->property_error->message
-+		                 ? priv->property_error->message : "(unknown)");
++		             && priv->property_error->message
++		             ? priv->property_error->message : "(unknown)");
 +	}
 +}
 +
@@ -1316,7 +1313,7 @@
 +
 +	nm_log_info (LOGD_MB, "(%s): trying to set modem to %s",
 +	             nm_modem_get_path (self),
-+                     enabled ? "enabled" : "disabled");
++	             enabled ? "enabled" : "disabled");
 +
 +	/*
 +	 * FIXME: this is code is a no-op; we should either make
@@ -1336,8 +1333,7 @@
 +                  NMDeviceModemCapabilities *current_caps)
 +{
 +	NMModemOfono *self = NM_MODEM_OFONO (_self);
-+	NMDeviceModemCapabilities all_ofono_caps
-+	    = NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS;
++	NMDeviceModemCapabilities all_ofono_caps = NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS;
 +
 +	*modem_caps = all_ofono_caps;
 +	*current_caps = all_ofono_caps;
@@ -1366,8 +1362,8 @@
 +
 +static GObject*
 +constructor (GType type,
-+			 guint n_construct_params,
-+			 GObjectConstructParam *construct_params)
++             guint n_construct_params,
++             GObjectConstructParam *construct_params)
 +{
 +	GObject *object;
 +	NMModemOfonoPrivate *priv;
@@ -1440,13 +1436,13 @@
 +	object_class->constructor = constructor;
 +	object_class->dispose = dispose;
 +
-+        modem_class->get_capabilities = get_capabilities;
++	modem_class->get_capabilities = get_capabilities;
 +	modem_class->set_mm_enabled = set_ofono_enabled;
-+        modem_class->disconnect = disconnect;
++	modem_class->disconnect = disconnect;
 +	modem_class->deactivate = deactivate;
 +	modem_class->check_connection_compatible = check_connection_compatible;
 +	modem_class->act_stage1_prepare = act_stage1_prepare;
-+        modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
++	modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
 +}
 +
 Index: network-manager-0.9.10.0/src/devices/wwan/nm-modem-ofono.h