This commit is contained in:
parent
e64e4c1ca0
commit
8720e5bf3f
21
gtk2-bnc355225-filechooser-tab-completion-crash.diff
Normal file
21
gtk2-bnc355225-filechooser-tab-completion-crash.diff
Normal file
@ -0,0 +1,21 @@
|
||||
2008-06-03 Federico Mena Quintero <federico@novell.com>
|
||||
|
||||
* gtk/gtkfilechooserentry.c (install_completion_feedback_timer):
|
||||
If the user presses Tab while the completion feedback window is
|
||||
active, then we'll assert. Remove the assertion and just re-set
|
||||
the timer. Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225
|
||||
|
||||
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
|
||||
index aef6d31..a98041a 100644
|
||||
--- a/gtk/gtkfilechooserentry.c
|
||||
+++ b/gtk/gtkfilechooserentry.c
|
||||
@@ -939,7 +939,8 @@ completion_feedback_timeout_cb (gpointer data)
|
||||
static void
|
||||
install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
|
||||
{
|
||||
- g_assert (chooser_entry->completion_feedback_timeout_id == 0);
|
||||
+ if (chooser_entry->completion_feedback_timeout_id != 0)
|
||||
+ g_source_remove (chooser_entry->completion_feedback_timeout_id);
|
||||
|
||||
chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
|
||||
completion_feedback_timeout_cb,
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 3 22:46:27 CEST 2008 - federico@novell.com
|
||||
|
||||
- Added gtk2-bnc355225-filechooser-tab-completion-crash.diff to fix
|
||||
the crash in https://bugzilla.novell.com/show_bug.cgi?id=355225 -
|
||||
The file chooser could crash when pressing Tab repeatedly to do
|
||||
completion.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 6 14:34:38 CEST 2008 - schwab@suse.de
|
||||
|
||||
|
10
gtk2.spec
10
gtk2.spec
@ -28,7 +28,7 @@ Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
|
||||
Version: 2.12.9
|
||||
Release: 28
|
||||
Release: 36
|
||||
Summary: Library for Creation of Graphical User Interfaces (version 2)
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
|
||||
Source1: SuSEconfig.gtk2
|
||||
@ -66,6 +66,8 @@ Patch52: gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.
|
||||
Patch53: gtk-path-local.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff bnc310710 bgo524166 federico@novell.com - Fix positioning of GtkLabels with too-small allocations
|
||||
Patch54: gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc355225-filechooser-tab-completion-crash.diff bnc355225 federico@novell.com - Fix crash when doing furious Tab completion
|
||||
Patch55: gtk2-bnc355225-filechooser-tab-completion-crash.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: cairo >= 0.9.2 hicolor-icon-theme
|
||||
%if %suse_version > 1020
|
||||
@ -281,6 +283,7 @@ cp -a %{S:2} .
|
||||
%patch52 -p1
|
||||
%patch53
|
||||
%patch54 -p1
|
||||
%patch55 -p1
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
@ -412,6 +415,11 @@ fi
|
||||
%{_datadir}/gtk-doc/html/*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 04 2008 federico@novell.com
|
||||
- Added gtk2-bnc355225-filechooser-tab-completion-crash.diff to fix
|
||||
the crash in https://bugzilla.novell.com/show_bug.cgi?id=355225 -
|
||||
The file chooser could crash when pressing Tab repeatedly to do
|
||||
completion.
|
||||
* Tue May 06 2008 schwab@suse.de
|
||||
- Don't use libtool before it is created.
|
||||
* Tue May 06 2008 federico@novell.com
|
||||
|
Loading…
x
Reference in New Issue
Block a user