fix a deadlock

This commit is contained in:
Matthias Clasen 2006-09-22 05:40:06 +00:00
parent 25819f0375
commit 58ef8b52e0
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,20 @@
--- evince-0.6.0/shell/ev-window.c.print-error 2006-09-22 01:32:59.000000000 -0400
+++ evince-0.6.0/shell/ev-window.c 2006-09-22 01:33:35.000000000 -0400
@@ -1373,6 +1373,8 @@
if (error) {
GtkWidget *dialog;
+ GDK_THREADS_ENTER ();
+
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
@@ -1383,6 +1385,8 @@
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
+
+ GDK_THREADS_LEAVE ();
}
}

View File

@ -4,13 +4,14 @@
Name: evince
Version: 0.6.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Document viewer
License: GPL
Group: Applications/Publishing
URL: http://www.gnome.org/projects/evince/
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
Patch0: evince-0.6.0-print-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= %{gtk2_version}
@ -42,6 +43,7 @@ evince is a GNOME-based document viewer.
%prep
%setup -q
%patch0 -p1 -b .print-error
%build
%configure --disable-scrollkeeper
@ -135,6 +137,9 @@ fi
%changelog
* Fri Sep 22 2006 Matthias Clasen <mclasen@redhat.com> - 0.6.0-2.fc6
- Fix a deadlock in printing
* Mon Sep 4 2006 Matthias Clasen <mclasen@redhat.com> - 0.6.0-1.fc6
- Update to 0.6.0