From 87731d3dcc428000731dda361ac5da9a45cdef1c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 25 Jan 2008 14:36:51 +0000 Subject: * SVN snapshot of the upcoming 0.7 release. * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - 04-if_fix.patch - 11-man_page_sh_name.patch - 12_readme_format.patch - 13-validate_mac_addr.patch - 20-stable_branch_updates_r2652.patch - 21-endianess_fix_r2754.patch - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - 23-rfkill_return_type.patch - 24-get_mode_fix_r3122.patch - 25-libnl_unique_pid_r3155.patch - 26-libnl_1.0-pre8_r3206.patch - 27-dont_repeat_errors.patch * debian/patches/05-debian_backend.patch - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2066 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/27-dont_repeat_errors.patch | 37 ------------------------------ 1 file changed, 37 deletions(-) delete mode 100644 debian/patches/27-dont_repeat_errors.patch (limited to 'debian/patches/27-dont_repeat_errors.patch') diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch deleted file mode 100644 index 64e23223..00000000 --- a/debian/patches/27-dont_repeat_errors.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/NetworkManager.c b/src/NetworkManager.c -index 4f89f63..ddb5a4a 100644 ---- a/src/NetworkManager.c -+++ b/src/NetworkManager.c -@@ -65,6 +65,8 @@ - */ - static NMData *nm_data = NULL; - -+char *ks_err_message = NULL; -+ - static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); - static void nm_data_free (NMData *data); - static gboolean nm_poll_killswitches(gpointer user_data); -@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da - if (message_is_error (reply)) { - dbus_error_init (&err); - dbus_set_error_from_message (&err, reply); -- nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ if (!ks_err_message || strcmp (ks_err_message, err.message)) { -+ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ g_free (ks_err_message); -+ ks_err_message = g_strdup (err.message); -+ } - dbus_error_free (&err); - goto out; - } - - 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); -+ if (!ks_err_message || strcmp (ks_err_message, err.message)) { -+ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ g_free (ks_err_message); -+ ks_err_message = g_strdup (err.message); -+ } - dbus_error_free (&err); - goto out; - } -- cgit 1.3.0-6-gf8a5