[mate-utils] 02/09: debian/patches: Drop 0002_fix-errmsg-text.patch. Applied upstream.

[Mike Gabriel]

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 e3e5fe3362b771c7b57d3709ece5bd02a5abcfc0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 21 00:49:20 2015 +0200

    debian/patches: Drop 0002_fix-errmsg-text.patch. Applied upstream.
---
 debian/patches/0002_fix-errmsg-text.patch | 45 -------------------------------
 debian/patches/series                     |  1 -
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/0002_fix-errmsg-text.patch b/debian/patches/0002_fix-errmsg-text.patch
deleted file mode 100644
index 826350d..0000000
--- a/debian/patches/0002_fix-errmsg-text.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c5e6b092764be2bbe668897fca7d977d5cbba57c Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Tue, 16 Dec 2014 18:18:14 +0300
-Subject: [PATCH] mate-screenshot: show the actual error message when UI load
- fails
-
----
- mate-screenshot/screenshot-dialog.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/mate-screenshot/screenshot-dialog.c
-+++ b/mate-screenshot/screenshot-dialog.c
-@@ -211,6 +211,7 @@
-   gint pos;
-   GFile *tmp_file;
-   GFile *parent_file;
-+  GError *error = NULL;
-   guint res;
- 
-   tmp_file = g_file_new_for_uri (initial_uri);
-@@ -223,8 +224,8 @@
- 
-   dialog = g_new0 (ScreenshotDialog, 1);
- 
--  dialog-> ui = gtk_builder_new ();
--  res = gtk_builder_add_from_file (dialog->ui, UIDIR "/mate-screenshot.ui", NULL);
-+  dialog->ui = gtk_builder_new ();
-+  res = gtk_builder_add_from_file (dialog->ui, UIDIR "/mate-screenshot.ui", &error);
-   dialog->screenshot = screenshot;
- 
-   if (res == 0)
-@@ -233,9 +234,11 @@
-       dialog = gtk_message_dialog_new (NULL, 0,
- 				       GTK_MESSAGE_ERROR,
- 				       GTK_BUTTONS_OK,
--				       _("UI definition file for the screenshot program is missing.\n"
--					 "Please check your installation of mate-utils"));
-+				       _("Error loading UI definition file for the screenshot program: \n%s\n\n"
-+				         "Please check your installation of mate-utils."), error->message);
-       gtk_dialog_run (GTK_DIALOG (dialog));
-+
-+      g_error_free (error);
-       gtk_widget_destroy (dialog);
-       exit (1);
-     }
diff --git a/debian/patches/series b/debian/patches/series
index bdcdeb4..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002_fix-errmsg-text.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