[Xfce4-commits] <postler:master> Work around Gdk vapi change to support old and new

[Christian Dywan]

Updating branch refs/heads/master
         to e8e18a299a4fda6f6cdc7abf30e43ccb8a544528 (commit)
       from 65447b3bcb0e748f94f86dc828f3ff2097141034 (commit)

commit e8e18a299a4fda6f6cdc7abf30e43ccb8a544528
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Mar 20 16:10:04 2011 +0100

    Work around Gdk vapi change to support old and new

 postler/postler-cellrenderertoggle.vala |    4 ++--
 postler/postler.vapi                    |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/postler/postler-cellrenderertoggle.vala b/postler/postler-cellrenderertoggle.vala
index 4b025da..aed6356 100644
--- a/postler/postler-cellrenderertoggle.vala
+++ b/postler/postler-cellrenderertoggle.vala
@@ -33,11 +33,11 @@ public class Postler.CellRendererToggle : Gtk.CellRendererToggle {
         Gdk.cairo_rectangle (context, background_area);
 
         int x, y;
-        Gdk.Rectangle draw_rect = Gdk.Rectangle ();
         Gdk.Pixbuf? icon = null;
 
         window.get_pointer (out x, out y, null);
-        if (expose_area.intersect (cell_area, draw_rect)
+        /* if (expose_area.intersect (cell_area, null) */
+        if (Gdk.rectangle_intersect (expose_area, cell_area, null)
          && (flags & Gtk.CellRendererState.PRELIT) != 0
          && prelight_stock_id != null) {
             icon = widget.render_icon (prelight_stock_id, Gtk.IconSize.MENU, null);
diff --git a/postler/postler.vapi b/postler/postler.vapi
index 0a22602..929932e 100644
--- a/postler/postler.vapi
+++ b/postler/postler.vapi
@@ -23,5 +23,8 @@ namespace Gdk {
         public static bool pixbuf_save_to_buffer (Gdk.Pixbuf pixbuf, out string buffer,
                                                   out size_t buffer_size, string type,
                                                   void* a, void* b) throws GLib.Error;
+    [CCode (cname = "gdk_rectangle_intersect", cheader_filename = "gdk/gdk.h")]
+    public static bool rectangle_intersect (Gdk.Rectangle src1, Gdk.Rectangle src2,
+                                            out Gdk.Rectangle dest);
     }