Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at Fri May 6 15:13:26 CEST 2011.
-------- --- NetworkManager/NetworkManager.changes 2011-05-03 00:20:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2011-05-05 11:24:24.000000000 +0200 @@ -1,0 +2,19 @@ +Wed May 4 12:27:58 CEST 2011 - dims...@opensuse.org + +- Update to version 0.8.999: + + IPv6 compliance and RDNSS lifetime fixes + + systemd cooperation fixes + + API fixes for clients creating wifi connections + + API additions to make client code simpler + + Startup efficiency fixes by not parsing the ConsoleKit database + more than required + + Fixes for IBM s390 CTC-type network devices + + Fixes for WWAN enable/disable status + + Fixes for ifcfg-rh configuration plugin handling of IP addresses + + Support for Easytether Android handset tethering + + Better handling of rfkill for WiFi and WiMAX interfaces + + Addition of IPv6 support for dispatcher scripts + + Fixed handling of DER-format certificates +- Update f15-branch.patch from the git branch. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- NetworkManager-0.8.998.tar.bz2 New: ---- NetworkManager-0.8.999.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.So5FoZ/_old 2011-05-06 15:11:16.000000000 +0200 +++ /var/tmp/diff_new_pack.So5FoZ/_new 2011-05-06 15:11:16.000000000 +0200 @@ -19,7 +19,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.8.998 +Version: 0.8.999 Release: 1 License: GPLv2+ Group: Productivity/Networking/System @@ -194,6 +194,7 @@ %{_sysconfdir}/NetworkManager/nm-system-settings.conf %attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/nfs /lib/systemd/system/NetworkManager.service +/lib/systemd/system/NetworkManager-wait-online.service %dir /lib/udev %dir /lib/udev/rules.d /lib/udev/rules.d/77-nm-olpc-mesh.rules ++++++ NetworkManager-0.8.998.tar.bz2 -> NetworkManager-0.8.999.tar.bz2 ++++++ ++++ 21935 lines of diff (skipped) ++++++ f15-branch.patch ++++++ --- /var/tmp/diff_new_pack.So5FoZ/_old 2011-05-06 15:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.So5FoZ/_new 2011-05-06 15:11:17.000000000 +0200 @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index e45c6e1..6789415 100644 +index b18ccc0..35b4fea 100644 --- a/configure.ac +++ b/configure.ac -@@ -571,6 +571,7 @@ Makefile +@@ -592,6 +592,7 @@ Makefile include/Makefile include/nm-version.h src/Makefile @@ -794,10 +794,10 @@ +#endif /* NM_COMPAT_ACT_REQUEST_H */ diff --git a/src/compat/nm-compat-active-connection.c b/src/compat/nm-compat-active-connection.c new file mode 100644 -index 0000000..43b0c78 +index 0000000..8b6e75f --- /dev/null +++ b/src/compat/nm-compat-active-connection.c -@@ -0,0 +1,253 @@ +@@ -0,0 +1,255 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * @@ -847,6 +847,7 @@ + PROP_0 = 0x1000, + PROP_SERVICE_NAME, + PROP_CONNECTION, ++ PROP_UUID, + PROP_SPECIFIC_OBJECT, + PROP_DEVICES, + PROP_STATE, @@ -1041,6 +1042,7 @@ + + nm_active_connection_install_properties (object_class, + PROP_CONNECTION, ++ PROP_UUID, + PROP_SPECIFIC_OBJECT, + PROP_DEVICES, + PROP_STATE, @@ -4423,7 +4425,7 @@ +</node> + diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c -index fb42de6..35654d6 100644 +index d3eb920..c3b93fe 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -39,6 +39,7 @@ @@ -4443,7 +4445,7 @@ } NMActRequestPrivate; enum { -@@ -101,9 +104,128 @@ typedef struct { +@@ -102,9 +105,128 @@ typedef struct { guint32 call_id; NMActRequestSecretsFunc callback; gpointer callback_data; @@ -4572,7 +4574,7 @@ get_secrets_cb (NMSettingsConnection *connection, guint32 call_id, const char *agent_username, -@@ -118,7 +240,7 @@ get_secrets_cb (NMSettingsConnection *connection, +@@ -119,7 +241,7 @@ get_secrets_cb (NMSettingsConnection *connection, priv->secrets_calls = g_slist_remove (priv->secrets_calls, info); info->callback (info->self, call_id, NM_CONNECTION (connection), error, info->callback_data); @@ -4581,7 +4583,7 @@ } guint32 -@@ -142,21 +264,26 @@ nm_act_request_get_secrets (NMActRequest *self, +@@ -143,21 +265,26 @@ nm_act_request_get_secrets (NMActRequest *self, info->self = self; info->callback = callback; info->callback_data = callback_data; @@ -4618,7 +4620,7 @@ return call_id; } -@@ -181,8 +308,10 @@ nm_act_request_cancel_secrets (NMActRequest *self, guint32 call_id) +@@ -182,8 +309,10 @@ nm_act_request_cancel_secrets (NMActRequest *self, guint32 call_id) priv->secrets_calls = g_slist_remove_link (priv->secrets_calls, iter); g_slist_free (iter); @@ -4631,7 +4633,7 @@ break; } } -@@ -466,6 +595,12 @@ device_state_changed (NMDevice *device, +@@ -467,6 +596,12 @@ device_state_changed (NMDevice *device, } } @@ -4644,7 +4646,7 @@ /********************************************************************/ NMActRequest * -@@ -517,6 +652,8 @@ nm_act_request_init (NMActRequest *req) +@@ -518,6 +653,8 @@ nm_act_request_init (NMActRequest *req) dbus_g_connection_register_g_object (nm_dbus_manager_get_connection (dbus_mgr), priv->ac_path, G_OBJECT (req)); @@ -4653,7 +4655,7 @@ g_object_unref (dbus_mgr); } -@@ -584,12 +721,14 @@ dispose (GObject *object) +@@ -588,12 +725,14 @@ dispose (GObject *object) for (iter = priv->secrets_calls; iter; iter = g_slist_next (iter)) { GetSecretsInfo *info = iter->data; @@ -4755,7 +4757,7 @@ object_class->get_property = get_property; object_class->set_property = set_property; diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c -index 626c2c0..03535cf 100644 +index 9258f77..35dbd3f 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -55,6 +55,7 @@ @@ -4775,7 +4777,7 @@ return object; error: -@@ -1622,22 +1625,29 @@ nm_device_wifi_ap_list_print (NMDeviceWifi *self) +@@ -1630,22 +1633,29 @@ nm_device_wifi_ap_list_print (NMDeviceWifi *self) nm_log_dbg (LOGD_WIFI_SCAN, "Current AP list: done"); } @@ -4826,7 +4828,7 @@ #endif /* NM_DEVICE_WIFI_H */ diff --git a/src/nm-device.c b/src/nm-device.c -index 9b182c4..86352b2 100644 +index ebd8cdb..d61510a 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -55,6 +55,7 @@ @@ -4856,7 +4858,7 @@ out: G_OBJECT_CLASS (nm_device_parent_class)->dispose (object); } -@@ -3915,3 +3921,18 @@ nm_device_clear_autoconnect_inhibit (NMDevice *device) +@@ -4053,3 +4059,18 @@ nm_device_clear_autoconnect_inhibit (NMDevice *device) priv->autoconnect_inhibit = FALSE; } @@ -4890,10 +4892,10 @@ #endif /* NM_DEVICE_H */ diff --git a/src/nm-manager.c b/src/nm-manager.c -index aad6508..a37c6c4 100644 +index 568ff2a..bec9755 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -59,6 +59,9 @@ +@@ -62,6 +62,9 @@ #include "nm-settings-connection.h" #include "nm-manager-auth.h" #include "NetworkManagerUtils.h" @@ -4903,7 +4905,7 @@ #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd" #define NM_AUTOIP_DBUS_IFACE "org.freedesktop.nm_avahi_autoipd" -@@ -178,7 +181,10 @@ struct PendingActivation { +@@ -189,7 +192,10 @@ struct PendingActivation { PendingActivationFunc callback; NMAuthChain *chain; @@ -4914,7 +4916,7 @@ NMConnection *connection; char *specific_object_path; char *device_path; -@@ -210,6 +216,11 @@ typedef struct { +@@ -223,6 +229,11 @@ typedef struct { NMSettings *settings; char *hostname; @@ -4926,7 +4928,7 @@ RadioState radio_states[RFKILL_TYPE_MAX]; gboolean sleeping; gboolean net_enabled; -@@ -252,6 +263,11 @@ enum { +@@ -265,6 +276,11 @@ enum { CHECK_PERMISSIONS, USER_PERMISSIONS_CHANGED, @@ -4938,7 +4940,7 @@ LAST_SIGNAL }; -@@ -500,11 +516,15 @@ manager_device_state_changed (NMDevice *device, +@@ -513,11 +529,15 @@ manager_device_state_changed (NMDevice *device, if (new_state == NM_DEVICE_STATE_ACTIVATED) { NMActRequest *req; @@ -4957,7 +4959,7 @@ } } -@@ -621,6 +641,7 @@ nm_manager_get_state (NMManager *manager) +@@ -634,6 +654,7 @@ nm_manager_get_state (NMManager *manager) { g_return_val_if_fail (NM_IS_MANAGER (manager), NM_STATE_UNKNOWN); @@ -4965,7 +4967,7 @@ return NM_MANAGER_GET_PRIVATE (manager)->state; } -@@ -670,6 +691,7 @@ pending_activation_new (NMManager *manager, +@@ -683,6 +704,7 @@ pending_activation_new (NMManager *manager, DBusGMethodInvocation *context, const char *device_path, const char *connection_path, @@ -4973,7 +4975,7 @@ GHashTable *settings, const char *specific_object_path, PendingActivationFunc callback, -@@ -737,6 +759,7 @@ pending_activation_new (NMManager *manager, +@@ -750,6 +772,7 @@ pending_activation_new (NMManager *manager, pending->device_path = g_strdup (device_path); pending->connection_path = g_strdup (connection_path); @@ -4981,7 +4983,7 @@ pending->connection = connection; /* "/" is special-cased to NULL to get through D-Bus */ -@@ -852,6 +875,9 @@ pending_activation_destroy (PendingActivation *pending, +@@ -865,6 +888,9 @@ pending_activation_destroy (PendingActivation *pending, if (pending->chain) nm_auth_chain_unref (pending->chain); @@ -4991,7 +4993,7 @@ memset (pending, 0, sizeof (PendingActivation)); g_slice_free (PendingActivation, pending); } -@@ -889,6 +915,39 @@ get_active_connections (NMManager *manager, NMConnection *filter) +@@ -899,6 +925,39 @@ get_active_connections (NMManager *manager, NMConnection *filter) return active; } @@ -5031,7 +5033,7 @@ /*******************************************************************/ /* Settings stuff via NMSettings */ /*******************************************************************/ -@@ -946,6 +1005,503 @@ system_hostname_changed_cb (NMSettings *settings, +@@ -956,6 +1015,503 @@ system_hostname_changed_cb (NMSettings *settings, } /*******************************************************************/ @@ -5535,7 +5537,7 @@ /* General NMManager stuff */ /*******************************************************************/ -@@ -1444,6 +2000,8 @@ add_device (NMManager *self, NMDevice *device) +@@ -1477,6 +2033,8 @@ add_device (NMManager *self, NMDevice *device) G_OBJECT (device)); nm_log_info (LOGD_CORE, "(%s): exported as %s", iface, path); g_free (path); @@ -5544,7 +5546,7 @@ /* Check if we should assume the device's active connection by matching its * config with an existing system connection. -@@ -1989,14 +2547,18 @@ static void +@@ -2043,14 +2601,18 @@ static void pending_activate (NMManager *self, PendingActivation *pending) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); @@ -5565,7 +5567,7 @@ if (!connection) { error = g_error_new_literal (NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_CONNECTION, -@@ -2007,7 +2569,7 @@ pending_activate (NMManager *self, PendingActivation *pending) +@@ -2061,7 +2623,7 @@ pending_activate (NMManager *self, PendingActivation *pending) sender = dbus_g_method_get_sender (pending->context); g_assert (sender); path = nm_manager_activate_connection (self, @@ -5574,7 +5576,7 @@ pending->specific_object_path, pending->device_path, sender, -@@ -2053,6 +2615,7 @@ impl_manager_activate_connection (NMManager *self, +@@ -2107,6 +2669,7 @@ impl_manager_activate_connection (NMManager *self, context, device_path, connection_path, @@ -5582,7 +5584,7 @@ NULL, specific_object_path, activation_auth_done, -@@ -2066,6 +2629,91 @@ impl_manager_activate_connection (NMManager *self, +@@ -2120,6 +2683,91 @@ impl_manager_activate_connection (NMManager *self, } } @@ -5674,7 +5676,7 @@ static void activation_add_done (NMSettings *self, NMSettingsConnection *connection, -@@ -2122,6 +2770,7 @@ impl_manager_add_and_activate_connection (NMManager *self, +@@ -2176,6 +2824,7 @@ impl_manager_add_and_activate_connection (NMManager *self, context, device_path, NULL, @@ -5682,7 +5684,7 @@ settings, specific_object_path, add_and_activate_auth_done, -@@ -2236,13 +2885,21 @@ impl_manager_deactivate_connection (NMManager *self, +@@ -2287,13 +2936,21 @@ impl_manager_deactivate_connection (NMManager *self, for (iter = priv->devices; iter; iter = g_slist_next (iter)) { NMActRequest *req; const char *req_path = NULL; @@ -5706,7 +5708,7 @@ break; } } -@@ -2264,7 +2921,7 @@ impl_manager_deactivate_connection (NMManager *self, +@@ -2315,7 +2972,7 @@ impl_manager_deactivate_connection (NMManager *self, * deactivate the connection. */ if (!nm_auth_get_caller_uid (context, @@ -5715,7 +5717,7 @@ &sender_uid, &error_desc)) { error = g_error_new_literal (NM_MANAGER_ERROR, -@@ -2299,6 +2956,14 @@ impl_manager_deactivate_connection (NMManager *self, +@@ -2350,6 +3007,14 @@ impl_manager_deactivate_connection (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -5730,7 +5732,7 @@ static void do_sleep_wake (NMManager *self) { -@@ -2511,6 +3176,14 @@ impl_manager_sleep (NMManager *self, +@@ -2562,6 +3227,14 @@ impl_manager_sleep (NMManager *self, #endif } @@ -5745,7 +5747,7 @@ static void upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) { -@@ -2648,6 +3321,14 @@ impl_manager_enable (NMManager *self, +@@ -2699,6 +3372,14 @@ impl_manager_enable (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK, TRUE); } @@ -5760,7 +5762,7 @@ /* Permissions */ static void -@@ -2807,6 +3488,12 @@ nm_manager_start (NMManager *self) +@@ -2860,6 +3541,12 @@ nm_manager_start (NMManager *self) system_unmanaged_devices_changed_cb (priv->settings, NULL, self); system_hostname_changed_cb (priv->settings, NULL, self); @@ -5773,7 +5775,7 @@ nm_udev_manager_query_devices (priv->udev_mgr); bluez_manager_resync_devices (self); } -@@ -2958,7 +3645,9 @@ prop_filter (DBusConnection *connection, +@@ -3011,7 +3698,9 @@ prop_filter (DBusConnection *connection, if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; dbus_message_iter_get_basic (&iter, &propiface); @@ -5784,7 +5786,7 @@ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; dbus_message_iter_next (&iter); -@@ -3091,6 +3780,11 @@ nm_manager_get (NMSettings *settings, +@@ -3144,6 +3833,11 @@ nm_manager_get (NMSettings *settings, dbus_g_connection_register_g_object (bus, NM_DBUS_PATH, G_OBJECT (singleton)); @@ -5796,7 +5798,7 @@ priv->udev_mgr = nm_udev_manager_new (); g_signal_connect (priv->udev_mgr, "device-added", -@@ -3117,6 +3811,9 @@ nm_manager_get (NMSettings *settings, +@@ -3170,6 +3864,9 @@ nm_manager_get (NMSettings *settings, G_CALLBACK (bluez_manager_bdaddr_removed_cb), singleton); @@ -5806,7 +5808,7 @@ return singleton; } -@@ -3148,6 +3845,10 @@ dispose (GObject *object) +@@ -3201,6 +3898,10 @@ dispose (GObject *object) g_free (priv->hostname); g_free (priv->config_file); @@ -5817,7 +5819,7 @@ g_object_unref (priv->settings); if (priv->vpn_manager_id) { -@@ -3336,11 +4037,15 @@ periodic_update_active_connection_timestamps (gpointer user_data) +@@ -3455,11 +4156,15 @@ periodic_update_active_connection_timestamps (gpointer user_data) const char *active_path = g_ptr_array_index (active, i); NMActRequest *req; NMDevice *device = NULL; @@ -5836,7 +5838,7 @@ } return TRUE; -@@ -3390,6 +4095,10 @@ nm_manager_init (NMManager *manager) +@@ -3509,6 +4214,10 @@ nm_manager_init (NMManager *manager) priv->dbus_mgr = nm_dbus_manager_get (); @@ -5847,7 +5849,7 @@ priv->modem_manager = nm_modem_manager_get (); priv->modem_added_id = g_signal_connect (priv->modem_manager, "modem-added", G_CALLBACK (modem_added), manager); -@@ -3630,6 +4339,8 @@ nm_manager_class_init (NMManagerClass *manager_class) +@@ -3749,6 +4458,8 @@ nm_manager_class_init (NMManagerClass *manager_class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -5856,7 +5858,7 @@ signals[USER_PERMISSIONS_CHANGED] = g_signal_new ("user-permissions-changed", G_OBJECT_CLASS_TYPE (object_class), -@@ -3638,6 +4349,38 @@ nm_manager_class_init (NMManagerClass *manager_class) +@@ -3757,6 +4468,38 @@ nm_manager_class_init (NMManagerClass *manager_class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -5932,10 +5934,10 @@ + #endif /* NM_MANAGER_H */ diff --git a/src/nm-policy.c b/src/nm-policy.c -index fcada54..0156cc4 100644 +index 5c30828..6b85567 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c -@@ -705,9 +705,12 @@ auto_activate_device (gpointer user_data) +@@ -718,9 +718,12 @@ auto_activate_device (gpointer user_data) if (nm_device_get_act_request (data->device)) goto out; @@ -5949,7 +5951,7 @@ while (iter) { NMConnection *candidate = NM_CONNECTION (iter->data); -@@ -718,7 +721,7 @@ auto_activate_device (gpointer user_data) +@@ -731,7 +734,7 @@ auto_activate_device (gpointer user_data) * to any logged-in users. */ if ( get_connection_auto_retries (candidate) == 0 @@ -5958,7 +5960,7 @@ connections = g_slist_remove (connections, candidate); } -@@ -1145,6 +1148,12 @@ nm_policy_new (NMManager *manager, +@@ -1168,6 +1171,12 @@ nm_policy_new (NMManager *manager, _connect_manager_signal (policy, "device-added", device_added); _connect_manager_signal (policy, "device-removed", device_removed); @@ -5972,7 +5974,7 @@ _connect_settings_signal (policy, NM_SETTINGS_SIGNAL_CONNECTION_ADDED, connection_added); _connect_settings_signal (policy, NM_SETTINGS_SIGNAL_CONNECTION_UPDATED, connection_updated); diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c -index 601d29b..bc6f54d 100644 +index cf6135a..100d892 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -48,6 +48,7 @@ @@ -5983,15 +5985,15 @@ #include "nm-vpn-connection-glue.h" -@@ -61,6 +62,7 @@ typedef struct { +@@ -60,6 +61,7 @@ typedef struct { + gboolean user_requested; gulong user_uid; - NMActRequest *act_request; + DBusGProxy *user_proxy; guint32 secrets_id; char *username; -@@ -78,6 +80,8 @@ typedef struct { +@@ -77,6 +79,8 @@ typedef struct { char *banner; struct rtnl_route *gw_route; @@ -6000,14 +6002,14 @@ } NMVPNConnectionPrivate; #define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVPNConnectionPrivate)) -@@ -208,6 +212,7 @@ nm_vpn_connection_new (NMConnection *connection, +@@ -210,6 +214,7 @@ nm_vpn_connection_new (NMConnection *connection, { NMVPNConnection *self; NMVPNConnectionPrivate *priv; + NMDBusManager *dbus_mgr; g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - g_return_val_if_fail (NM_IS_ACT_REQUEST (act_request), NULL); + g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL); @@ -235,6 +240,10 @@ nm_vpn_connection_new (NMConnection *connection, nm_vpn_connection_base_export (NM_VPN_CONNECTION_BASE (self), connection); @@ -6189,7 +6191,7 @@ break; case NM_VPN_CONNECTION_STATE_ACTIVATED: /* Secrets no longer needed now that we're connected */ -@@ -1069,13 +1197,19 @@ dispose (GObject *object) +@@ -1069,12 +1197,18 @@ dispose (GObject *object) if (priv->proxy) g_object_unref (priv->proxy); @@ -6204,17 +6206,16 @@ + g_object_unref (priv->user_proxy); + } + - g_object_unref (priv->act_request); g_object_unref (priv->connection); + g_object_unref (priv->compat); g_free (priv->username); G_OBJECT_CLASS (nm_vpn_connection_parent_class)->dispose (object); diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h -index fd5ee24..085fb63 100644 +index ee8eb5b..ea905b7 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h -@@ -77,4 +77,6 @@ const char * nm_vpn_connection_get_ip_iface (NMVPNConnection *connect +@@ -75,4 +75,6 @@ const char * nm_vpn_connection_get_ip_iface (NMVPNConnection *connect NMDevice * nm_vpn_connection_get_parent_device (NMVPNConnection *connection); guint32 nm_vpn_connection_get_ip4_internal_gateway (NMVPNConnection *connection); @@ -6222,7 +6223,7 @@ + #endif /* NM_VPN_CONNECTION_H */ diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c -index 2bd8f23..21bcdec 100644 +index 6772bb1..b2636c2 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -30,6 +30,7 @@ @@ -6233,7 +6234,7 @@ G_DEFINE_TYPE (NMVPNManager, nm_vpn_manager, G_TYPE_OBJECT) -@@ -326,9 +327,16 @@ nm_vpn_manager_get_connection_for_active (NMVPNManager *manager, +@@ -324,9 +325,16 @@ nm_vpn_manager_get_connection_for_active (NMVPNManager *manager, for (elt = active; elt; elt = g_slist_next (elt)) { NMVPNConnection *vpn = NM_VPN_CONNECTION (elt->data); const char *ac_path; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
