diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2006-12-05 21:36:20 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2006-12-05 21:36:20 +0000 |
| commit | bbc94a4fe3c51713a189232533e787296799632c (patch) | |
| tree | bc5faf9bfbdd18e6c24709843ec3abd8ea00b9c1 | |
| parent | b8383ed183f0bf5dc15b28ac8628f99da09cc743 (diff) | |
| download | gnome-applets-bbc94a4fe3c51713a189232533e787296799632c.tar.gz gnome-applets-bbc94a4fe3c51713a189232533e787296799632c.tar.xz gnome-applets-bbc94a4fe3c51713a189232533e787296799632c.zip | |
fix a trashapplet problemgnome-applets-2_16_2-2_fc7
| -rw-r--r-- | gnome-applets-2.16.2-trash-screen.patch | 31 | ||||
| -rw-r--r-- | gnome-applets.spec | 10 |
2 files changed, 40 insertions, 1 deletions
diff --git a/gnome-applets-2.16.2-trash-screen.patch b/gnome-applets-2.16.2-trash-screen.patch new file mode 100644 index 0000000..570ffde --- /dev/null +++ b/gnome-applets-2.16.2-trash-screen.patch @@ -0,0 +1,31 @@ +--- 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"), diff --git a/gnome-applets.spec b/gnome-applets.spec index 0e90725..06affc4 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -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 @@ Patch20: keyboard-drawing-redraw.patch 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 @@ small utilities for the GNOME panel. %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 @@ fi %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Dec 5 2006 Matthias Clasen <mclasen@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@redhat.com> - 1:2.16.2-1 - Update to 2.16.2 - Drop obsolete patches |