diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | clients/cli/utils.c | 2 | ||||
| -rw-r--r-- | clients/tui/newt/nmt-newt-section.c | 2 | ||||
| -rw-r--r-- | clients/tui/newt/nmt-newt-widget.c | 2 | ||||
| -rw-r--r-- | clients/tui/nmt-editor-grid.c | 2 | ||||
| -rw-r--r-- | clients/tui/nmt-utils.c | 2 | ||||
| -rwxr-xr-x | contrib/scripts/nm-import-openvpn | 2 | ||||
| -rw-r--r-- | examples/C/glib/get-ap-info-libnm.c | 4 | ||||
| -rwxr-xr-x | examples/python/dbus/list-devices.py | 2 | ||||
| -rwxr-xr-x | examples/python/dbus/update-secrets.py | 4 | ||||
| -rwxr-xr-x | examples/python/dbus/vpn.py | 2 | ||||
| -rwxr-xr-x | examples/shell/nm-logging.sh | 2 | ||||
| -rw-r--r-- | libnm-core/nm-keyfile-writer.c | 2 | ||||
| -rw-r--r-- | libnm-glib/libnm_glib.c | 2 | ||||
| -rw-r--r-- | src/settings/nm-secret-agent.c | 2 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.c | 2 | ||||
| -rw-r--r-- | src/settings/plugins/ifupdown/tests/test-ifupdown.c | 2 |
18 files changed, 21 insertions, 21 deletions
@@ -921,7 +921,7 @@ Overview of changes since NetworkManager-0.4.1 default action. * Fix icon animation smoothness * Display more data in the Connection Information dialog - (Robert Love) + (Robert Love). ============================================ @@ -19,7 +19,7 @@ The first is the largest obstacle, but ideally we implement this and enable it when we have the required glib and libsoup versions available. One other complication is that this checking should be done during the NM_DEVICE_STATE_IP_CHECK phase (along with other operations like WiFi hotspot -auto-login) while the current checks are done globally in nm-manager.c, so +auto-login) while the current checks are done globally in nm-manager.c, so keeping both code paths might be complex. But ideally, once the device has successfully gotten an IPv4 or IPv6 address, it @@ -235,7 +235,7 @@ proceeds with the connection. NM sends the correct wpa_supplicant config for WPS to the supplicant, and waits for the connection to occur. WPS can only be used the *first* time, so after a -first successfull connection, NM must request the actual hexadecimal PSK from +first successfull connection, NM must request the actual hexadecimal PSK from wpa_supplicant via D-Bus, and store that PSK in the connection, clear any WPS PIN code from the connection, and save the connection to backing storage. diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 3814e6830b..86a410d3b6 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -524,7 +524,7 @@ nmc_count_color_escape_chars (const char *start, const char *end) inside = TRUE; if (inside) num++; - if (*start == 'm') + if (*start == 'm') inside = FALSE; start++; } diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c index 38152c96db..34073454ce 100644 --- a/clients/tui/newt/nmt-newt-section.c +++ b/clients/tui/newt/nmt-newt-section.c @@ -304,7 +304,7 @@ adjust_border_for_allocation (NmtNewtSectionPrivate *priv, label = nmt_newt_label_new (line_glyph); g_ptr_array_add (priv->border_line_labels, label); nmt_newt_grid_add (NMT_NEWT_GRID (priv->border_grid), label, 0, i + 1); - } else + } else nmt_newt_widget_set_visible (priv->border_line_labels->pdata[i], TRUE); } nmt_newt_widget_set_visible (priv->border_end_label, TRUE); diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index b33aa869af..94f3011eda 100644 --- a/clients/tui/newt/nmt-newt-widget.c +++ b/clients/tui/newt/nmt-newt-widget.c @@ -363,7 +363,7 @@ nmt_newt_widget_set_exit_on_activate (NmtNewtWidget *widget, priv->exit_on_activate = exit_on_activate; g_object_notify (G_OBJECT (widget), "exit-on-activate"); } -} +} /** * nmt_newt_widget_get_visible: diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index a57e780b1b..4826ba9bcc 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -70,7 +70,7 @@ typedef struct { * Creates a new #NmtEditorGrid * * Returns: a new #NmtEditorGrid - */ + */ NmtNewtWidget * nmt_editor_grid_new (void) { diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index a8c1c5f09f..7cd71be2b4 100644 --- a/clients/tui/nmt-utils.c +++ b/clients/tui/nmt-utils.c @@ -47,7 +47,7 @@ * * When the async callback is invoked, it should call * nmt_sync_op_complete_boolean() or nmt_sync_op_complete_pointer() to - * return a result or an error to the caller. + * return a result or an error to the caller. * * There is no free/clear function; any memory that needs to be freed * will have been returned to the caller from diff --git a/contrib/scripts/nm-import-openvpn b/contrib/scripts/nm-import-openvpn index 0be151c520..c024ee9bba 100755 --- a/contrib/scripts/nm-import-openvpn +++ b/contrib/scripts/nm-import-openvpn @@ -131,7 +131,7 @@ function handle_generic_unquote(t, option, value) end function handle_number(t, option, value) if not value[2] then io.stderr:write(string.format("Warning: ignoring invalid option '%s'\n", value[1])) return end - if not tonumber(value[2]) then + if not tonumber(value[2]) then io.stderr:write(string.format("Warning: ignoring not numeric value '%s' for option '%s'\n", value[2], value[1])) return end diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c index 2c1c019498..b312356c76 100644 --- a/examples/C/glib/get-ap-info-libnm.c +++ b/examples/C/glib/get-ap-info-libnm.c @@ -79,7 +79,7 @@ show_access_point_info (NMAccessPoint *ap) { guint32 flags, wpa_flags, rsn_flags, freq, bitrate; guint8 strength; - GBytes *ssid; + GBytes *ssid; const char *hwaddr; NM80211Mode mode; char *freq_str, *ssid_str, *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str; @@ -158,7 +158,7 @@ show_wifi_device_info (NMDevice *device) const char *iface; const char *driver; guint32 speed; - GBytes *active_ssid; + GBytes *active_ssid; char *active_ssid_str = NULL; int i; diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py index 84ece38ab6..1afb5a4559 100755 --- a/examples/python/dbus/list-devices.py +++ b/examples/python/dbus/list-devices.py @@ -72,7 +72,7 @@ for d in devices: print("============================") print("Interface: %s" % props['Interface']) - try: + try: devtype = devtypes[props['DeviceType']] except KeyError: devtype = "Unknown" diff --git a/examples/python/dbus/update-secrets.py b/examples/python/dbus/update-secrets.py index 3a51446bd7..1fc7320926 100755 --- a/examples/python/dbus/update-secrets.py +++ b/examples/python/dbus/update-secrets.py @@ -22,7 +22,7 @@ # Update() method. The method replaces all previous settings with new ones # including possible secrets. # So, we get all settings using GetSettings() and then find out what secrets -# are associated with the connection using GetSecrets(), ask for new secret +# are associated with the connection using GetSecrets(), ask for new secret # values, and add them to the settings that we pass to Update(). # @@ -104,7 +104,7 @@ con = find_connection(sys.argv[1]) print("Connection found: " + con_path) if con: - # Obtain new secrets and put then into connection dict + # Obtain new secrets and put then into connection dict change_secrets(con_path, con) # Change the connection with Update() diff --git a/examples/python/dbus/vpn.py b/examples/python/dbus/vpn.py index ceaf6b9740..a21b82ff30 100755 --- a/examples/python/dbus/vpn.py +++ b/examples/python/dbus/vpn.py @@ -114,7 +114,7 @@ def activate_connection(connection_path, device_path): iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManager') iface.ActivateConnection('org.freedesktop.NetworkManager', connection_path, - device_path, + device_path, "/", reply_handler=reply_handler, error_handler=error_handler) diff --git a/examples/shell/nm-logging.sh b/examples/shell/nm-logging.sh index afd06e5aae..0988e55ec2 100755 --- a/examples/shell/nm-logging.sh +++ b/examples/shell/nm-logging.sh @@ -23,7 +23,7 @@ # Sets NM logging level and/or domains (see description in 'man NetworkManager.conf') # The level controls how verbose NM's log output will be (err,warn,info,debug). # Domains control what parts of networking NM emits log messages for. Leaving -# either of the two arguments blank (i.e., an empty string) will leave that +# either of the two arguments blank (i.e., an empty string) will leave that # parameter unchanged. # # The normal logging level is 'info', for debugging use 'debug'. diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index 0333b6440e..8af7c086e7 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -590,7 +590,7 @@ typedef struct { /* A table of keys that require further parsing/conversion because they are * stored in a format that can't be automatically read using the key's type. * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are - * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored + * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored * in struct in6_addr internally, but as string in keyfiles. */ static KeyWriter key_writers[] = { diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 59097995ba..709d44aa89 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -369,7 +369,7 @@ _libnm_glib_dbus_watcher (gpointer user_data) /* Wait 3 seconds longer each time we fail to reconnect to dbus, * with a maximum wait of one minute. */ - ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); + ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); /* Reschule ourselves if we _still_ don't have a connection to dbus */ _libnm_glib_schedule_dbus_watcher (ctx); diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 192e9877f2..69f7d09ab6 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -300,7 +300,7 @@ nm_secret_agent_add_permission (NMSecretAgent *agent, * @permission: The name of the permission to check for * * Returns whether or not the agent has the given permission. - * + * * Returns: %TRUE if the agent has the given permission, %FALSE if it does not * or if the permission was not previous recorded with * nm_secret_agent_add_permission(). diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 4dfb602aa2..277e1eeb3a 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -1505,7 +1505,7 @@ check_writable (NMConnection *self, GError **error) } static void -get_settings_auth_cb (NMSettingsConnection *self, +get_settings_auth_cb (NMSettingsConnection *self, GDBusMethodInvocation *context, NMAuthSubject *subject, GError *error, diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index d037b8a650..56515438c2 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -168,7 +168,7 @@ dump_blocks (void) for (n = ifparser_getfirst (); n != NULL; n = n->next) { if_data *m; - // each block start with its type & name + // each block start with its type & name // (single quotes used to show typ & name baoundaries) g_print("'%s' '%s'\n", n->type, n->name); |