summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-02-07 13:42:36 +0100
committerThomas Haller <thaller@redhat.com>2018-02-07 13:42:36 +0100
commitbc81efec551bc8bc29354012361820f951757365 (patch)
treecc67170b7e6b9ddd2345c9b071b6afd6456abe15
parent665d47466a16f57affa329e70b39648c7b104141 (diff)
parent54b2e8d679d79a9e40c1570e50da0e1249e0a811 (diff)
downloadNetworkManager-bc81efec551bc8bc29354012361820f951757365.tar.gz
all: merge branch 'th/mixed'
https://github.com/NetworkManager/NetworkManager/pull/64
-rw-r--r--Makefile.am12
-rw-r--r--NEWS2
-rw-r--r--TODO4
-rw-r--r--clients/cli/connections.c2
-rw-r--r--clients/cli/utils.c2
-rw-r--r--clients/tui/newt/nmt-newt-section.c2
-rw-r--r--clients/tui/newt/nmt-newt-utils.c2
-rw-r--r--clients/tui/newt/nmt-newt-widget.c4
-rw-r--r--clients/tui/nmt-edit-connection-list.c2
-rw-r--r--clients/tui/nmt-editor-grid.c2
-rw-r--r--clients/tui/nmt-page-bond.c30
-rw-r--r--clients/tui/nmt-page-team-port.c2
-rw-r--r--clients/tui/nmt-page-team.c2
-rw-r--r--clients/tui/nmt-route-entry.c2
-rw-r--r--clients/tui/nmt-utils.c2
-rwxr-xr-xcontrib/scripts/nm-import-openvpn2
-rw-r--r--dispatcher/nm-dispatcher.c2
-rw-r--r--docs/libnm-glib/Makefile.am16
-rw-r--r--docs/libnm-util/Makefile.am8
-rw-r--r--docs/libnm/Makefile.am12
-rw-r--r--examples/C/glib/get-ap-info-libnm.c4
-rwxr-xr-xexamples/python/dbus/list-devices.py2
-rwxr-xr-xexamples/python/dbus/update-secrets.py4
-rwxr-xr-xexamples/python/dbus/vpn.py2
-rwxr-xr-xexamples/python/dbus/wifi-hotspot.py2
-rwxr-xr-xexamples/python/gi/device-state-ip4config.py4
-rwxr-xr-xexamples/shell/nm-logging.sh2
-rw-r--r--libnm-core/nm-connection.c2
-rw-r--r--libnm-core/nm-keyfile-writer.c2
-rw-r--r--libnm-core/nm-setting-team.c2
-rw-r--r--libnm-core/nm-vpn-editor-plugin.h2
-rw-r--r--libnm-glib/libnm-glib-test.c4
-rw-r--r--libnm-glib/libnm_glib.c100
-rw-r--r--libnm-glib/nm-access-point.c2
-rw-r--r--libnm-glib/nm-vpn-plugin-ui-interface.c20
-rw-r--r--libnm-glib/nm-vpn-plugin-ui-interface.h2
-rw-r--r--libnm-util/nm-setting-wired.c2
-rw-r--r--libnm-util/nm-utils.c68
-rw-r--r--libnm/nm-access-point.c2
-rw-r--r--libnm/nm-vpn-editor.h2
-rw-r--r--m4/introspection.m44
-rw-r--r--po/ChangeLog2149
-rw-r--r--src/devices/nm-device-ethernet.h18
-rw-r--r--src/devices/nm-device-private.h2
-rw-r--r--src/devices/nm-device.c4
-rw-r--r--src/dhcp/nm-dhcp-dhclient.c8
-rw-r--r--src/dhcp/nm-dhcp-dhcpcanon.c6
-rw-r--r--src/dhcp/nm-dhcp-dhcpcd.c10
-rw-r--r--src/dhcp/tests/test-dhcp-dhclient.c28
-rw-r--r--src/ndisc/nm-ndisc.c38
-rw-r--r--src/nm-checkpoint.c2
-rw-r--r--src/nm-core-utils.c12
-rw-r--r--src/nm-ip6-config.c8
-rw-r--r--src/nm-logging.c3
-rw-r--r--src/platform/nm-platform.c22
-rw-r--r--src/platform/wifi/wifi-utils-nl80211.c2
-rw-r--r--src/settings/nm-secret-agent.c2
-rw-r--r--src/settings/nm-settings-connection.c2
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c6
-rw-r--r--src/settings/plugins/ifupdown/tests/test-ifupdown.c2
-rw-r--r--src/supplicant/nm-supplicant-settings-verify.c8
-rw-r--r--src/supplicant/nm-supplicant-types.h6
62 files changed, 290 insertions, 2394 deletions
diff --git a/Makefile.am b/Makefile.am
index 1b79031248..85a64d2cc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -623,7 +623,7 @@ endif
EXTRA_DIST += \
libnm-core/crypto_gnutls.c \
- libnm-core/crypto_nss.c \
+ libnm-core/crypto_nss.c \
libnm-core/nm-core-enum-types.c.template \
libnm-core/nm-core-enum-types.h.template \
libnm-core/meson.build
@@ -712,11 +712,11 @@ $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenu
# test-cert.p12 created with:
#
# openssl pkcs12 -export \
-# -in test_key_and_cert.pem \
-# -inkey test_key_and_cert.pem \
-# -certfile test_ca_cert.pem \
-# -name "test-pkcs12" \
-# -out test-cert.p12
+# -in test_key_and_cert.pem \
+# -inkey test_key_and_cert.pem \
+# -certfile test_ca_cert.pem \
+# -name "test-pkcs12" \
+# -out test-cert.p12
EXTRA_DIST += \
libnm-core/tests/certs/ca-no-ending-newline.pem \
diff --git a/NEWS b/NEWS
index b0506065b6..ede606e5c7 100644
--- a/NEWS
+++ b/NEWS
@@ -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).
============================================
diff --git a/TODO b/TODO
index 86fef82be9..cdca4b70a4 100644
--- a/TODO
+++ b/TODO
@@ -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/connections.c b/clients/cli/connections.c
index d41c9504d8..519780a346 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -6776,7 +6776,7 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote)
return confirmed;
}
-typedef struct {
+typedef struct {
guint level;
char *main_prompt;
NMSetting *curr_setting;
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-utils.c b/clients/tui/newt/nmt-newt-utils.c
index 213e198b64..112d259966 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -376,5 +376,5 @@ nmt_newt_edit_string (const char *data)
g_free (filename);
return new_data;
-}
+}
diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c
index 5602c062d3..94f3011eda 100644
--- a/clients/tui/newt/nmt-newt-widget.c
+++ b/clients/tui/newt/nmt-newt-widget.c
@@ -311,7 +311,7 @@ nmt_newt_widget_real_activated (NmtNewtWidget *widget)
if (priv->exit_on_activate)
nmt_newt_form_quit (nmt_newt_widget_get_form (widget));
-}
+}
/**
* nmt_newt_widget_activated:
@@ -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-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
index e90140b3c0..c1756da05e 100644
--- a/clients/tui/nmt-edit-connection-list.c
+++ b/clients/tui/nmt-edit-connection-list.c
@@ -502,7 +502,7 @@ nmt_edit_connection_list_class_init (NmtEditConnectionListClass *list_class)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
-
+
/**
* NmtEditConnectionListFilter:
* @list: the #NmtEditConnectionList
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-page-bond.c b/clients/tui/nmt-page-bond.c
index e39a4c96a6..1629c8b083 100644
--- a/clients/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
@@ -203,21 +203,21 @@ slaves_changed (GObject *object,
nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->mode), TRUE);
}
-#define WIDGET_CHANGED_FUNC(widget, func, option) \
-static void \
-widget ## _widget_changed (GObject *object, \
- GParamSpec *pspec, \
- gpointer user_data) \
-{ \
- NmtPageBond *bond = NMT_PAGE_BOND (user_data); \
- NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); \
- \
- if (priv->updating) \
- return; \
- \
- priv->updating = TRUE; \
- nm_setting_bond_add_option (priv->s_bond, option, func (priv->widget)); \
- priv->updating = FALSE; \
+#define WIDGET_CHANGED_FUNC(widget, func, option) \
+static void \
+widget ## _widget_changed (GObject *object, \
+ GParamSpec *pspec, \
+ gpointer user_data) \
+{ \
+ NmtPageBond *bond = NMT_PAGE_BOND (user_data); \
+ NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); \
+ \
+ if (priv->updating) \
+ return; \
+ \
+ priv->updating = TRUE; \
+ nm_setting_bond_add_option (priv->s_bond, option, func (priv->widget)); \
+ priv->updating = FALSE; \
}
WIDGET_CHANGED_FUNC (primary, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_PRIMARY)
diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index af2221adf6..0d40373d4c 100644
--- a/clients/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
@@ -68,7 +68,7 @@ edit_clicked (NmtNewtButton *button,
NM_SETTING_TEAM_PORT_CONFIG, new_config,
NULL);
g_free (new_config);
-}
+}
static void
nmt_page_team_port_constructed (GObject *object)
diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index 2523bd85d9..cfe127035f 100644
--- a/clients/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
@@ -121,7 +121,7 @@ edit_clicked (NmtNewtButton *button,
NM_SETTING_TEAM_CONFIG, new_config,
NULL);
g_free (new_config);
-}
+}
static void
nmt_page_team_constructed (GObject *object)
diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index eea81e9985..109759cc27 100644
--- a/clients/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
@@ -152,7 +152,7 @@ static newtComponent
nmt_route_entry_get_focus_component (NmtNewtWidget *widget)
{
NmtRouteEntryPrivate *priv = NMT_ROUTE_ENTRY_GET_PRIVATE (widget);
-
+
return nmt_newt_widget_get_focus_component (priv->dest);
}
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/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 6d1d27e8e2..efab0a5384 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -604,7 +604,7 @@ find_scripts (const char *str_action)
while ((filename = g_dir_read_name (dir))) {
char *path;
- struct stat st;
+ struct stat st;
int err;
const char *err_msg = NULL;
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index 8a868d0e9c..dab2e3f7f7 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -49,18 +49,18 @@ extra_files = libnm-glib.png
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = \
- -I$(top_srcdir)/shared \
+GTKDOC_CFLAGS = \
+ -I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
- -I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util \
- -I$(top_srcdir)/libnm-glib \
- -I$(top_builddir)/libnm-glib \
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
+ -I$(top_srcdir)/libnm-glib \
+ -I$(top_builddir)/libnm-glib \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
- $(GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
-GTKDOC_LIBS = \
+GTKDOC_LIBS = \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(GLIB_LIBS)
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index 1d417894b2..5b8d7260ab 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -37,7 +37,7 @@ IGNORE_HFILES= \
nm-version.h
# Images to copy into HTML directory.
-HTML_IMAGES =
+HTML_IMAGES =
# Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
content_files = version.xml
@@ -48,10 +48,10 @@ extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = \
- -I$(top_srcdir)/libnm-util \
+GTKDOC_CFLAGS = \
+ -I$(top_srcdir)/libnm-util \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
- $(GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
GTKDOC_LIBS = \
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index 288a595e64..89784967fa 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -66,15 +66,15 @@ extra_files = libnm.png
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = \
- -I$(top_srcdir)/libnm-core \
- -I$(top_builddir)/libnm-core \
- -I$(top_srcdir)/libnm \
- -I$(top_builddir)/libnm \
+GTKDOC_CFLAGS = \
+ -I$(top_srcdir)/libnm-core \
+ -I$(top_builddir)/libnm-core \
+ -I$(top_srcdir)/libnm \
+ -I$(top_builddir)/libnm \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
$(GLIB_CFLAGS)
-GTKDOC_LIBS = \
+GTKDOC_LIBS = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
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/python/dbus/wifi-hotspot.py b/examples/python/dbus/wifi-hotspot.py
index dd33b4459f..9b057a2c9e 100755
--- a/examples/python/dbus/wifi-hotspot.py
+++ b/examples/python/dbus/wifi-hotspot.py
@@ -54,7 +54,7 @@ con = dbus.Dictionary({
'ipv6': s_ip6
})
-def usage():
+def usage():
print("Usage: %s <ifname> [up|down]" % sys.argv[0])
sys.exit(0)
diff --git a/examples/python/gi/device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py
index 32d3b14332..b92a7b090a 100755
--- a/examples/python/gi/device-state-ip4config.py
+++ b/examples/python/gi/device-state-ip4config.py
@@ -27,13 +27,13 @@ from gi.repository import GLib, NM
#
# This example shows how to get NMIP4Config from NMDevice after it is activated.
-#
+#
# We listen to notify::ip4-config glib signal. This signal is trigered by D-Bus
# PropertiesChanged for IP4Config that comes after StateChanged for NMDevice.
#
main_loop = None
-
+
def do_notify(self, property):
print("notify: %s" % property)
ip4cfg = self.get_ip4_config()
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-connection.c b/libnm-core/nm-connection.c
index 1773841dac..bdbff9b7ec 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -2455,7 +2455,7 @@ nm_connection_get_setting_ovs_patch (NMConnection *connection)
{
return _connection_get_setting_check (connection, NM_TYPE_SETTING_OVS_PATCH);
}
-
+
/**
* nm_connection_get_setting_ovs_port:
* @connection: the #NMConnection
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-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 65e2634772..b02e727fc3 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -59,7 +59,7 @@ static const char* _link_watcher_name[] = {
struct NMTeamLinkWatcher {
guint refcount;
- guint8 type; /* LinkWatcherTypes */
+ guint8 type; /* LinkWatcherTypes */
/*
* The union is constructed in order to allow mapping the options of all the
diff --git a/libnm-core/nm-vpn-editor-plugin.h b/libnm-core/nm-vpn-editor-plugin.h
index e93d8fbddd..17bd08274d 100644
--- a/libnm-core/nm-vpn-editor-plugin.h
+++ b/libnm-core/nm-vpn-editor-plugin.h
@@ -179,4 +179,4 @@ void nm_vpn_editor_plugin_set_plugin_info (NMVpnEditorPlugin *plugin
G_END_DECLS
-#endif /* __NM_VPN_EDITOR_PLUGIN_H__ */
+#endif /* __NM_VPN_EDITOR_PLUGIN_H__ */
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index 5f15a51062..c4723c954d 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -47,12 +47,12 @@ test_wireless_enabled (NMClient *client)
wireless = nm_client_wireless_get_enabled (client);
g_print ("Wireless enabled? %s\n", wireless ? "yes" : "no");
-// nm_client_wireless_set_enabled (client, !wireless);
+// nm_client_wireless_set_enabled (client, !wireless);
wireless = nm_client_wireless_hardware_get_enabled (client);
g_print ("Wireless HW enabled? %s\n", wireless ? "yes" : "no");
-// nm_client_wireless_set_enabled (client, !wireless);
+// nm_client_wireless_set_enabled (client, !wireless);
return TRUE;
}
diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c
index 2c0b9657c8..709d44aa89 100644
--- a/libnm-glib/libnm_glib.c
+++ b/libnm-glib/libnm_glib.c
@@ -32,37 +32,37 @@
#include "NetworkManager.h"
#include "libnm_glib.h"
-#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist"
+#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist"
struct libnm_glib_ctx
{
- unsigned char check;
+ unsigned char check;
- GMainContext * g_main_ctx;
- GMainLoop * g_main_loop;
- DBusConnection * dbus_con;
- guint dbus_watcher;
- guint dbus_watch_interval;
+ GMainContext * g_main_ctx;
+ GMainLoop * g_main_loop;
+ DBusConnection * dbus_con;
+ guint dbus_watcher;
+ guint dbus_watch_interval;
- gboolean thread_done;
- gboolean thread_inited;
- GThread * thread;
+ gboolean thread_done;
+ gboolean thread_inited;
+ GThread * thread;
- GSList * callbacks;
- GMutex * callbacks_lock;
- guint callback_id_last;
+ GSList * callbacks;
+ GMutex * callbacks_lock;
+ guint callback_id_last;
- libnm_glib_state nm_state;
+ libnm_glib_state nm_state;
};
typedef struct libnm_glib_callback
{
- guint id;
- GMainContext * gmain_ctx;
- libnm_glib_ctx * libnm_glib_ctx;
- libnm_glib_callback_func func;
- gpointer user_data;
+ guint id;
+ GMainContext * gmain_ctx;
+ libnm_glib_ctx * libnm_glib_ctx;
+ libnm_glib_callback_func func;
+ gpointer user_data;
} libnm_glib_callback;
@@ -74,9 +74,9 @@ static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state);
static void
_libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data)
{
- DBusMessage * reply;
- libnm_glib_ctx * ctx = (libnm_glib_ctx *) user_data;
- NMState nm_state;
+ DBusMessage *reply;
+ libnm_glib_ctx *ctx = (libnm_glib_ctx *) user_data;
+ NMState nm_state;
g_return_if_fail (pcall != NULL);
g_return_if_fail (ctx != NULL);
@@ -108,8 +108,8 @@ out:
static void
_libnm_glib_get_nm_state (libnm_glib_ctx *ctx)
{
- DBusMessage * message;
- DBusPendingCall * pcall = NULL;
+ DBusMessage *message;
+ DBusPendingCall *pcall = NULL;
g_return_if_fail (ctx != NULL);
@@ -125,7 +125,7 @@ _libnm_glib_get_nm_state (libnm_glib_ctx *ctx)
static gboolean
_libnm_glib_callback_helper (gpointer user_data)
{
- libnm_glib_callback *cb_data = (libnm_glib_callback *)user_data;
+ libnm_glib_callback *cb_data = (libnm_glib_callback *)user_data;
g_return_val_if_fail (cb_data != NULL, FALSE);
g_return_val_if_fail (cb_data->func != NULL, FALSE);
@@ -140,7 +140,7 @@ static void
_libnm_glib_schedule_single_callback (libnm_glib_ctx *ctx,
libnm_glib_callback *callback)
{
- GSource *source;
+ GSource *source;
g_return_if_fail (ctx != NULL);
g_return_if_fail (callback != NULL);
@@ -170,7 +170,7 @@ _libnm_glib_unschedule_single_callback (libnm_glib_ctx *ctx,
static void
_libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
{
- GSList *elem;
+ GSList *elem;
g_return_if_fail (ctx != NULL);
@@ -188,7 +188,7 @@ _libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
static void
_libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state)
{
- libnm_glib_state old_state;
+ libnm_glib_state old_state;
g_return_if_fail (ctx != NULL);
@@ -221,9 +221,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
- libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
- gboolean handled = TRUE;
- DBusError error;
+ libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
+ gboolean handled = TRUE;
+ DBusError error;
g_return_val_if_fail (ctx != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
g_return_val_if_fail (connection != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
@@ -242,9 +242,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
{
/* New signal for dbus 0.23... */
- char *service;
- char *old_owner;
- char *new_owner;
+ char *service;
+ char *old_owner;
+ char *new_owner;
if ( dbus_message_get_args (message, &error,
DBUS_TYPE_STRING, &service,
@@ -257,9 +257,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
gboolean old_owner_good = (old_owner && (strlen (old_owner) > 0));
gboolean new_owner_good = (new_owner && (strlen (new_owner) > 0));
- if (!old_owner_good && new_owner_good) /* Equivalent to old ServiceCreated signal */
+ if (!old_owner_good && new_owner_good) /* Equivalent to old ServiceCreated signal */
_libnm_glib_get_nm_state (ctx);
- else if (old_owner_good && !new_owner_good) /* Equivalent to old ServiceDeleted signal */
+ else if (old_owner_good && !new_owner_good) /* Equivalent to old ServiceDeleted signal */
ctx->nm_state = LIBNM_NO_NETWORKMANAGER;
}
}
@@ -273,7 +273,7 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
}
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged"))
{
- NMState state = NM_STATE_UNKNOWN;
+ NMState state = NM_STATE_UNKNOWN;
dbus_message_get_args (message, &error, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID);
_libnm_glib_update_state (ctx, state);
@@ -297,8 +297,8 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
static DBusConnection *
_libnm_glib_dbus_init (gpointer *user_data, GMainContext *context)
{
- DBusConnection *connection = NULL;
- DBusError error;
+ DBusConnection *connection = NULL;
+ DBusError error;
dbus_error_init (&error);
connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error);
@@ -349,7 +349,7 @@ _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context)
static gboolean
_libnm_glib_dbus_watcher (gpointer user_data)
{
- libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
+ libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
g_return_val_if_fail (ctx != NULL, FALSE);
@@ -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);
@@ -393,7 +393,7 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx)
if (ctx->dbus_watcher == 0)
{
- GSource * source = g_timeout_source_new (ctx->dbus_watch_interval);
+ GSource *source = g_timeout_source_new (ctx->dbus_watch_interval);
g_source_set_callback (source, _libnm_glib_dbus_watcher, (gpointer) ctx, NULL);
ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx);
g_source_unref (source);
@@ -410,7 +410,7 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx)
static gpointer
_libnm_glib_dbus_worker (gpointer user_data)
{
- libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
+ libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
g_return_val_if_fail (ctx != NULL, NULL);
@@ -493,7 +493,7 @@ error:
libnm_glib_ctx *
libnm_glib_init (void)
{
- libnm_glib_ctx *ctx = NULL;
+ libnm_glib_ctx *ctx = NULL;
if (!g_thread_supported ())
g_thread_init (NULL);
@@ -504,7 +504,7 @@ libnm_glib_init (void)
ctx->thread = g_thread_create (_libnm_glib_dbus_worker, ctx, TRUE, NULL);
if (!ctx->thread)
- goto error;
+ goto error;
/* Wait until initialization of the thread */
while (!ctx->thread_inited)
@@ -542,12 +542,12 @@ libnm_glib_get_network_state (const libnm_glib_ctx *ctx)
guint
-libnm_glib_register_callback (libnm_glib_ctx *ctx,
- libnm_glib_callback_func func,
- gpointer user_data,
- GMainContext *g_main_ctx)
+libnm_glib_register_callback (libnm_glib_ctx *ctx,
+ libnm_glib_callback_func func,
+ gpointer user_data,
+ GMainContext *g_main_ctx)
{
- libnm_glib_callback *callback = NULL;
+ libnm_glib_callback *callback = NULL;
g_return_val_if_fail (ctx != NULL, 0);
g_return_val_if_fail (func != NULL, 0);
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 70b98f6dee..3b923aa28d 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -664,7 +664,7 @@ nm_access_point_class_init (NMAccessPointClass *ap_class)
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
-
+
/**
* NMAccessPoint:mode:
*
diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c
index fee6fc9f28..f06e77c42e 100644
--- a/libnm-glib/nm-vpn-plugin-ui-interface.c
+++ b/libnm-glib/nm-vpn-plugin-ui-interface.c
@@ -78,13 +78,13 @@ nm_vpn_plugin_ui_interface_get_type (void)
if (!vpn_plugin_ui_interface_type) {
const GTypeInfo vpn_plugin_ui_interface_info = {
sizeof (NMVpnPluginUiInterface), /* class_size */
- interface_init, /* base_init */
- NULL, /* base_finalize */
+ interface_init, /* base_init */
+ NULL, /* base_finalize */
NULL,
- NULL, /* class_finalize */
- NULL, /* class_data */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
0,
- 0, /* n_preallocs */
+ 0, /* n_preallocs */
NULL
};
@@ -197,13 +197,13 @@ nm_vpn_plugin_ui_widget_interface_get_type (void)
if (!vpn_plugin_ui_widget_interface_type) {
const GTypeInfo vpn_plugin_ui_widget_interface_info = {
sizeof (NMVpnPluginUiWidgetInterface), /* class_size */
- widget_interface_init, /* base_init */
- NULL, /* base_finalize */
+ widget_interface_init, /* base_init */
+ NULL, /* base_finalize */
NULL,
- NULL, /* class_finalize */
- NULL, /* class_data */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
0,
- 0, /* n_preallocs */
+ 0, /* n_preallocs */
NULL
};
diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h
index b5ea2a7ef2..bc5d843605 100644
--- a/libnm-glib/nm-vpn-plugin-ui-interface.h
+++ b/libnm-glib/nm-vpn-plugin-ui-interface.h
@@ -272,4 +272,4 @@ gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInte
G_END_DECLS
-#endif /* NM_VPN_PLUGIN_UI_INTERFACE_H */
+#endif /* NM_VPN_PLUGIN_UI_INTERFACE_H */
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index 85ba0f5e4f..4296d5112d 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -947,7 +947,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
-
+
/**
* NMSettingWired:mac-address-blacklist:
*
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index fba87c5a79..7f927d2451 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -55,7 +55,7 @@ struct EncodingTriplet
struct IsoLangToEncodings
{
- const char * lang;
+ const char *lang;
struct EncodingTriplet encodings;
};
@@ -63,13 +63,13 @@ struct IsoLangToEncodings
static const struct IsoLangToEncodings isoLangEntries5[] =
{
/* Simplified Chinese */
- { "zh_cn", {"euc-cn", "gb2312", "gb18030"} }, /* PRC */
- { "zh_sg", {"euc-cn", "gb2312", "gb18030"} }, /* Singapore */
+ { "zh_cn", {"euc-cn", "gb2312", "gb18030"} }, /* PRC */
+ { "zh_sg", {"euc-cn", "gb2312", "gb18030"} }, /* Singapore */
/* Traditional Chinese */
- { "zh_tw", {"big5", "euc-tw", NULL} }, /* Taiwan */
- { "zh_hk", {"big5", "euc-tw", "big5-hkcs"} },/* Hong Kong */
- { "zh_mo", {"big5", "euc-tw", NULL} }, /* Macau */
+ { "zh_tw", {"big5", "euc-tw", NULL} }, /* Taiwan */
+ { "zh_hk", {"big5", "euc-tw", "big5-hkcs"} },/* Hong Kong */
+ { "zh_mo", {"big5", "euc-tw", NULL} }, /* Macau */
/* Table end */
{ NULL, {NULL, NULL, NULL} }
@@ -79,49 +79,49 @@ static const struct IsoLangToEncodings isoLangEntries5[] =
static const struct IsoLangToEncodings isoLangEntries2[] =
{
/* Japanese */
- { "ja", {"euc-jp", "shift_jis", "iso-2022-jp"} },
+ { "ja", {"euc-jp", "shift_jis", "iso-2022-jp"} },
/* Korean */
- { "ko", {"euc-kr", "iso-2022-kr", "johab"} },
+ { "ko", {"euc-kr", "iso-2022-kr", "johab"} },
/* Thai */
- { "th", {"iso-8859-11","windows-874", NULL} },
+ { "th", {"iso-8859-11","windows-874", NULL} },
/* Central European */
- { "hu", {"iso-8859-2", "windows-1250", NULL} }, /* Hungarian */
- { "cs", {"iso-8859-2", "windows-1250", NULL} }, /* Czech */
- { "hr", {"iso-8859-2", "windows-1250", NULL} }, /* Croatian */
- { "pl", {"iso-8859-2", "windows-1250", NULL} }, /* Polish */
- { "ro", {"iso-8859-2", "windows-1250", NULL} }, /* Romanian */
- { "sk", {"iso-8859-2", "windows-1250", NULL} }, /* Slovakian */
- { "sl", {"iso-8859-2", "windows-1250", NULL} }, /* Slovenian */
- { "sh", {"iso-8859-2", "windows-1250", NULL} }, /* Serbo-Croatian */
+ { "hu", {"iso-8859-2", "windows-1250", NULL} }, /* Hungarian */
+ { "cs", {"iso-8859-2", "windows-1250", NULL} }, /* Czech */
+ { "hr", {"iso-8859-2", "windows-1250", NULL} }, /* Croatian */
+ { "pl", {"iso-8859-2", "windows-1250", NULL} }, /* Polish */
+ { "ro", {"iso-8859-2", "windows-1250", NULL} }, /* Romanian */
+ { "sk", {"iso-8859-2", "windows-1250", NULL} }, /* Slovakian */
+ { "sl", {"iso-8859-2", "windows-1250", NULL} }, /* Slovenian */
+ { "sh", {"iso-8859-2", "windows-1250", NULL} }, /* Serbo-Croatian */
/* Cyrillic */
- { "ru", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Russian */
- { "be", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Belorussian */
- { "bg", {"windows-1251","koi8-r", "iso-8859-5"} }, /* Bulgarian */
- { "mk", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Macedonian */
- { "sr", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Serbian */
- { "uk", {"koi8-u", "koi8-r", "windows-1251"} }, /* Ukranian */
+ { "ru", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Russian */
+ { "be", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Belorussian */
+ { "bg", {"windows-1251","koi8-r", "iso-8859-5"} }, /* Bulgarian */
+ { "mk", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Macedonian */
+ { "sr", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Serbian */
+ { "uk", {"koi8-u", "koi8-r", "windows-1251"} }, /* Ukranian */
/* Arabic */
- { "ar", {"iso-8859-6", "windows-1256", NULL} },
+ { "ar", {"iso-8859-6", "windows-1256", NULL} },
/* Baltic */
- { "et", {"iso-8859-4", "windows-1257", NULL} }, /* Estonian */
- { "lt", {"iso-8859-4", "windows-1257", NULL} }, /* Lithuanian */
- { "lv", {"iso-8859-4", "windows-1257", NULL} }, /* Latvian */
+ { "et", {"iso-8859-4", "windows-1257", NULL} }, /* Estonian */
+ { "lt", {"iso-8859-4", "windows-1257", NULL} }, /* Lithuanian */
+ { "lv", {"iso-8859-4", "windows-1257", NULL} }, /* Latvian */
/* Greek */
- { "el", {"iso-8859-7", "windows-1253", NULL} },
+ { "el", {"iso-8859-7", "windows-1253", NULL} },
/* Hebrew */
- { "he", {"iso-8859-8", "windows-1255", NULL} },
- { "iw", {"iso-8859-8", "windows-1255", NULL} },
+ { "he", {"iso-8859-8", "windows-1255", NULL} },
+ { "iw", {"iso-8859-8", "windows-1255", NULL} },
/* Turkish */
- { "tr", {"iso-8859-9", "windows-1254", NULL} },
+ { "tr", {"iso-8859-9", "windows-1254", NULL} },
/* Table end */
{ NULL, {NULL, NULL, NULL} }
@@ -166,9 +166,9 @@ get_encodings_for_lang (const char *lang,
char **encoding2,
char **encoding3)
{
- struct EncodingTriplet * encodings;
- gboolean success = FALSE;
- char * tmp_lang;
+ struct EncodingTriplet *encodings;
+ gboolean success = FALSE;
+ char *tmp_lang;
g_return_val_if_fail (lang != NULL, FALSE);
g_return_val_if_fail (encoding1 != NULL, FALSE);
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index ed0135ba88..2e6244c6d1 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -588,7 +588,7 @@ nm_access_point_class_init (NMAccessPointClass *ap_class)
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
-
+
/**
* NMAccessPoint:mode:
*
diff --git a/libnm/nm-vpn-editor.h b/libnm/nm-vpn-editor.h
index 26e48662b5..1b09c813de 100644
--- a/libnm/nm-vpn-editor.h
+++ b/libnm/nm-vpn-editor.h
@@ -83,4 +83,4 @@ gboolean nm_vpn_editor_update_connection (NMVpnEditor *editor,
G_END_DECLS
-#endif /* __NM_VPN_EDITOR_H__ */
+#endif /* __NM_VPN_EDITOR_H__ */
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index 1dc1556da1..3b4fc6b813 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -21,7 +21,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
],[dnl
AC_ARG_ENABLE(introspection,
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
- [Enable introspection for this build]),,
+ [Enable introspection for this build]),,
[enable_introspection=auto])
])dnl
@@ -44,7 +44,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
dnl Canonicalize enable_introspection
enable_introspection=$found_introspection
],dnl
- [dnl
+ [dnl
AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
])dnl
diff --git a/po/ChangeLog b/po/ChangeLog
index ab722de8c2..68c4752975 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,2146 +1,13 @@
-2009-03-12 Gintautas Miliauskas <gintautas@miliauskas.lt>
+Changelog for NetworkManager.
- * lt.po: Updated Lithuanian translation.
+A separate changelog is no longer maintained since 2009.
+See the latest version before removing it in git [1].
-2008-12-07 Simos Xenitellis <simos@gnome.org>
+For the detailed project history see git [2].
- * el.po: Updated Greek translation by Evgenia Petoumenou.
+For notable changes between releases see the NEWS file [3].
-2008-11-29 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2008-11-27 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2008-11-26 Manoj Kumar Giri <mgiri@redhat.com>
-
- * or.po: Updated Oriya Translation
-
-2008-11-26 Manoj Kumar Giri <mgiri@redhat.com>
-
- * or.po: Updated Oriya Translation
-
-2008-11-22 Mario Blättermann <mariobl@svn.gnome.org>
-
- * de.po: Updated German translation by Hauke Mehrtens.
-
-2008-11-19 Tomasz Dominikowski <tdominikowski@aviary.pl>
-
- * pl.po: Updated Polish translation
-
-2008-10-14 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-11-01 Dan Williams <dcbw@redhat.com>
-
- * de.po: Updated German translation (Hauke Mehrtens, bgo #557458)
-
-2008-10-22 Og Maciel <ogmaciel@gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation by
- Fabricio Godoy and Vladimir Melo.
-
-2008-10-18 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2008-10-11 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-10-07 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2008-10-06 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2008-10-01 Priit Laes <plaes at svn dot gnome dot org>
-
- * et.po: Translation updated by Mattias Põldaru
-
-2008-09-25 Claude Paroz <claude@2xlibre.net>
-
- * fr.po: Updated French translation.
-
-2008-09-25 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Translation updated.
-
-2008-09-25 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Updated Lithuanian translation.
-
-2008-09-21 Leonardo Ferreira Fontenelle <leonardof@gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation by Henrique P.
- Machado.
-
-2008-09-20 Luca Ferretti <elle.uca@libero.it>
-
- * it.po: Updated Italian translation by Francesco Marletta.
-
-2008-09-17 Petr Kovar <pknbe@volny.cz>
-
- * cs.po: Updated Czech translation by Jiri Eischmann.
-
-2008-09-15 Wouter Bolsterlee <wbolster@svn.gnome.org>
-
- * nl.po: Updated Dutch translation by Tino Meinen.
-
-2008-09-12 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2008-09-10 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-09-09 Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>
-
- * eu.po: Updated Basque translation.
-
-2008-09-08 Tomasz Dominikowski <tdominikowski@aviary.pl>
-
- * pl.po: Updated Polish translation
-
-2008-08-22 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
-
- * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
- * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-08-19 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-08-19 Tomasz Dominikowski <tdominikowski@aviary.pl>
-
- * pl.po: Updated Polish translation
-
-2008-08-14 Claude Paroz <claude@2xlibre.net>
-
- * fr.po: Updated French translation by Robert-André Mauchin.
-
-2008-08-14 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2008-08-09 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2008-08-02 Alexander Shopov <ash@contact.bg>
-
- * bg.po: Updated Bulgarian translation by
- Alexander Shopov <ash@contact.bg>
-
-2008-08-01 Og Maciel <ogmaciel@gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation by
- Henrique P Machado <zehrique@gmail.com>
-
-2008-07-31 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2008-07-31 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2008-07-27 Alexander Shopov <ash@contact.bg>
-
- * bg.po: Updated Bulgarian translation by
- Alexander Shopov <ash@contact.bg>
-
-2008-07-25 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2008-07-25 Gil Forcada <gforcada@gnome.org>
-
- * POTFILES.skip: Added some files here.
-
-2008-07-10 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Move file from here to
- * POTFILES.skip: here.
-
-2008-07-10 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Added missing file.
- * nb.po: Updated Norwegian bokmål translation.
-
-2008-07-05 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-07-02 Yannig Marchegay <yannig@marchegay.org>
-
- * oc.po: Updated Occitan translation.
-
-2008-07-01 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2008-06-24 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2008-06-14 Yannig Marchegay <yannig@marchegay.org>
-
- * oc.po: Updated Occitan translation.
-
-2008-06-06 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2008-05-29 Jonh Wendell <jwendell@gnome.org>
-
- * pt_BR.po: Brazilian Portuguese translation updated by Og Maciel.
-
-2008-05-27 Jonh Wendell <jwendell@gnome.org>
-
- * pt_BR.po: Brazilian Portuguese translation updated by Henrique Machado.
-
-2008-05-25 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-05-14 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2008-04-26 Gabor Kelemen <kelemeng@gnome.org>
-
- * hu.po: Translation updated.
-
-2008-04-13 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-03-29 Ihar Hrachyshka <booxter@lacinka.org>
-
- * be@latin.po: Updated Belarusian Latin translation by Ihar Hrachyshka.
-
-2008-03-19 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Translation updated
-
-2008-03-14 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-03-14 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2008-03-13 Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>
-
- * eu.po: Updated Basque translation.
-
-2008-03-12 Dan Williams <dcbw@redhat.com>
-
- * POTFILES.in: add missing translatables
-
-2008-03-10 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2008-03-09 Ihar Hrachyshka <booxter@lacinka.org>
-
- * be@latin.po: Updated Belarusian Latin translation.
-
-2008-03-09 Philip Withnall <pwithnall@svn.gnome.org>
-
- * en_GB.po: Updated British English translation.
-
-2008-03-09 Stéphane Raimbault <stephane.raimbault@gmail.com>
-
- * fr.po: Updated French translation by Robert-André Mauchin.
-
-2008-03-09 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2008-03-08 Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>
-
- * eu.po: Updated Basque translation.
-
-2008-03-07 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2008-02-28 Arangel Angov <arangel@linux.net.mk>
-
- * mk.po: Updated Macedonian translation.
-
-2008-02-28 Gil Forcada <gforcada@gnome.org>
-
- * ca.po: Updated Catalan translation.
-
-2008-02-24 Wadim Dziedzic <wadimd@svn.gnome.org>
-
- * pl.po: Updated polish translation
-
-2008-02-20 Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>
-
- * LINGUAS: Added 'eu' (Basque) entry.
- * eu.po: Added Basque translation.
-
-2008-02-19 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2007-02-17 Yair Hershkovitz <yairhr@gmail.com>
-
- * he.po, LINGUAS: Added Hebrew translation.
-
-2008-02-14 Pawan Chitrakar <chautari@gmail.com>
-
- * ne.po: Updated Nepali Translation.
-
-2008-02-13 Ignacio Casal Quinteiro <nacho.resa@gmail.com>
-
- * gl.po: Updated Galician Translation.
-
-2008-01-30 Jonh Wendell <jwendell@gnome.org>
-
- * pt_BR.po: Brazilian Portuguese translation updated by Luiz Armesto.
-
-2008-01-19 Stéphane Raimbault <stephane.raimbault@gmail.com>
-
- * fr.po: Updated French translation by Robert André-Mauchin and
- Stéphane Raimbault.
-
-2007-12-29 Changwoo Ryu <cwryu@debian.org>
-
- * ko.po: Updated Korean translation by Namhyung Kim.
-
-2007-12-28 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2007-12-26 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-12-19 Ihar Hrachyshka <booxter@lacinka.org>
-
- * be@latin.po: Updated Belarusian Latin translation.
-
-2007-12-19 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation
-
-2007-12-11 Andre Klapper <a9016009@gmx.de>
-
- * de.po: Updated German translation
-
-2007-12-08 Ihar Hrachyshka <booxter@lacinka.org>
-
- * be@latin.po: Updated Belarusian Latin translation.
-
-2007-12-06 Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2007-11-02 Priit Laes <plaes@svn.gnome.org>
-
- * et.po: Translation updated by Mattias Põldaru.
-
-2007-10-28 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2007-10-28 Priit Laes <plaes@svn.gnome.org>
-
- * et.po: Translation updated by Mattias Põldaru.
-
-2007-10-06 Funda Wang <fundawang@gmail.com>
-
- * POTFILES.in: Removed non-exist files.
-
-2007-07-23 Satoru SATOH <ssato@redhat.com>
-
- * ja.po: Updated Japanese translation.
-
-2007-07-16 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2007-05-01 Mohammad DAMT <mdamt@gnome.org>
-
- * id.po: Added Indonesian language by Andika Triwidada
- <andika@gmail.com>
- * LINGUAS: Added id.
-
-2007-04-16 Ihar Hrachyshka <iharh@gnome.org>
-
- * be@latin.po: Added Belarusian Latin translation.
- * LINGUAS: Added be@latin.
-
-2007-03-10 Hendrik Richter <hendrikr@gnome.org>
-
- * de.po: Updated German translation, by
- Thomas Gier <info@thomasgier.de>
-
-2007-03-07 Vladimer Sichinava <vsichi@gnome.org>
-
- * ka.po: Updated Georgian translation by
- Malkhaz Barkalaya <malxaz@gmail.com>
-
-2007-03-02 Leonardo Ferreira Fontenelle <leonardof@svn.gnome.org>
-
- * pt_BR.po: Fixed typo in Brazilian Portuguese translation by Og
- Maciel <ogmaciel@ubuntu.com>.
-
-2007-02-27 Abel Cheung <abelcheung@gmail.com>
-
- * LINGUAS: Added zh_HK.
-
-2007-02-25 Priit Laes <plaes@svn.gnome.org>
-
- * et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-02-25 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Translation updated.
-
-2007-02-23 Gintautas Miliauskas <gintas@akl.lt>
-
- * lt.po: Updated Lithuanian translation.
-
-2007-02-20 Artur Flinta <aflinta@cvs.gnome.org>
-
- * pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-02-18 Artur Flinta <aflinta@cvs.gnome.org>
-
- * pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-02-16 Maxim Dziumanenko <dziumanenko@gmail.com>
-
- * uk.po: Updated Ukrainian translation.
-
-2007-02-13 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2007-02-12 Ignacio Casal Quinteiro <nacho.resa@gmail.com>
-
- * gl.po: Added Galician Translation.
- * LINGUAS: Added 'gl'
-
-2007-02-11 Stéphane Raimbault <stephane.raimbault@gmail.com>
-
- * fr.po: Updated French translation by Jonathan Ernst.
-
-2007-02-9 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2007-02-8 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-02-08 Duarte Loreto <happyguy_pt@hotmail.com>
-
- * pt.po: Added Portuguese translation.
- * LINGUAS: Added Portuguese (pt).
-
-2007-02-04 Changwoo Ryu <cwryu@debian.org>
-
- * ko.po: Updated Korean translation by Young-Ho Cha.
-
-2007-02-02 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
-
- * zh_HK.po: Added Traditional Chinese translation(Hong Kong).
- * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2007-02-02 Alexander Shopov <ash@contact.bg>
-
- * bg.po: Updated Bulgarian translation by
- Alexander Shopov <ash@contact.bg>
-
-2007-01-31 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2007-01-23 Theppitak Karoonboonyanan <thep@linux.thai.net>
-
- * th.po: Updated Thai translation.
-
-2007-01-13 Raphael Higino <raphaelh@svn.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2007-01-13 Kostas Papadimas <pkst@gnome.org>
-
- * el.po: Updated Greek Translation
-
-2007-01-13 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-01-09 Matic Zgur <mr.zgur@gmail.com>
-
- * sl.po: Added Slovenian translation.
- * LINGUAS: Added sl to the list of languages.
-
-2007-01-05 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2007-01-03 Erdal Ronahi <erdal.ronahi@gmail.com>
-
- * LINGUAS: Added Kurdish (ku)
- * ku.po: Added initial Kurdish translations
-
-2006-12-28 David Lodge <dave@cirt.net>
-
- * LINGUAS: Added English (British)
-
-2006-12-28 David Lodge <dave@cirt.net>
-
- * en_GB.po: Updated English (British) translation
-
-2006-12-28 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-12-16 Theppitak Karoonboonyanan <thep@linux.thai.net>
-
- * th.po: Added Thai translation by
- Isriya Paireepairit <markpeak@gmail.com> and me.
- * LINGUAS: Added th.
-
-2006-12-13 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Translation updated.
-
-2006-12-10 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2006-12-10 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation and
- fixed an error thanks to Terje J. Hansen.
-
-2006-12-04 Francisco Javier F. Serrador <serrador@openshine.com>
-
- * es.po: Updated Spanish translation.
-
-2006-12-03 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
-
- * ca.po: Updated Catalan translation.
-
-2006-12-02 Dan Williams <dcbw@redhat.com>
-
- * POTFILES.in: add missing translatables
-
-2006-11-18 Djihed Afifi <djihed@gmail.com>
-
- * ar.po: Added Arabic Translation.
- * LINGUAS: Added ar.
-
-2006-11-02 Pema Geyleg <pgeyleg@gmail.com>
-
- * dz.po: Added Dzongkha Translation.
- * LINGUAS: Added "dz".
-
-2006-11-01 Satoru SATOH <ss@gnome.gr.jp>
-
- * ja.po: Fixed wrong plural forms.
-
-2006-10-30 Francisco Javier F. Serrador <serrador@openshine.com>
-
- * es.po: Updated Spanish translation.
-
-2006-10-21 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Translation updated.
-
-2006-10-21 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
-
- * ca.po: Updated Catalan translation.
-
-2006-10-17 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-10-16 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2006-10-15 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2006-10-15 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-10-12 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-10-08 Hendrik Richter <hendrikr@gnome.org>
-
- * de.po: Updated German translation, by
- Tobias Wolf <towolf@gmx.net>
-
-2006-10-08 Priit Laes <plaes@cvs.gnome.org>
-
- * et.po: Translation updated by Ivar Smolin.
-
-2006-10-02 Priit Laes <plaes@cvs.gnome.org>
-
- * et.po: Translation updated.
-
-2006-09-30 Alessio Frusciante <algol@firenze.linux.it>
-
- * it.po: Updated Italian translation by
- Francesco Marletta <francesco.marletta@tiscali.it>.
-
-2006-09-27 Priit Laes <plaes@cvs.gnome.org>
-
- * et.po: Translation added.
- * LINGUAS: Added et.
-
-2006-09-25 Pawan Chitrakar <pchitrakar@gmail.com>
-
- * ne.po: Updated Nepali Translation
-
-2006-09-13 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2006-09-12 Kostas Papadimas <pkst@gnome.org>
-
- * el.po: Fixed typos by Dimitris Glezos <dimitris@glezos.com>
-
-2006-09-12 David Lodge <dave@cirt.net>
-
- * en_GB.po: British (English) translation updated.
-
-2006-09-03 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
-
- * ca.po: Updated Catalan translation.
-
-2006-08-30 Leonid Kanter <leon@asplinux.ru>
-
- * LINGUAS: added "ru"
-
-2006-08-24 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-08-17 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-08-16 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-08-16 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Translation updated.
-
-2006-08-06 Dan Williams <dcbw@redhat.com>
-
- Patch from Michael Biebl <biebl@teco.edu>
- * de.po: Fix issues for German translation
-
-2006-07-29 Francisco Javier F. Serrador <serrador@openshine.com>
-
- * es.po: Updated Spanish translation.
-
-2006-07-28 Christophe Merlet <redfox@redfoxcenter.org>
-
- * fr.po: Updated French translation from
- Stéphane Raimbault <stephane.raimbault@free.fr>.
-
-2006-07-27 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2006-07-18 Satoru SATOH <ss@gnome.gr.jp>
-
- * ja.po: Updated Japanese translation.
-
-2006-07-16 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2006-07-14 Jakub Friedl <jfriedl@suse.cz>
-
- * cs.po: Added Czech translation
-
-2006-07-12 Leonid Kanter <leon@asplinux.ru>
-
- * ru.po: Added Russian translation
-
-2006-07-04 Simos Xenitellis <simos@gnome.org>
-
- * el.po: Added updated Greek translation by Dimitris Glezos.
-
-2006-07-03 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-07-01 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Updated Lithuanian translation.
-
-2006-06-28 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2006-06-26 Daniel Nylander <po@danielnylander.se>
-
- * sv.po: Updated Swedish translation.
-
-2006-06-21 Raivis Dejus <orvils@gmail.com>
-
- * lv.po: Added Latvian translation.
-
-2006-06-17 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2006-06-15 Hendrik Richter <hendrikr@gnome.org>
-
- * de.po: Updated German translation.
-
-2006-06-15 Hendrik Richter <hendrikr@gnome.org>
-
- * de.po: Updated German translation.
-
-2006-06-15 Hendrik Richter <hendrikr@gnome.org>
-
- * de.po: Updated German translation.
-
-2006-06-13 Wouter Bolsterlee <uws+gnome@xs4all.nl>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-06-09 Jakub Friedl <jfriedl@suse.cz>
-
- * cs.po: Updated Czech translation.
-
-2006-06-06 Jakub Friedl <jfriedl@suse.cz>
-
- * cs.po: Updated Czech translation.
-
-2006-06-02 Danilo Šegan <danilo.segan@pctel.com>
-
- Fixed bug #343274.
-
- * sr.po, sr@Latn.po: Fixed a translation on
- Filip Miletic's suggestion.
-
-2006-05-27 Funda Wang <fundawang@linux.net.cn>
-
- * zh_CN.po: Updated Simplified Chinese translation.
-
-2006-05-01 Josep Puigdemont Casamajó <josep.puigdemont@gmail.com>
-
- * ca.po: Updated Catalan translation.
-
-2006-04-17 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Remove obsolete duplicate.
-
-2006-04-14 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-04-11 Alessio Frusciante <algol@firenze.linux.it>
-
- * it.po: Updated Italian translation by
- Francesco Marletta <francesco.marletta@tiscali.it>.
-
-2006-04-01 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-03-31 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation by Jakub Friedl.
-
-2006-03-30 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-03-26 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same.
-
-2006-03-25 Christian Rose <menthos@menthos.com>
-
- * sv.po: Updated Swedish translation.
-
-2006-03-23 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2006-03-21 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2006-03-19 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-03-17 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Updated Lithuanian translation.
-
-2006-03-15 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-03-13 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-03-10 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-03-09 Øivind Hoel <ohoel@cvs.gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
-
-2006-03-08 Jakub Friedl <jfriedl@suse.cz>
-
- * cs.po: Translation updated.
-
-2006-03-06 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-03-04 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Updated Lithuanian translation.
-
-2006-03-02 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Add two missing files.
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same.
-
-2006-03-02 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2006-02-28 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2006-02-28 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-02-28 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-02-26 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2006-02-25 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Updated Lithuanian translation.
-
-2006-02-24 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-02-24 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-02-16 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2006-02-14 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Reinout en Tino.
-
-2006-02-13 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2006-02-11 Kang Jeong-Hee <keizie@gmail.com>
-
- * ko.po: Added Korean translation.
-
-2006-02-10 Øivind Hoel <ohoel@cvs.gnome.org>
-
- * nb.po: Updated Norwegian Bokmål translation
-
-2006-02-05 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-02-01 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-01-31 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2006-01-31 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Updated Vietnamese translation.
-
-2006-01-29 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
-
- * ca.po: Updated Catalan translation.
-
-2006-01-28 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2006-01-28 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-01-27 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2006-01-27 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: Added Vietnamese translation.
-
-2006-01-26 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2006-01-26 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2006-01-23 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-01-21 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-01-20 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2006-01-18 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2006-01-18 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2006-01-17 Adam Weinberger <adamw@gnome.org>
-
- * POTFILES.in: Added missing file.
- * en_CA.po: Updated Canadian English translation.
-
-2006-01-15 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2006-01-14 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2006-01-13 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2006-01-12 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2006-01-11 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2006-01-09 Adam Weinberger <adamw@gnome.org>
-
- * POTFILES.in: Added missing file.
- * en_CA.po: Updated Canadian English translation.
-
-2006-01-07 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
-
- * ca.po: Updated Catalan translation.
-
-2006-01-07 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2006-01-07 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2006-01-06 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Updated Finnish translation.
-
-2006-01-04 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-12-25 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Updated Lithuanian translation.
-
-2005-12-25 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2005-12-25 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-12-23 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-12-23 Adam Weinberger <adamw@gnome.org>
-
- * POTFILES.in: Added missing files.
- * en_CA.po: Updated Canadian English translation.
-
-2005-12-21 Žygimantas Beručka <zygis@gnome.org>
-
- * lt.po: Added Lithuanian translation.
-
-2005-12-20 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-12-19 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-12-16 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-12-16 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
-
- * da.po: Updated Danish translation.
-
-2005-12-15 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-12-15 Alexander Shopov <ash@contact.bg>
-
- * bg.po: Added Bulgarian translation by
- Alexander Shopov <ash@contact.bg>
-
-2005-12-11 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-12-11 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-12-05 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same
-
-2005-11-21 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-11-20 Ilkka Tuohela <hile@iki.fi>
-
- * fi.po: Added Finish translation
-
-2005-11-13 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-11-06 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-11-04 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-11-03 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-11-01 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-10-31 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-10-28 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-10-27 Christopher Aillon <caillon@redhat.com>
-
- * POTFILES.in: NetworkManager is now encoded in UTF-8
-
-2005-10-25 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-10-19 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-10-19 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-10-16 Funda Wang <fundawang@linux.net.cn>
-
- * zh_CN.po: Updated Simplified Chinese translation.
-
-2005-10-15 James Ogley <james@usr-local-bin.org>
-
- * en_GB.po: Updated British English translation
-
-2005-10-12 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation by Lucas Vieites Fariña.
-
-2005-10-10 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-10-06 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-10-05 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same.
-
-2005-10-05 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-10-04 Funda Wang <fundawang@linux.net.cn>
-
- * zh_CN.po: Updated Simplified Chinese translation.
-
-2005-09-27 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-09-26 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-09-23 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-09-22 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-09-21 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-09-18 Christian Rose <menthos@menthos.com>
-
- * sv.po: Updated Swedish translation.
-
-2005-09-06 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-09-06 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same
-
-2005-09-05 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-09-04 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-09-01 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-09-01 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-08-31 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-08-29 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-08-27 Josep Puigdemont <josep.puigdemont@gmail.com>
-
- * ca.po: Added Catalan translation.
-
-2005-08-27 Kostas Papadimas <pkst@gnome.org>
-
- * el.po: Updated Greek Translation
-
-2005-08-21 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-08-21 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-08-19 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-08-19 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian Bokmål translation.
- * no.po: Same.
-
-2005-08-19 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-08-19 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-08-18 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-08-17 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-08-16 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-08-16 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-08-15 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-08-13 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-08-13 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-08-12 Robert Love <rml@novell.com>
-
- * sv.po: move NetworkManager-vpn translations to their po/
- * POTFILES.skip: add another vpn-daemons/ file
-
-2005-08-10 Maxim Dziumanenko <mvd@mylinux.ua>
-
- * uk.po: Updated Ukrainian translation.
-
-2005-08-06 Adam Weinberger <adamw@gnome.org>
-
- * POTFILES.skip: Add with obsoleted files.
- * en_CA.po: Updated Canadian English translation.
-
-2005-08-06 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-08-06 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-08-06 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-08-04 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same
-
-2005-07-30 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: UPdated Spanish translation.
-
-2005-07-26 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-07-23 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-07-23 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-07-21 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- es.po: Updated Spanish translation.
-
-2005-07-21 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
-
- * zh_TW.po: Updated Traditional Chinese translation.
-
-2005-07-20 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-07-18 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-07-10 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-07-06 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-07-05 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-07-04 Terance Sola <terance@lyse.net>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po:
-
-2005-07-03 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-07-02 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-07-01 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-06-30 Robert Love <rml@novell.com>
-
- * POTFILES.in: remove examples/ translatable files as they are not
- part of the official dist and thus break "make distcheck". Also
- remove vpn-daemons/ translatable files as they are included in that
- directories own po/POTFILES.in file (and it breaks "make distcheck").
-
-2005-06-28 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmål translation.
- * no.po: Same
-
-2005-06-26 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-06-26 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-26 Christian Rose <menthos@menthos.com>
-
- * sv.po: Updated Swedish translation.
-
-2005-06-25 Christian Rose <menthos@menthos.com>
-
- * POTFILES.in: Added missing file entries.
-
-2005-06-25 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-24 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-06-23 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-06-21 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-21 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-06-20 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-06-20 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update Norwegian Bokmål translation.
- * no.po: Same
-
-2005-06-17 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-06-17 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-17 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-06-17 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-14 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-06-14 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-12 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-06-12 David Zeuthen <davidz@redhat.com>
-
- * POTFILES.in: Added gnome/vpn-properties/nm-vpn-properties.c and
- gnome/vpn-properties/nm-vpn-properties.glade
-
-2005-06-10 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-06-06 Maxim Dziumanenko <mvd@mylinux.com.ua>
-
- * uk.po: Updated Ukrainian translation.
-
-2005-06-01 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-06-01 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-05-29 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-05-24 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-05-24 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-05-23 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-05-20 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-05-19 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-05-15 Dan Williams <dcbw@redhat.com>
-
- From Filip Miletic:
- * po/sr.po
- po/sr@Latn.po
- configure.in
- - Serbian translation added
-
-2005-05-15 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-05-15 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-05-15 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-05-14 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-05-14 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-05-14 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-05-14 Pawan Chitrakar <pawan@mpp.org.np>
-
- * ne.po: Upadated Nepali translation
-
-2005-05-13 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-05-12 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-05-12 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-05-06 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-05-04 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-05-02 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-05-01 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update
- * no.po: Update
-
-2005-04-30 Christian Rose <menthos@menthos.com>
-
- * POTFILES.in: Removed nonexisting files and added
- missing ones.
- * sv.po: Updated Swedish translation.
-
-2005-04-24 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-04-22 Pawan Chitrakar <pawan@mpp.org.np>
-
- * ne.po: Added Nepali translation
-
-2005-04-21 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation updated.
-
-2005-04-19 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-04-19 David Lodge <dave@cirt.net>
-
- * en_GB.po: Updated British English translation.
-
-2005-04-19 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-04-19 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-04-16 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-04-15 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-04-14 Jorge Bernal 'Koke' <jbernal@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-04-09 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-04-07 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update
-
-2005-04-06 Gabor Kelemen <kelemeng@gnome.hu>
-
- * hu.po: Hungarian translation added.
-
-2005-04-04 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-04-04 Nikos Charonitakis <charosn@her.forthnet.gr>
-
- * el.po: Updated Greek translation.
-
-2005-04-03 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-04-02 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-04-01 Steve Murphy <murf@e-tools.com>
-
- * rw.po: Added Kinyarwanda translation.
-
-2005-04-01 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-04-01 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-03-26 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-03-16 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-03-04 Kjartan Maraas <kmaraas@gnome.org>
-
- * no.po: Update
- * nb.po: Update
-
-2005-03-02 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-02-28 Maxim Dziumanenko <mvd@mylinux.com.ua>
-
- * uk.po: Added Ukrainian translation.
-
-2005-02-27 Jim Huang <jserv@kaffe.org>
-
- * zh_TW.po: Added "zh_TW" (Traditional Chinese).
-
-2005-02-27 Alessio Frusciante <algol@firenze.linux.it>
-
- * it.po: Added Italian translation by
- Francesco Marletta <francesco.marletta@tiscali.it>.
-
-2005-02-22 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-02-20 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-02-20 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2005-02-19 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-02-18 Dan Williams <dcbw@redhat.com>
-
- * Correct spelling of "adaptor"->"adapter"
-
-2005-02-18 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update
- * no.po: Update
-
-2005-02-17 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-02-16 Christophe Merlet <redfox@redfoxcenter.org>
-
- * fr.po: Added French translation from
- Raphael Tournoy <lexpas@free.fr>.
-
-2005-02-14 Tomislav Vujec <tvujec@redhat.com>
-
- * configure.in
- po/hr.po
- - Add the Croatian locale.
-
-2005-02-14 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update
- * no.po: Update
-
-2005-02-13 David Lodge <dave@cirt.net>
-
- * en_GB.po: Updated British translation.
-
-2005-02-13 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-02-12 Nikos Charonitakis <charosn@her.forthnet.gr>
-
- * el.po: Updated Greek translation.
-
-2005-02-11 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2005-02-11 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-02-11 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-02-10 Dan Williams <dcbw@redhat.com>
-
- * POTFILES.in
- - Revert the Encoding change since it doesn't seem to work
- on FC4 or FC3 at the moment.
-
-2005-02-09 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-02-09 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-02-08 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Add encoding foo
- * nb.po: Update
- * no.po: Update
-
-2005-02-04 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2005-02-03 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2005-02-03 Frank Arnold <farnold@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2005-01-19 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update
- * no.po: Update
-
-2005-01-10 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2005-01-07 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2005-01-01 Satoru SATOH <ss@gnome.gr.jp>
-
- * ja.po: Added Japanese translation
-
-2004-12-25 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update.
-
-2004-12-20 Hendrik Brandt <heb@gnome-de.org>
-
- * de.po: Updated German translation.
-
-2004-12-19 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-12-18 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-12-18 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-12-17 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-12-07 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-12-05 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-12-05 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-12-04 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Add missing file.
- * nb.po: Update
-
-2004-11-29 Funda Wang <fundawang@linux.net.cn>
-
- * zh_CN.po: Updated Simplified Chinese translation.
-
-2004-11-14 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-11-09 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-11-09 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Add panel-applet/NWManagerOtherNetworkDialog.c
- * nb.po: Update
-
-2004-11-04 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-11-04 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-11-04 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-11-03 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-11-01 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated Norwegian bokmal translation.
-
-2004-10-31 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-10-30 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-30 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-10-25 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-10-24 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation.
-
-2004-10-24 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-23 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-10-22 Hendrik Brandt <hebra@cvs.gnome.org>
-
- * de.po: Updated German translation.
-
-2004-10-20 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update.
- * no.po: Update
-
-2004-10-18 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-17 David Lodge <dave@cirt.net>
-
- * en_GB.po: Updated British English translation.
-
-2004-10-17 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-10-17 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-10-15 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-10-15 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-10-15 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-10-14 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-14 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-10-13 David Lodge <dave@cirt.net>
-
- * en_GB.po: Updated British English translation.
-
-2004-10-10 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-10-10 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Updated Slovak translation.
-
-2004-10-10 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-10-10 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-09 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-10-08 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-10-08 Hendrik Brandt <hebra@cvs.gnome.org>
-
- * de.po: Added German translation.
-
-2004-10-08 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-08 Kjartan Maraas <kmaraas@gnome.org>
-
- * POTFILES.in: Add missing file.
- * nb.po: Update
- * no.po: Update
-
-2004-10-05 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-10-03 David Lodge <dave@cirt.net>
-
- * en_GB.po: Added British translation.
-
-2004-10-03 Marcel Telka <marcel@telka.sk>
-
- * sk.po: Added Slovak translation.
-
-2004-10-03 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-10-02 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-09-29 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Update
- * no.po: Update
-
-2004-09-27 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-09-23 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Daniel van Eeden.
-
-2004-09-23 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-09-23 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-09-22 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-21 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-09-21 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-Mon Sep 20 11:22:16 2004 Jonathan Blandford <jrb@redhat.com>
-
- * POTFILES.in: add panel-applet/menu-info.c
-
-2004-09-15 Laurent Dhima <laurenti@alblinux.net>
-
- * sq.po: Updated Albanian translation.
-
-2004-09-13 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-09-12 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation updated by Tino Meinen.
-
-2004-09-12 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Updated
-
-2004-09-11 Martin Willemoes Hansen <mwh@sysrq.dk>
-
- * da.po: Updated Danish translation.
-
-2004-09-10 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-09-10 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-09-09 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
- * es.po: Updated Spanish translation by Antonio Ognio.
-
-2004-09-09 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-09 Ankit Patel <ankit@redhat.com>
-
- * gu.po: Added Gujarati Translation.
-
-2004-09-09 Pablo Saratxaga <pablo@mandrakesoft.com>
-
- * wa.po: Added Walloon file.
-
-2004-09-08 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Updated Czech translation.
-
-2004-09-08 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-09-07 David Lodge <dave@cirt.net>
-
- * en_GB.po: Added British translation.
-
-2004-09-04 Laurent Dhima <laurenti@alblinux.net>
-
- * sq.po: Added Albanian translation.
-
-2004-09-03 Raphael Higino <raphaelh@cvs.gnome.org>
-
- * pt_BR.po: Added Brazilian Portuguese translation.
-
-2004-09-03 Akagic Amila <bono@linux.org.ba>
-
- * bs.po: Added Bosnian translation.
-
-2004-09-02 Vincent van Adrighem <adrighem@gnome.org>
-
- * nl.po: Translation added by Tino Meinen.
-
-2004-08-28 Kjartan Maraas <kmaraas@gnome.org>
-
- * nb.po: Add Norwegian translation.
- * no.po: Same.
-
-2004-08-28 Miloslav Trmac <mitr@volny.cz>
-
- * cs.po: Added Czech translation.
-
-2004-08-28 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Updated Canadian English translation.
-
-2004-08-27 Adam Weinberger <adamw@gnome.org>
-
- * en_CA.po: Added Canadian English translation.
-
-2004-08-27 Funda Wang <fundawang@linux.net.cn>
-
- * zh_CN.po: Added Simplified Chinese translation.
-
-2004-08-27 Christian Rose <menthos@menthos.com>
-
- * sv.po: Added Swedish translation.
-
-2004-08-27 Christian Rose <menthos@menthos.com>
-
- * .cvsignore: Sorted and added entries.
- * POTFILES.in: Added missing entries.
- * NetworkManager.pot: Removed. This is a generated file.
+[1] https://cgit.freedesktop.org/NetworkManager/NetworkManager/plain/po/ChangeLog?id=665d47466a16f57affa329e70b39648c7b104141
+[2] https://cgit.freedesktop.org/NetworkManager/NetworkManager/log/po
+[3] https://cgit.freedesktop.org/NetworkManager/NetworkManager/plain/NEWS
diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h
index a50a7d851b..22fae29397 100644
--- a/src/devices/nm-device-ethernet.h
+++ b/src/devices/nm-device-ethernet.h
@@ -24,12 +24,12 @@
#include "nm-device.h"
-#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ())
-#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet))
-#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
-#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET))
-#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET))
-#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
+#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ())
+#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet))
+#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
+#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET))
+#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET))
+#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
#define NM_DEVICE_ETHERNET_SPEED "speed"
#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
@@ -37,12 +37,12 @@
struct _NMDeviceEthernetPrivate;
typedef struct {
- NMDevice parent;
- struct _NMDeviceEthernetPrivate *_priv;
+ NMDevice parent;
+ struct _NMDeviceEthernetPrivate *_priv;
} NMDeviceEthernet;
typedef struct {
- NMDeviceClass parent;
+ NMDeviceClass parent;
} NMDeviceEthernetClass;
GType nm_device_ethernet_get_type (void);
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index 4aa7d4364c..b0d3ffa4f6 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -141,4 +141,4 @@ gboolean nm_device_match_hwaddr (NMDevice *device,
NMConnection *connection,
gboolean fail_if_no_hwaddr);
-#endif /* NM_DEVICE_PRIVATE_H */
+#endif /* NM_DEVICE_PRIVATE_H */
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 94906224ac..633690ebd9 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -436,7 +436,7 @@ typedef struct _NMDevicePrivate {
};
NMIP6Config * con_ip6_config; /* config from the setting */
AppliedConfig wwan_ip6_config;
- AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */
+ AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */
NMIP6Config * ext_ip6_config; /* Stuff added outside NM */
NMIP6Config * ext_ip6_config_captured; /* Configuration captured from platform. */
GSList * vpn6_configs; /* VPNs which use this device */
@@ -10899,7 +10899,7 @@ start_ping (NMDevice *self,
priv->gw_ping.log_domain = log_domain;
priv->gw_ping.address = g_strdup (address);
priv->gw_ping.binary = g_strdup (binary);
- priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */
+ priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */
if (spawn_ping (self)) {
priv->gw_ping.watch = g_child_watch_add (priv->gw_ping.pid, ip_check_ping_watch_cb, self);
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 74d920a8da..acb14a014e 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -439,19 +439,19 @@ dhclient_start (NMDhcpClient *client,
while (prefixes--)
g_ptr_array_add (argv, (gpointer) "-P");
}
- g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
+ g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
if (pid_file) {
- g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
+ g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
g_ptr_array_add (argv, (gpointer) pid_file);
}
- g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */
+ g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */
g_ptr_array_add (argv, (gpointer) priv->lease_file);
if (priv->conf_file) {
- g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
+ g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
g_ptr_array_add (argv, (gpointer) priv->conf_file);
}
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c
index d7ddd1943a..a03f9d05b5 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/dhcp/nm-dhcp-dhcpcanon.c
@@ -118,16 +118,16 @@ dhcpcanon_start (NMDhcpClient *client,
argv = g_ptr_array_new ();
g_ptr_array_add (argv, (gpointer) dhcpcanon_path);
- g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
+ g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
if (pid_file) {
- g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
+ g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
g_ptr_array_add (argv, (gpointer) pid_file);
}
if (priv->conf_file) {
- g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
+ g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
g_ptr_array_add (argv, (gpointer) priv->conf_file);
}
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c
index 66a31acf10..7a18d88b67 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/dhcp/nm-dhcp-dhcpcd.c
@@ -114,18 +114,18 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
argv = g_ptr_array_new ();
g_ptr_array_add (argv, (gpointer) dhcpcd_path);
- g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
+ g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
- g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */
+ g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */
- g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */
+ g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */
/* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */
g_ptr_array_add (argv, (gpointer) "-A");
- g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
+ g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
- g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
+ g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
#ifdef DHCPCD_SUPPORTS_IPV6
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index f2e1f32157..6b205cc02e 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -754,12 +754,12 @@ test_write_existing_commented_duid (void)
static const char *interface1_orig = \
"interface \"eth0\" {\n"
- " also request my-option;\n"
- " initial-delay 5;\n"
+ "\talso request my-option;\n"
+ "\tinitial-delay 5;\n"
"}\n"
"interface \"eth1\" {\n"
- " also request another-option;\n"
- " initial-delay 0;\n"
+ "\talso request another-option;\n"
+ "\tinitial-delay 0;\n"
"}\n"
"\n"
"also request yet-another-option;\n";
@@ -798,12 +798,12 @@ test_interface1 (void)
static const char *interface2_orig = \
"interface eth0 {\n"
- " also request my-option;\n"
- " initial-delay 5;\n"
+ "\talso request my-option;\n"
+ "\tinitial-delay 5;\n"
" }\n"
"interface eth1 {\n"
- " initial-delay 0;\n"
- " request another-option;\n"
+ "\tinitial-delay 0;\n"
+ "\trequest another-option;\n"
" } \n"
"\n"
"also request yet-another-option;\n";
@@ -844,12 +844,12 @@ test_config_req_intf (void)
{
static const char *const orig = \
"request subnet-mask, broadcast-address, routers,\n"
- " rfc3442-classless-static-routes,\n"
- " interface-mtu, host-name, domain-name, domain-search,\n"
- " domain-name-servers, nis-domain, nis-servers,\n"
- " nds-context, nds-servers, nds-tree-name,\n"
- " netbios-name-servers, netbios-dd-server,\n"
- " netbios-node-type, netbios-scope, ntp-servers;\n"
+ "\trfc3442-classless-static-routes,\n"
+ "\tinterface-mtu, host-name, domain-name, domain-search,\n"
+ "\tdomain-name-servers, nis-domain, nis-servers,\n"
+ "\tnds-context, nds-servers, nds-tree-name,\n"
+ "\tnetbios-name-servers, netbios-dd-server,\n"
+ "\tnetbios-node-type, netbios-scope, ntp-servers;\n"
"";
static const char *const expected = \
"# Created by NetworkManager\n"
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 6b44a96cfe..3d3dc523ef 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -887,6 +887,23 @@ get_expiry_time (guint32 timestamp, guint32 lifetime)
: (_item->lifetime) / 2); \
})
+static const char *
+_get_exp (char *buf, gsize buf_size, gint64 now_ns, gint32 expiry_time)
+{
+ int l;
+
+ if (expiry_time == G_MAXINT32)
+ return "permanent";
+ l = g_snprintf (buf, buf_size,
+ "%.4f",
+ ((double) ((expiry_time * NM_UTILS_NS_PER_SECOND) - now_ns)) / ((double) NM_UTILS_NS_PER_SECOND));
+ nm_assert (l < buf_size);
+ return buf;
+}
+
+#define get_exp(buf, now_ns, item) \
+ _get_exp ((buf), G_N_ELEMENTS (buf), (now_ns), (get_expiry (item)))
+
static void
_config_changed_log (NMNDisc *ndisc, NMNDiscConfigMap changed)
{
@@ -896,10 +913,14 @@ _config_changed_log (NMNDisc *ndisc, NMNDiscConfigMap changed)
char changedstr[CONFIG_MAP_MAX_STR];
char addrstr[INET6_ADDRSTRLEN];
char str_pref[35];
+ char str_exp[100];
+ gint64 now_ns;
if (!_LOGD_ENABLED ())
return;
+ now_ns = nm_utils_get_monotonic_timestamp_ns ();
+
priv = NM_NDISC_GET_PRIVATE (ndisc);
rdata = &priv->rdata;
@@ -910,35 +931,38 @@ _config_changed_log (NMNDisc *ndisc, NMNDiscConfigMap changed)
NMNDiscGateway *gateway = &g_array_index (rdata->gateways, NMNDiscGateway, i);
inet_ntop (AF_INET6, &gateway->address, addrstr, sizeof (addrstr));
- _LOGD (" gateway %s pref %s exp %d", addrstr,
+ _LOGD (" gateway %s pref %s exp %s", addrstr,
nm_icmpv6_router_pref_to_string (gateway->preference, str_pref, sizeof (str_pref)),
- get_expiry (gateway));
+ get_exp (str_exp, now_ns, gateway));
}
for (i = 0; i < rdata->addresses->len; i++) {
NMNDiscAddress *address = &g_array_index (rdata->addresses, NMNDiscAddress, i);
inet_ntop (AF_INET6, &address->address, addrstr, sizeof (addrstr));
- _LOGD (" address %s exp %d", addrstr, get_expiry (address));
+ _LOGD (" address %s exp %s", addrstr,
+ get_exp (str_exp, now_ns, address));
}
for (i = 0; i < rdata->routes->len; i++) {
NMNDiscRoute *route = &g_array_index (rdata->routes, NMNDiscRoute, i);
inet_ntop (AF_INET6, &route->network, addrstr, sizeof (addrstr));
- _LOGD (" route %s/%u via %s pref %s exp %d", addrstr, (guint) route->plen,
+ _LOGD (" route %s/%u via %s pref %s exp %s", addrstr, (guint) route->plen,
nm_utils_inet6_ntop (&route->gateway, NULL),
nm_icmpv6_router_pref_to_string (route->preference, str_pref, sizeof (str_pref)),
- get_expiry (route));
+ get_exp (str_exp, now_ns, route));
}
for (i = 0; i < rdata->dns_servers->len; i++) {
NMNDiscDNSServer *dns_server = &g_array_index (rdata->dns_servers, NMNDiscDNSServer, i);
inet_ntop (AF_INET6, &dns_server->address, addrstr, sizeof (addrstr));
- _LOGD (" dns_server %s exp %d", addrstr, get_expiry (dns_server));
+ _LOGD (" dns_server %s exp %s", addrstr,
+ get_exp (str_exp, now_ns, dns_server));
}
for (i = 0; i < rdata->dns_domains->len; i++) {
NMNDiscDNSDomain *dns_domain = &g_array_index (rdata->dns_domains, NMNDiscDNSDomain, i);
- _LOGD (" dns_domain %s exp %d", dns_domain->domain, get_expiry (dns_domain));
+ _LOGD (" dns_domain %s exp %s", dns_domain->domain,
+ get_exp (str_exp, now_ns, dns_domain));
}
}
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c
index 5bde924c27..476e27e71a 100644
--- a/src/nm-checkpoint.c
+++ b/src/nm-checkpoint.c
@@ -304,7 +304,7 @@ activate:
&local_error)) {
_LOGW ("rollback: reactivation of connection %s/%s failed: %s",
nm_connection_get_id ((NMConnection *) connection),
- nm_connection_get_uuid ((NMConnection * ) connection),
+ nm_connection_get_uuid ((NMConnection *) connection),
local_error->message);
g_clear_error (&local_error);
result = NM_ROLLBACK_RESULT_ERR_FAILED;
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 2cb34de7a2..3a5118508b 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -3909,22 +3909,22 @@ nm_utils_lifetime_get (guint32 timestamp,
* NM_PLATFORM_LIFETIME_PERMANENT). The real lifetime==0 addresses (E.g. DHCP6 telling us
* to drop an address will have timestamp set.
*/
- *out_lifetime = NM_PLATFORM_LIFETIME_PERMANENT;
- *out_preferred = NM_PLATFORM_LIFETIME_PERMANENT;
+ NM_SET_OUT (out_lifetime, NM_PLATFORM_LIFETIME_PERMANENT);
+ NM_SET_OUT (out_preferred, NM_PLATFORM_LIFETIME_PERMANENT);
g_return_val_if_fail (preferred == 0, TRUE);
} else {
if (now <= 0)
now = nm_utils_get_monotonic_timestamp_s ();
t_lifetime = nm_utils_lifetime_rebase_relative_time_on_now (timestamp, lifetime, now);
if (!t_lifetime) {
- *out_lifetime = 0;
- *out_preferred = 0;
+ NM_SET_OUT (out_lifetime, 0);
+ NM_SET_OUT (out_preferred, 0);
return FALSE;
}
t_preferred = nm_utils_lifetime_rebase_relative_time_on_now (timestamp, preferred, now);
- *out_lifetime = t_lifetime;
- *out_preferred = MIN (t_preferred, t_lifetime);
+ NM_SET_OUT (out_lifetime, t_lifetime);
+ NM_SET_OUT (out_preferred, MIN (t_preferred, t_lifetime));
/* Assert that non-permanent addresses have a (positive) @timestamp. nm_utils_lifetime_rebase_relative_time_on_now()
* treats addresses with timestamp 0 as *now*. Addresses passed to _address_get_lifetime() always
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 9d4255a520..692182e183 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -268,19 +268,19 @@ _addresses_sort_cmp (const NMPlatformIP6Address *a1,
if (p1 != p2)
return p1 > p2 ? -1 : 1;
- ipv6_privacy1 = !!(a1->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_TEMPORARY));
- ipv6_privacy2 = !!(a2->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_TEMPORARY));
+ ipv6_privacy1 = !!(a1->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_SECONDARY));
+ ipv6_privacy2 = !!(a2->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_SECONDARY));
if (ipv6_privacy1 || ipv6_privacy2) {
gboolean public1 = TRUE, public2 = TRUE;
if (ipv6_privacy1) {
- if (a1->n_ifa_flags & IFA_F_TEMPORARY)
+ if (a1->n_ifa_flags & IFA_F_SECONDARY)
public1 = prefer_temp;
else
public1 = !prefer_temp;
}
if (ipv6_privacy2) {
- if (a2->n_ifa_flags & IFA_F_TEMPORARY)
+ if (a2->n_ifa_flags & IFA_F_SECONDARY)
public2 = prefer_temp;
else
public2 = !prefer_temp;
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 4ef786f6e9..11e05c31f7 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -768,6 +768,9 @@ nm_log_handler (const gchar *log_domain,
break;
}
+ if (global.debug_stderr)
+ g_printerr ("%s%s\n", global.prefix, message ?: "");
+
switch (global.log_backend) {
#if SYSTEMD_JOURNAL
case LOG_BACKEND_JOURNAL:
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 399de4a743..67051f7769 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -3124,13 +3124,15 @@ array_ip6_address_position (const GPtrArray *addresses,
for (i = 0, pos = 0; i < len; i++) {
NMPlatformIP6Address *candidate = NMP_OBJECT_CAST_IP6_ADDRESS (addresses->pdata[i]);
- if (IN6_ARE_ADDR_EQUAL (&candidate->address, &address->address) && candidate->plen == address->plen) {
- guint32 lifetime, preferred;
-
- if (nm_utils_lifetime_get (candidate->timestamp, candidate->lifetime, candidate->preferred,
- now, &lifetime, &preferred))
- return pos;
- }
+ if ( IN6_ARE_ADDR_EQUAL (&candidate->address, &address->address)
+ && candidate->plen == address->plen
+ && nm_utils_lifetime_get (candidate->timestamp,
+ candidate->lifetime,
+ candidate->preferred,
+ now,
+ NULL,
+ NULL))
+ return pos;
if (!ignore_ll || !IN6_IS_ADDR_LINKLOCAL (&candidate->address))
pos++;
@@ -3331,7 +3333,7 @@ nm_platform_ip4_address_sync (NMPlatform *self,
known_address = NMP_OBJECT_CAST_IP4_ADDRESS (known_addresses->pdata[i]);
if (!nm_utils_lifetime_get (known_address->timestamp, known_address->lifetime, known_address->preferred,
- now, &lifetime, &preferred))
+ now, NULL, NULL))
goto delete_and_next;
if (G_UNLIKELY (!known_addresses_idx)) {
@@ -3556,7 +3558,7 @@ nm_platform_ip6_address_sync (NMPlatform *self,
const NMPlatformIP6Address *known_address = NMP_OBJECT_CAST_IP6_ADDRESS (known_addresses->pdata[i]);
guint32 lifetime, preferred;
- if (NM_FLAGS_HAS (known_address->n_ifa_flags, IFA_F_TEMPORARY)) {
+ if (NM_FLAGS_HAS (known_address->n_ifa_flags, IFA_F_SECONDARY)) {
/* Kernel manages these */
continue;
}
@@ -5083,10 +5085,10 @@ NM_UTILS_FLAGS2STR_DEFINE (nm_platform_addr_flags2str, unsigned,
NM_UTILS_FLAGS2STR (IFA_F_OPTIMISTIC, "optimistic"),
NM_UTILS_FLAGS2STR (IFA_F_HOMEADDRESS, "homeaddress"),
NM_UTILS_FLAGS2STR (IFA_F_DEPRECATED, "deprecated"),
- NM_UTILS_FLAGS2STR (IFA_F_TENTATIVE, "tentative"),
NM_UTILS_FLAGS2STR (IFA_F_PERMANENT, "permanent"),
NM_UTILS_FLAGS2STR (IFA_F_MANAGETEMPADDR, "mngtmpaddr"),
NM_UTILS_FLAGS2STR (IFA_F_NOPREFIXROUTE, "noprefixroute"),
+ NM_UTILS_FLAGS2STR (IFA_F_TENTATIVE, "tentative"),
);
NM_UTILS_ENUM2STR_DEFINE (nm_platform_route_scope2str, int,
diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index a2082b05d7..cdab00da57 100644
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -404,7 +404,7 @@ struct nl80211_bss_info {
gboolean valid;
};
-#define WLAN_EID_SSID 0
+#define WLAN_EID_SSID 0
static void
find_ssid (guint8 *ies, guint32 ies_len,
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/nms-ifupdown-interface-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index 8421afc202..014998a695 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
@@ -129,8 +129,8 @@ _recursive_ifparser (const char *eni_file, int quiet)
while (!feof(inp))
{
- char *token[128]; /* 255 chars can only be split into 127 tokens */
- char value[255]; /* large enough to join previously split tokens */
+ char *token[128]; /* 255 chars can only be split into 127 tokens */
+ char value[255]; /* large enough to join previously split tokens */
char *safeptr;
int toknum;
int len = 0;
@@ -169,7 +169,7 @@ _recursive_ifparser (const char *eni_file, int quiet)
continue;
}
-#define SPACES " \t"
+#define SPACES " \t"
/* tokenize input; */
for (toknum = 0, token[toknum] = strtok_r(line, SPACES, &safeptr);
token[toknum] != NULL;
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);
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c
index d53a13c4b6..5198d75fb9 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/supplicant/nm-supplicant-settings-verify.c
@@ -222,10 +222,10 @@ validate_type_keyword (const struct Opt * opt,
const char * value,
const guint32 len)
{
- char ** allowed;
- gchar ** candidates = NULL;
- char ** candidate;
- gboolean found = FALSE;
+ char **allowed;
+ gchar **candidates = NULL;
+ char **candidate;
+ gboolean found = FALSE;
g_return_val_if_fail (opt != NULL, FALSE);
g_return_val_if_fail (value != NULL, FALSE);
diff --git a/src/supplicant/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h
index f75827ec60..747cf15274 100644
--- a/src/supplicant/nm-supplicant-types.h
+++ b/src/supplicant/nm-supplicant-types.h
@@ -21,9 +21,9 @@
#ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__
#define __NETWORKMANAGER_SUPPLICANT_TYPES_H__
-#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1"
-#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1"
-#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
+#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1"
+#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1"
+#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
typedef struct _NMSupplicantManager NMSupplicantManager;
typedef struct _NMSupplicantInterface NMSupplicantInterface;