[SCM] gmtk/experimental: Patch to display error message on failed screenshots

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b827c194ae6d377716a8eaa1daaa955b3f44f9c4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Feb 4 21:13:20 2013 +0100

    Patch to display error message on failed screenshots
    
    Closes: #699394

diff --git a/debian/changelog b/debian/changelog
index 16101fc..c295832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gmtk (1.0.7-2) UNRELEASED; urgency=low
 
-  * 
+  * debian/patches: Add error-on-failed-screenshot.patch from upstream to
+    display an error message if taking a screenshot failed. (Closes: #699394)
 
  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 04 Feb 2013 21:05:59 +0100
 
diff --git a/debian/patches/error-on-failed-screenshot.patch b/debian/patches/error-on-failed-screenshot.patch
new file mode 100644
index 0000000..b9cf91b
--- /dev/null
+++ b/debian/patches/error-on-failed-screenshot.patch
@@ -0,0 +1,27 @@
+Description: Display error message if taking a screenshot failed
+Origin: upstream,
+ https://code.google.com/p/gmtk/source/detail?r=203
+Last-Update: 2013-02-04
+
+diff --git a/src/gmtk_media_player.c b/src/gmtk_media_player.c
+index b177a3f..b7055c6 100644
+--- a/src/gmtk_media_player.c
++++ b/src/gmtk_media_player.c
+@@ -3625,6 +3625,14 @@ gboolean thread_reader(GIOChannel * source, GIOCondition condition, gpointer dat
+             message = NULL;
+         }
+ 
++        if (strstr(mplayer_output->str, "failed (forgot -vf screenshot?)") != 0) {
++            dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
++                                            GTK_BUTTONS_OK, g_dgettext(GETTEXT_PACKAGE, "Failed to take screenshot"));
++            gtk_window_set_title(GTK_WINDOW(dialog), g_dgettext(GETTEXT_PACKAGE, "GNOME MPlayer Notification"));
++            gtk_dialog_run(GTK_DIALOG(dialog));
++            gtk_widget_destroy(dialog);
++        }
++
+         if (strstr(mplayer_output->str, "Name   : ") != 0) {
+             buf = strstr(mplayer_output->str, "Name   : ");
+             buf = strstr(mplayer_output->str, "Name   : ") + strlen("Name   : ");
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index fe04dc8..02f0833 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-hide-private-symbols.patch
 0003-use-soname-as-domain.patch
+error-on-failed-screenshot.patch

-- 
gmtk packaging