From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 27 May 2009 21:38:51 +0000 (+0200)
Subject: Move midori_view_get_snapshot to MidoriView
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faae6e9b40d254631e2e475f2ae1f244909f25ac;p=midori

Move midori_view_get_snapshot to MidoriView
---

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 4af6dafa..109e8800 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -410,64 +410,6 @@ midori_view_notify_icon_cb (MidoriView*    view,
         MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri);
 }
 
-static GdkPixbuf*
-midori_view_get_snapshot (MidoriView* view,
-                          guint       width,
-                          guint       height)
-{
-    GtkWidget* web_view;
-    GdkRectangle rect;
-    GdkPixmap* pixmap;
-    GdkEvent event;
-    gboolean result;
-    GdkColormap* colormap;
-    GdkPixbuf* pixbuf;
-
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-    web_view = gtk_bin_get_child (GTK_BIN (view));
-    g_return_val_if_fail (web_view->window, NULL);
-
-    rect.x = web_view->allocation.x;
-    rect.y = web_view->allocation.y;
-    rect.width = web_view->allocation.width;
-    rect.height = web_view->allocation.height;
-
-    pixmap = gdk_pixmap_new (web_view->window,
-        web_view->allocation.width, web_view->allocation.height,
-        gdk_drawable_get_depth (web_view->window));
-    event.expose.type = GDK_EXPOSE;
-    event.expose.window = pixmap;
-    event.expose.send_event = FALSE;
-    event.expose.count = 0;
-    event.expose.area.x = 0;
-    event.expose.area.y = 0;
-    gdk_drawable_get_size (GDK_DRAWABLE (web_view->window),
-        &event.expose.area.width, &event.expose.area.height);
-    event.expose.region = gdk_region_rectangle (&event.expose.area);
-
-    g_signal_emit_by_name (web_view, "expose-event", &event, &result);
-
-    colormap = gdk_drawable_get_colormap (pixmap);
-    pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, colormap, 0, 0,
-                                           0, 0, rect.width, rect.height);
-    g_object_unref (pixmap);
-
-    if (width || height)
-    {
-        GdkPixbuf* scaled;
-        if (!width)
-            width = rect.width;
-        if (!height)
-            height = rect.height;
-        scaled = gdk_pixbuf_scale_simple (pixbuf, width, height,
-                                          GDK_INTERP_TILES);
-        g_object_unref (pixbuf);
-        return scaled;
-    }
-
-    return pixbuf;
-}
-
 static void
 midori_view_notify_load_status_cb (GtkWidget*      view,
                                    GParamSpec*     pspec,
@@ -949,6 +891,10 @@ midori_browser_speed_dial_get_next_free_slot (void)
     return slot_id;
 }
 
+GdkPixbuf*
+midori_view_get_snapshot (MidoriView* view,
+                          guint       width,
+                          guint       height);
 
 static void
 midori_browser_add_speed_dial (MidoriBrowser* browser)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index bc542fc5..02166207 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2975,6 +2975,64 @@ midori_view_execute_script (MidoriView*  view,
     return TRUE;
 }
 
+/* For now this is private API */
+GdkPixbuf*
+midori_view_get_snapshot (MidoriView* view,
+                          guint       width,
+                          guint       height)
+{
+    GtkWidget* web_view;
+    GdkRectangle rect;
+    GdkPixmap* pixmap;
+    GdkEvent event;
+    gboolean result;
+    GdkColormap* colormap;
+    GdkPixbuf* pixbuf;
+
+    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+    web_view = gtk_bin_get_child (GTK_BIN (view));
+    g_return_val_if_fail (web_view->window, NULL);
+
+    rect.x = web_view->allocation.x;
+    rect.y = web_view->allocation.y;
+    rect.width = web_view->allocation.width;
+    rect.height = web_view->allocation.height;
+
+    pixmap = gdk_pixmap_new (web_view->window,
+        web_view->allocation.width, web_view->allocation.height,
+        gdk_drawable_get_depth (web_view->window));
+    event.expose.type = GDK_EXPOSE;
+    event.expose.window = pixmap;
+    event.expose.send_event = FALSE;
+    event.expose.count = 0;
+    event.expose.area.x = 0;
+    event.expose.area.y = 0;
+    gdk_drawable_get_size (GDK_DRAWABLE (web_view->window),
+        &event.expose.area.width, &event.expose.area.height);
+    event.expose.region = gdk_region_rectangle (&event.expose.area);
+
+    g_signal_emit_by_name (web_view, "expose-event", &event, &result);
+
+    colormap = gdk_drawable_get_colormap (pixmap);
+    pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, colormap, 0, 0,
+                                           0, 0, rect.width, rect.height);
+    g_object_unref (pixmap);
+
+    if (width || height)
+    {
+        GdkPixbuf* scaled;
+        if (!width)
+            width = rect.width;
+        if (!height)
+            height = rect.height;
+        scaled = gdk_pixbuf_scale_simple (pixbuf, width, height,
+                                          GDK_INTERP_TILES);
+        g_object_unref (pixbuf);
+        return scaled;
+    }
+
+    return pixbuf;
+}
 
 /**
  * midori_view_speed_dial_inject_thumb
@@ -3014,7 +3072,6 @@ midori_view_speed_dial_inject_thumb (MidoriView* view,
     g_free (file_content);
 }
 
-
 /**
  * midori_view_speed_dial_save
  * @web_view: a #WebkitView