Hello community, here is the log from the commit of package NetworkManager checked in at Thu Dec 20 16:44:42 CET 2007. -------- --- NetworkManager/NetworkManager.changes 2007-09-14 09:12:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2007-12-20 12:50:42.545469000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 20 12:36:49 CET 2007 - thoenig@suse.de + +- Add patch nm-killswitch.patch: + * use int for killswitch status + * initialize DBusError prior usage + +------------------------------------------------------------------- New: ---- nm-killswitch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.ul7363/_old 2007-12-20 16:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.ul7363/_new 2007-12-20 16:44:20.000000000 +0100 @@ -33,7 +33,7 @@ Url: http://www.gnome.org/projects/NetworkManager/ AutoReqProv: on Version: 0.6.5 -Release: 69 +Release: 74 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.bz2 Source1: network-manager-applet-%{version}.tar.bz2 @@ -58,6 +58,7 @@ Patch14: nm-applet-fallback.patch Patch15: nm-save-passwds-in-keyring.patch Patch16: nm-applet-editor.patch +Patch17: nm-killswitch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: sysconfig >= %{sysconfig_version} /usr/bin/sed Recommends: %{name}-client @@ -177,6 +178,7 @@ %patch14 -p0 %patch15 -p0 %patch16 -p1 +%patch17 -p1 cd nm-applet-0.6.5 gnome-patch-translation-update # Prepare directory for gnome-patch-translation-collect: @@ -278,6 +280,10 @@ %{_libdir}/libnm_glib.so.* %changelog +* Thu Dec 20 2007 - thoenig@suse.de +- Add patch nm-killswitch.patch: + * use int for killswitch status + * initialize DBusError prior usage * Fri Sep 14 2007 - tambet@suse.de - Make sure gnome-keyring does not return empty result. (Novell #307910). * Wed Aug 15 2007 - tambet@suse.de ++++++ nm-killswitch.patch ++++++ --- NetworkManager-0.6.5/src/NetworkManager.c 2007-12-18 10:54:25.000000000 +0100 +++ NetworkManager-0.6.5/src/NetworkManager.c 2007-12-18 11:54:25.000000000 +0100 @@ -340,7 +340,7 @@ { DBusError err; DBusMessage * reply = NULL; - guint32 status; + gint32 status; g_return_if_fail (pcall != NULL); g_return_if_fail (data != NULL); @@ -359,7 +359,8 @@ goto out; } - if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { + dbus_error_init (&err); + if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); dbus_error_free (&err); goto out; @@ -368,6 +369,9 @@ if (status == 0) data->tmp_hw_rf_enabled = FALSE; + if (dbus_error_is_set (&err)) + dbus_error_free (&err); + out: if (reply) dbus_message_unref (reply); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de