2.30.2

1 files changed, 10 insertions, 29 deletions

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;