[mate-terminal] 03/13: debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch: Applied upstream.

Martin Wimpress flexiondotorg-guest at moszumanska.debian.org
Mon Jun 15 22:09:09 UTC 2015


This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-terminal.

commit bf7541ee3dbab630a9326073c8d79d79529b72fc
Author: Martin Wimpress <code at flexion.org>
Date:   Mon Jun 15 22:57:00 2015 +0100

    debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch: Applied upstream.
---
 ...x-occasional-segfaults-at-session-startup.patch | 32 ----------------------
 1 file changed, 32 deletions(-)

diff --git a/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch b/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch
deleted file mode 100644
index 895cd4b..0000000
--- a/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bb659a752efbeedbe60fb6df5541a57c95777279 Mon Sep 17 00:00:00 2001
-From: Nikolay Martynov <mar.kolya at gmail.com>
-Date: Mon, 24 Nov 2014 22:46:51 -0500
-Subject: [PATCH] Properly check gdk_property_get result
-
-Check return value of gdk_property_get in get_initial_workspace before using its result
-
-Current implementation segfaults from to time if terminal is started at X session startup
-
-Looks like #769947 bug in Debian describes same issue
----
- src/terminal.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/terminal.c b/src/terminal.c
-index a6bf43f..f9989a5 100644
---- a/src/terminal.c
-+++ b/src/terminal.c
-@@ -532,10 +532,10 @@ get_initial_workspace (void)
-   atom = gdk_atom_intern_static_string ("_NET_CURRENT_DESKTOP");
-   cardinal_atom = gdk_atom_intern_static_string ("CARDINAL");
- 
--  gdk_property_get (window, atom, cardinal_atom, 0, 8, FALSE, NULL, NULL, NULL, &data);
--
--  ret = *(int *)data;
--  g_free (data);
-+  if (gdk_property_get (window, atom, cardinal_atom, 0, 8, FALSE, NULL, NULL, NULL, &data)) {
-+         ret = *(int *)data;
-+         g_free (data);
-+  }
-   return ret;
- }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-terminal.git



More information about the pkg-mate-commits mailing list