2.30.2

4 files changed, 17 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index 8f6dfbc..22735d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 metacity-2.30.0.tar.bz2
+/metacity-2.30.2.tar.bz2
diff --git a/fresh-tooltips.patch b/fresh-tooltips.patch
index 9c7c45f..2ea8b8c 100644
--- a/fresh-tooltips.patch
+++ b/fresh-tooltips.patch
@@ -1,7 +1,7 @@
-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
-@@ -50,33 +50,237 @@ static int screen_right_edge = 0;
+diff -up metacity-2.30.2/src/ui/fixedtip.c.fresh-tooltips metacity-2.30.2/src/ui/fixedtip.c
+--- metacity-2.30.2/src/ui/fixedtip.c.fresh-tooltips	2010-09-04 12:09:53.000000000 -0400
++++ metacity-2.30.2/src/ui/fixedtip.c	2010-09-29 13:27:27.931194002 -0400
+@@ -50,23 +50,214 @@ static int screen_right_edge = 0;
   */
  static int screen_bottom_edge = 0;
  
@@ -53,6 +53,7 @@ diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui
 +  cairo_close_path (cr);
 +}
 +
++
 +static void
 +fill_background (GtkWidget  *widget,
 +                 cairo_t    *cr)
@@ -143,12 +144,11 @@ diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui
 +  g_object_unref (mask);
 +}
 +
-+
  static gint
 -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);
@@ -197,20 +197,6 @@ diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui
    return FALSE;
  }
  
-+#if 0
-+static void
-+on_composited_changed (GtkWidget *window)
-+{
-+  update_shape (window);
-+}
-+
-+static void
-+on_realized (GtkWidget *window)
-+{
-+  update_shape (window);
-+}
-+#endif
-+
 +static void
 +on_style_set (GtkWidget *widget, GtkStyle *prev)
 +{
@@ -231,16 +217,11 @@ diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui
                       const char *markup_text)
  {
    int w, h;
--  
 +  GtkWidget *alignment;
-+
+   
    if (tip == NULL)
--    {      
-+    {
-       tip = gtk_window_new (GTK_WINDOW_POPUP);
--      gtk_window_set_type_hint (GTK_WINDOW(tip), GDK_WINDOW_TYPE_HINT_TOOLTIP);
--
-       {
+     {      
+@@ -77,6 +268,7 @@ meta_fixed_tip_show (Display *xdisplay, 
          GdkScreen *gdk_screen;
  	GdkRectangle monitor;
  	gint mon_num;
@@ -248,7 +229,7 @@ diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui
  
          gdk_screen = gdk_display_get_screen (gdk_display_get_default (),
                                               screen_number);
-@@ -86,25 +290,47 @@ meta_fixed_tip_show (Display *xdisplay, 
+@@ -86,25 +278,47 @@ meta_fixed_tip_show (Display *xdisplay, 
  	gdk_screen_get_monitor_geometry (gdk_screen, mon_num, &monitor);
  	screen_right_edge = monitor.x + monitor.width;
  	screen_bottom_edge = monitor.y + monitor.height;
diff --git a/metacity.spec b/metacity.spec
index 81a1ea4..5d22bd1 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -2,8 +2,8 @@
 
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.30.0
-Release: 8%{?dist}
+Version: 2.30.2
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -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
 
@@ -246,6 +237,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Sep 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.2-1
+- Update to 2.30.2
+
 * Wed Sep 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.30.0-8
 - firstboot -> metacity dep (#605675)
 
diff --git a/sources b/sources
index 7bb1422..339c2a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c8a4c8f3b667efcc60f286adb445d4c  metacity-2.30.0.tar.bz2
+196b782eb759e6db96db7c47223291fe  metacity-2.30.2.tar.bz2