rpms/file-roller/devel file-roller-2.15.1-recent.patch, NONE, 1.1 file-roller-2.15.1-recent2.patch, NONE, 1.1 file-roller.spec, 1.65, 1.66

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11182

Modified Files:
	file-roller.spec 
Added Files:
	file-roller-2.15.1-recent.patch 
	file-roller-2.15.1-recent2.patch 
Log Message:
fix warnings


file-roller-2.15.1-recent.patch:
 window.c |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE file-roller-2.15.1-recent.patch ---
--- file-roller-2.15.1/src/window.c.recent	2006-07-30 13:46:21.000000000 -0400
+++ file-roller-2.15.1/src/window.c	2006-07-30 13:48:07.000000000 -0400
@@ -3472,16 +3472,6 @@
 			  "item_activated",
 			  G_CALLBACK (recent_chooser_item_activated_cb),
 			  window);
-
-	/* filter */
-
-	filter = gtk_recent_filter_new ();
-	gtk_recent_filter_set_name (filter, _("All archives"));
-	for (i = 0; open_type[i] != FR_FILE_TYPE_NULL; i++)
-		gtk_recent_filter_add_mime_type (filter, file_type_desc[open_type[i]].mime_type);
-
-	gtk_recent_chooser_add_filter (chooser, filter);
-	gtk_recent_chooser_set_filter (chooser, filter);
 }
 
 

file-roller-2.15.1-recent2.patch:
 window.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE file-roller-2.15.1-recent2.patch ---
--- file-roller-2.15.1/src/window.c.recent2	2006-07-30 14:02:04.000000000 -0400
+++ file-roller-2.15.1/src/window.c	2006-07-30 14:02:16.000000000 -0400
@@ -1116,7 +1116,7 @@
 
 	/* recents menu. */
 
-	set_sensitive (window, "RecentFilesMenu", ! running);
+	set_sensitive (window, "OpenRecentMenu", ! running);
 }
 
 


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- file-roller.spec	12 Jul 2006 19:40:43 -0000	1.65
+++ file-roller.spec	30 Jul 2006 18:04:00 -0000	1.66
@@ -11,12 +11,16 @@
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.15.1
-Release: 	1
+Release: 	2
 
 License:	GPL
 Group:		Applications/Archiving
 URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 Source:		file-roller-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=349333
+Patch0:		file-roller-2.15.1-recent.patch
+# already fixed in upstream
+Patch1:		file-roller-2.15.1-recent2.patch
 BuildRoot:	%{_tmppath}/file-roller-%{version}-root
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -50,6 +54,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .recent
+%patch1 -p1 -b .recent2
 
 %build
 autoconf
@@ -120,7 +126,10 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
-* Wed Jul 12 2006 Matthisa Clasen <mclasen redhat com> - 2.15.1-1
+* Sun Jul 30 2006 Matthias Clasen <mclasen redhat com> - 2.15.1-2
+- Avoid warnings from recent menu
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen redhat com> - 2.15.1-1
 - Update to 2.15.1
 
 * Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - 2.14.3-4.1