rpms/gnome-utils/devel logview-scroll-crash.patch, NONE, 1.1 gnome-utils.spec, 1.156, 1.157

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24455

Modified Files:
	gnome-utils.spec 
Added Files:
	logview-scroll-crash.patch 
Log Message:
Fix some crashes


logview-scroll-crash.patch:

--- NEW FILE logview-scroll-crash.patch ---
diff -u gnome-utils-2.20.0.1/logview/log_repaint.c hacked/logview/log_repaint.c
--- gnome-utils-2.20.0.1/logview/log_repaint.c	2007-09-06 09:49:10.000000000 -0400
+++ hacked/logview/log_repaint.c	2007-10-18 22:13:02.000000000 -0400
@@ -45,7 +45,9 @@
 logview_show_busy_cursor (LogviewWindow *logview)
 {
   GdkCursor *cursor;
-  if (GTK_WIDGET_VISIBLE (logview->view) && logview->curlog->model == NULL) {
+  if (GTK_WIDGET_VISIBLE (logview->view) && 
+      logview->curlog != NULL &&
+      logview->curlog->model == NULL) {
     cursor = gdk_cursor_new (GDK_WATCH);
     gdk_window_set_cursor (GTK_WIDGET (logview)->window, cursor);
     gdk_cursor_unref (cursor);
diff -u gnome-utils-2.20.0.1/logview/logview.c hacked/logview/logview.c
--- gnome-utils-2.20.0.1/logview/logview.c	2007-09-06 09:49:10.000000000 -0400
+++ hacked/logview/logview.c	2007-10-18 22:10:25.000000000 -0400
@@ -193,8 +193,10 @@
   if (log == NULL)
     return;
 
-  if (log->visible_first)
+  if (log->visible_first) {
     gtk_tree_path_free (log->visible_first);
+    log->visible_first = NULL;
+  }
 
   if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (logview->view),
                                        &first, NULL))


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gnome-utils.spec	18 Sep 2007 16:38:25 -0000	1.156
+++ gnome-utils.spec	19 Oct 2007 15:59:52 -0000	1.157
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.20.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -21,6 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
+Patch1:		logview-scroll-crash.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -75,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .logview-close
+%patch1 -p1 -b .logview-scroll
 
 # Hide from menus
 pushd gsearchtool
@@ -234,6 +236,9 @@
 
 
 %changelog
+* Thu Oct 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-2
+- Fix some crashes when scrolling (#321701)
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
 - Update to 2.20.0.1