rpms/gnome-applets/devel gnome-applets-2.16.2-trash-screen.patch, NONE, 1.1 gnome-applets.spec, 1.199, 1.200

Tue Dec 5 21:36:22 UTC 2006

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26590

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.16.2-trash-screen.patch 
Log Message:
fix a trashapplet problem


gnome-applets-2.16.2-trash-screen.patch:
 trashapplet.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE gnome-applets-2.16.2-trash-screen.patch ---
--- gnome-applets-2.16.2/trashapplet/src/trashapplet.c.trash-screen	2006-12-05 16:33:56.000000000 -0500
+++ gnome-applets-2.16.2/trashapplet/src/trashapplet.c	2006-12-05 16:32:41.000000000 -0500
@@ -669,6 +669,8 @@
 			  TrashApplet       *applet,
 			  const gchar       *cname)
 {
+	GdkScreen *screen;
+
 	/* Open the "trash:" URI with gnome-open */
 	gchar *argv[] = { "gnome-open", "trash:", NULL };
 	GError *err = NULL;
@@ -676,12 +678,13 @@
 
         g_return_if_fail (TRASH_IS_APPLET (applet));
 
-	res = g_spawn_async (NULL,
-			     argv, NULL,
-			     G_SPAWN_SEARCH_PATH,
-			     NULL, NULL,
-			     NULL,
-			     &err);
+	screen = gtk_widget_get_screen (GTK_WIDGET (applet));
+	res = gdk_spawn_on_screen (screen, NULL,
+			           argv, NULL,
+			           G_SPAWN_SEARCH_PATH,
+			           NULL, NULL,
+			           NULL,
+			           &err);
 	
 	if (! res) {
 		error_dialog (applet, _("Error while spawning nautilus:\n%s"),


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- gnome-applets.spec	5 Dec 2006 19:06:30 -0000	1.199
+++ gnome-applets.spec	5 Dec 2006 21:36:20 -0000	1.200
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.16.2
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -58,6 +58,9 @@
 
 Patch27: gnome-applets-2.16.1-desktop-files.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=382774 
+Patch28: gnome-applets-2.16.2-trash-screen.patch
+
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -149,6 +152,8 @@
 
 %patch27 -p1 -b .desktop-files
 
+%patch28 -p1 -b .trash-screen
+
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
 # We don't ship gnome-system-tools
@@ -333,6 +338,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Dec  5 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.2-2
+- Fix the trashapplet opening a window on the wrong screen (#218447)
+
 * Tue Dec  5 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.2-1
 - Update to 2.16.2
 - Drop obsolete patches


