[arch-commits] Commit in nautilus/trunk (3 files)

[Ionut Biru]

    Date: Saturday, April 30, 2011 @ 11:08:05
  Author: ibiru
Revision: 121317

fix crasher when clicking on empty space in sidebar, fixes duplicate entries in progress bar while copying

Added:
  nautilus/trunk/places-sidebar.patch
  nautilus/trunk/progress-ui-handler.patch
Modified:
  nautilus/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   12 +++++++++---
 places-sidebar.patch      |   36 ++++++++++++++++++++++++++++++++++++
 progress-ui-handler.patch |   28 ++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-30 14:59:38 UTC (rev 121316)
+++ PKGBUILD	2011-04-30 15:08:05 UTC (rev 121317)
@@ -3,7 +3,7 @@
 
 pkgname=nautilus
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME shell and file manager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,11 +14,17 @@
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        places-sidebar.patch  progress-ui-handler.patch)
+sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8'
+            'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041'
+            '5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  #fixed for 3.0.2
+  patch -Np1 -i "${srcdir}/places-sidebar.patch"
+  patch -Np1 -i "${srcdir}/progress-ui-handler.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nautilus \

Added: places-sidebar.patch
===================================================================
--- places-sidebar.patch	                        (rev 0)
+++ places-sidebar.patch	2011-04-30 15:08:05 UTC (rev 121317)
@@ -0,0 +1,36 @@
+From cd5a1e5cf95a165c66e7a097530058864dc3a38f Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Thu, 28 Apr 2011 18:05:07 +0000
+Subject: places-sidebar: make sure to return if we click inside empty space
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648872
+---
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 6e49a4c..56216ab 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -2685,6 +2685,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
+ 	GtkTreeIter iter;
+ 	GtkTreeModel *model;
+ 	GtkTreeView *tree_view;
++	gboolean res;
+ 
+ 	path = NULL;
+ 
+@@ -2708,8 +2709,12 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
+ 			return FALSE;
+ 		}
+ 
+-		gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y,
+-					       &path, NULL, NULL, NULL);
++		res = gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y,
++						     &path, NULL, NULL, NULL);
++
++		if (!res) {
++			return FALSE;
++		}
+ 
+ 		gtk_tree_model_get_iter (model, &iter, path);
+ 
+--
+cgit v0.9

Added: progress-ui-handler.patch
===================================================================
--- progress-ui-handler.patch	                        (rev 0)
+++ progress-ui-handler.patch	2011-04-30 15:08:05 UTC (rev 121317)
@@ -0,0 +1,28 @@
+From fdcc2f36f549a18ea6f587fb9e9bad97f0114c59 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Thu, 28 Apr 2011 18:25:15 +0000
+Subject: progress-ui-handler: don't add progress infos to the window twice
+
+We were adding them twice in case there was already one operation
+running.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648857
+---
+diff --git a/src/nautilus-progress-ui-handler.c b/src/nautilus-progress-ui-handler.c
+index 2479682..fe295b2 100644
+--- a/src/nautilus-progress-ui-handler.c
++++ b/src/nautilus-progress-ui-handler.c
+@@ -315,10 +315,10 @@ handle_new_progress_info (NautilusProgressUIHandler *self,
+ 			  G_CALLBACK (progress_info_finished_cb), self);
+ 
+ 	self->priv->active_infos++;
+-	progress_ui_handler_add_to_window (self, info);
+ 
+ 	if (self->priv->active_infos == 1) {
+ 		/* this is the only active operation, present the window */
++		progress_ui_handler_add_to_window (self, info);
+ 		gtk_window_present (GTK_WINDOW (self->priv->progress_window));
+ 	} else {
+ 		if (gtk_widget_get_visible (self->priv->progress_window)) {
+--
+cgit v0.9