diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-10-14 23:31:33 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-10-14 23:31:33 -0500 |
commit | d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b (patch) | |
tree | 86eec4e4a0f6ba88cc7e6fab9ec926bc93d72396 /mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch | |
parent | f63b035a91cf5baff629f5e5dee4aeb7efe8d57b (diff) | |
parent | ec2515f058c60d2478a549f58376db628ba556b9 (diff) | |
download | tde-packaging-d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b.tar.gz tde-packaging-d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch')
-rw-r--r-- | mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch b/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch new file mode 100644 index 000000000..353759bce --- /dev/null +++ b/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch @@ -0,0 +1,33 @@ +From 977d49018cebcc37d0b667713ad422f80ba9c8d2 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky@redhat.com> +Date: Fri, 16 Apr 2010 16:17:04 +0200 +Subject: [PATCH] Fix pinentry-gtk-2 SIGSEGV when unfocusing with -g argument + +gdk_window_set_transient_for cannot be used with parent = NULL to +unset transient hint (unlike gtk_ version which can). Replacement +code is taken from gtk_window_transient_parent_unrealized + +Applied cleanly at least over 0.8.0 and 0.7.6 + +More info see: https://bugzilla.redhat.com/show_bug.cgi?id=520236 +--- + gtk+-2/pinentry-gtk-2.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c +index 7cd7616..fdd5822 100644 +--- a/gtk+-2/pinentry-gtk-2.c ++++ b/gtk+-2/pinentry-gtk-2.c +@@ -145,7 +145,8 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data) + { + gdk_keyboard_ungrab (gdk_event_get_time (event)); + /* Unmake window transient for the root window. */ +- gdk_window_set_transient_for (win->window, NULL); ++ gdk_property_delete (win->window, ++ gdk_atom_intern_static_string ("WM_TRANSIENT_FOR")); + } + + +-- +1.6.6.1 + |