[mate-utils] 01/02: debian/patches: Drop 0001_mate-dictionary-fix-double-free-error.patch. Included in latest upstream release.
Mike Gabriel
sunweaver at debian.org
Fri Mar 13 12:48:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch debian/experimental
in repository mate-utils.
commit 74942da8346b0a8c40139032683cbea81e645988
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Mar 13 13:43:00 2015 +0100
debian/patches: Drop 0001_mate-dictionary-fix-double-free-error.patch. Included in latest upstream release.
---
...001_mate-dictionary-fix-double-free-error.patch | 34 ----------------------
debian/patches/series | 1 -
2 files changed, 35 deletions(-)
diff --git a/debian/patches/0001_mate-dictionary-fix-double-free-error.patch b/debian/patches/0001_mate-dictionary-fix-double-free-error.patch
deleted file mode 100644
index feaee30..0000000
--- a/debian/patches/0001_mate-dictionary-fix-double-free-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65abdedc9a09e8152ffa4de442b47082e76ff49d Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Wed, 17 Dec 2014 12:47:48 +0300
-Subject: [PATCH] mate-dictionary: don't free GError more than once
-
-because that error dialog function frees it already
----
- mate-dictionary/src/gdict-source-dialog.c | 1 -
- mate-dictionary/src/gdict-window.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/mate-dictionary/src/gdict-source-dialog.c b/mate-dictionary/src/gdict-source-dialog.c
-index 3468011..792677d 100644
---- a/mate-dictionary/src/gdict-source-dialog.c
-+++ b/mate-dictionary/src/gdict-source-dialog.c
-@@ -477,7 +477,6 @@ gdict_source_dialog_response_cb (GtkDialog *dialog,
- gdict_show_gerror_dialog (GTK_WINDOW (dialog),
- _("There was an error while displaying help"),
- err);
-- g_error_free (err);
- }
-
- /* we don't want the dialog to close itself */
-diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c
-index 58eae2e..01679ff 100644
---- a/mate-dictionary/src/gdict-window.c
-+++ b/mate-dictionary/src/gdict-window.c
-@@ -1242,7 +1242,6 @@ gdict_window_cmd_help_contents (GtkAction *action,
- gdict_show_gerror_dialog (GTK_WINDOW (window),
- _("There was an error while displaying help"),
- err);
-- g_error_free (err);
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 2da6373..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001_mate-dictionary-fix-double-free-error.patch
2001_omit-gfdl-licensed-help-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-utils.git
More information about the pkg-mate-commits
mailing list