Hello community, here is the log from the commit of package NetworkManager for openSUSE:11.4 checked in at Fri Apr 29 17:32:43 CEST 2011.
-------- --- old-versions/11.4/all/NetworkManager/NetworkManager.changes 2011-02-21 11:38:57.000000000 +0100 +++ 11.4/NetworkManager/NetworkManager.changes 2011-04-29 08:02:07.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 27 07:40:47 UTC 2011 - [email protected] + +- Add nm-dismiss-keyfile-spam.patch to dismiss spam log(bnc#681072). +- Add nm-suppress-user-proxy-error-msg.patch, suppress + the user_proxy_init() errors(bnc#687001,swampid#40478). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/NetworkManager Destination is old-versions/11.4/UPDATES/all/NetworkManager calling whatdependson for 11.4-i586 New: ---- nm-dismiss-keyfile-spam.patch nm-suppress-user-proxy-error-msg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.tRa1Us/_old 2011-04-29 17:32:18.000000000 +0200 +++ /var/tmp/diff_new_pack.tRa1Us/_new 2011-04-29 17:32:18.000000000 +0200 @@ -20,7 +20,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.8.2 -Release: 15.<RELEASE4> +Release: 15.<RELEASE22> License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel dbus-1-glib-devel gtk-doc intltool iptables libgcrypt-devel libgudev-1_0-devel libiw-devel libnl-devel libtool libuuid-devel mozilla-nss-devel polkit-devel ppp-devel translation-update-upstream wireless-tools @@ -45,6 +45,10 @@ Patch4: nm-stop-touching-hosts.patch # PATCH-FIX-UPSTREAM nm-destory-crash.patch bnc#673627 [email protected] -- Fix crash when NM exit. Patch5: nm-destory-crash.patch +# PATCH-FIX-UPSTREAM nm-suppress-user-proxy-error-msg.patch bnc#687001 [email protected] -- Suppress the user_proxy_init() errors. +Patch6: nm-suppress-user-proxy-error-msg.patch +# PATCH-FIX-UPSTREAM nm-dismiss-keyfile-spam.patch bnc#681072 [email protected] -- Dismiss the keyfile's spam log. +Patch7: nm-dismiss-keyfile-spam.patch Requires: %{name}-glib = %{version} Requires: dhcp-client Requires: iproute2 @@ -119,6 +123,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 translation-update-upstream %build ++++++ nm-dismiss-keyfile-spam.patch ++++++ Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/plugin.c =================================================================== --- NetworkManager-0.8.2.orig/system-settings/plugins/keyfile/plugin.c +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/plugin.c @@ -212,7 +212,6 @@ dir_changed (GFileMonitor *monitor, break; case G_FILE_MONITOR_EVENT_CREATED: case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", name); if (connection) { /* Update */ @@ -230,6 +229,8 @@ dir_changed (GFileMonitor *monitor, remove_connection (SC_PLUGIN_KEYFILE (config), connection, name); } } else { + PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", name); + /* New */ connection = nm_keyfile_connection_new (name, &error); if (connection) { ++++++ nm-suppress-user-proxy-error-msg.patch ++++++ Index: NetworkManager-0.8.2/src/nm-manager.c =================================================================== --- NetworkManager-0.8.2.orig/src/nm-manager.c +++ NetworkManager-0.8.2/src/nm-manager.c @@ -1356,6 +1356,12 @@ user_proxy_init (NMManager *self) g_return_if_fail (self != NULL); g_return_if_fail (priv->user_proxy == NULL); + /* Don't try to initialize the user settings proxy if the user + * settings service doesn't actually exist. + */ + if (!nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) + return; + bus = nm_dbus_manager_get_connection (priv->dbus_mgr); priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus, NM_DBUS_SERVICE_USER_SETTINGS, @@ -3967,8 +3973,7 @@ nm_manager_start (NMManager *self) * they will be queried when the user settings service shows up on the * bus in nm_manager_name_owner_changed(). */ - if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) - user_proxy_init (self); + user_proxy_init (self); nm_udev_manager_query_devices (priv->udev_mgr); bluez_manager_resync_devices (self); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
