[metacity/f14/master] Update patches
Matthias Clasen
mclasen at fedoraproject.org
Thu Sep 30 13:15:19 UTC 2010
commit 23aa2c0928bfc0082cf7a95b629741b7699c11c8
Author: Matthias Clasen <mclasen at redhat.com>
Date: Thu Sep 30 09:14:34 2010 -0400
Update patches
fresh-tooltips.patch | 8 ++++----
metacity.spec | 9 ---------
2 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/fresh-tooltips.patch b/fresh-tooltips.patch
index 9c7c45f..b7f0fca 100644
--- a/fresh-tooltips.patch
+++ b/fresh-tooltips.patch
@@ -1,6 +1,6 @@
-diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui/fixedtip.c
---- metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips 2009-12-17 18:06:26.000000000 -0500
-+++ metacity-2.28.0/src/ui/fixedtip.c 2009-12-17 18:08:23.000000000 -0500
+diff -up metacity-2.30.3/src/ui/fixedtip.c.fresh-tooltips metacity-2.30.3/src/ui/fixedtip.c
+--- metacity-2.30.3/src/ui/fixedtip.c.fresh-tooltips 2010-09-04 12:09:53.000000000 -0400
++++ metacity-2.30.3/src/ui/fixedtip.c 2010-09-30 09:11:39.517603002 -0400
@@ -50,33 +50,237 @@ static int screen_right_edge = 0;
*/
static int screen_bottom_edge = 0;
@@ -148,7 +148,7 @@ diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui
-expose_handler (GtkTooltips *tooltips)
+expose_handler (GtkWidget *window)
{
-- gtk_paint_flat_box (tip->style, tip->window,
+- gtk_paint_flat_box (gtk_widget_get_style (tip), gtk_widget_get_window (tip),
- GTK_STATE_NORMAL, GTK_SHADOW_OUT,
- NULL, tip, "tooltip",
- 0, 0, -1, -1);
diff --git a/metacity.spec b/metacity.spec
index 876a96f..621b5c6 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -33,16 +33,10 @@ Patch119: Exclude-the-current-application-from-no_focus_window.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=599261
Patch20: Add-a-newwindowsalwaysontop-preference.patch
Patch120: Apply-new_windows_always_on_top-to-newly-raised-acti.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=577576
-Patch21: Dont-warn-about-a-missing-session-file.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=559816
Patch24: metacity-2.28-empty-keybindings.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=604319
Patch25: metacity-2.28-xioerror-unknown-display.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=611260
-Patch26: libs.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=614592
-Patch27: title-click.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=599181
Patch28: Stop-confusing-GDK-s-grab-tracking.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=622517
@@ -129,11 +123,8 @@ API. This package exists purely for technical reasons.
%patch119 -p1 -b .no-focus-windows-current-app
%patch20 -p1 -b .always-on-top
%patch120 -p1 -b .always-on-top-activate
-%patch21 -p1 -b .missing-session
%patch24 -p1 -b .empty-keybindings
%patch25 -p1 -b .xioerror-unknown-display
-%patch26 -p1 -b .libs
-%patch27 -p1 -b .title-click
%patch28 -p1 -b .grab-tracking
%patch29 -p1 -b .mouse-unmaximize
More information about the scm-commits
mailing list