[gnome-documents] Move thumbnail-frame.png to the GResource

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3f9bc8ac01a8e718a867c9e5be2a1e8d8c1ed36f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Oct 1 09:23:37 2012 -0400

    Move thumbnail-frame.png to the GResource
    
    And use the libgd method instead of the internal one.

 data/Makefile.am                            |    4 -
 src/Makefile.am                             |    3 +-
 src/documents.js                            |    4 +-
 src/gnome-documents.gresource.xml           |    1 +
 src/lib/gd-utils.c                          |   85 ---------------------------
 src/lib/gd-utils.h                          |    5 --
 {data => src/resources}/thumbnail-frame.png |  Bin 832 -> 832 bytes
 7 files changed, 5 insertions(+), 97 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 83ab9a9..d828fc4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,10 +34,6 @@ gsettingsschema_in_files = org.gnome.documents.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
 
-iconsdir = $(pkgdatadir)/icons
-dist_icons_DATA = \
-    thumbnail-frame.png
-
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a1773d..8e96338 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,8 @@ gnome-documents.gresource: gnome-documents.gresource.xml $(shell $(GLIB_COMPILE_
 EXTRA_DIST += gnome-documents.gresource.xml \
 	resources/app-menu.ui \
 	resources/preview-menu.ui \
-	resources/selection-menu.ui
+	resources/selection-menu.ui \
+	resources/thumbnail-frame.png
 
 resourcedir = $(pkgdatadir)
 resource_DATA = gnome-documents.gresource
diff --git a/src/documents.js b/src/documents.js
index c33b4ad..4e3694e 100644
--- a/src/documents.js
+++ b/src/documents.js
@@ -573,8 +573,8 @@ const DocCommon = new Lang.Class({
 
         if (this.thumbnailed) {
             let [ slice, border ] = Utils.getThumbnailFrameBorder();
-            this.pixbuf = GdPrivate.embed_image_in_frame(pixbuf,
-                Path.ICONS_DIR + 'thumbnail-frame.png',
+            this.pixbuf = Gd.embed_image_in_frame(pixbuf,
+                'resource:///org/gnome/documents/thumbnail-frame.png',
                 slice, border);
         } else {
             this.pixbuf = pixbuf;
diff --git a/src/gnome-documents.gresource.xml b/src/gnome-documents.gresource.xml
index e3256fd..75ef1bf 100644
--- a/src/gnome-documents.gresource.xml
+++ b/src/gnome-documents.gresource.xml
@@ -4,5 +4,6 @@
     <file alias="app-menu.ui" preprocess="xml-stripblanks">resources/app-menu.ui</file>
     <file alias="preview-menu.ui" preprocess="xml-stripblanks">resources/preview-menu.ui</file>
     <file alias="selection-menu.ui" preprocess="xml-stripblanks">resources/selection-menu.ui</file>
+    <file alias="thumbnail-frame.png" preprocess="to-pixdata">resources/thumbnail-frame.png</file>
   </gresource>
 </gresources>
diff --git a/src/lib/gd-utils.c b/src/lib/gd-utils.c
index cf79e59..f9e3dab 100644
--- a/src/lib/gd-utils.c
+++ b/src/lib/gd-utils.c
@@ -164,91 +164,6 @@ gd_gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
 	}
 }
 
-/**
- * gd_embed_image_in_frame: 
- * @source_image:
- * @frame_image_path:
- * @slice_width:
- * @border_width:
- *
- * Returns: (transfer full):
- */
-GdkPixbuf *
-gd_embed_image_in_frame (GdkPixbuf *source_image,
-                         const gchar *frame_image_path,
-                         GtkBorder *slice_width,
-                         GtkBorder *border_width)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  int source_width, source_height;
-  int dest_width, dest_height;
-  gchar *css_str;
-  GtkCssProvider *provider;
-  GtkStyleContext *context;
-  GError *error = NULL;
-  GdkPixbuf *retval;
-  GtkWidgetPath *path;
- 
-  source_width = gdk_pixbuf_get_width (source_image);
-  source_height = gdk_pixbuf_get_height (source_image);
-
-  dest_width = source_width +  border_width->left + border_width->right;
-  dest_height = source_height + border_width->top + border_width->bottom;
-
-  css_str = g_strdup_printf (".embedded-image { border-image: url(\"%s\") %d %d %d %d / %dpx %dpx %dpx %dpx }",
-                             frame_image_path, 
-                             slice_width->top, slice_width->right, slice_width->bottom, slice_width->left,
-                             border_width->top, border_width->right, border_width->bottom, border_width->left);
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css_str, -1, &error);
-
-  if (error != NULL) 
-    {
-      g_warning ("Unable to create the thumbnail frame image: %s", error->message);
-      g_error_free (error);
-      g_free (css_str);
-
-      return g_object_ref (source_image);
-    }
-
-  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, dest_width, dest_height);
-  cr = cairo_create (surface);
-
-  context = gtk_style_context_new ();
-  path = gtk_widget_path_new ();
-  gtk_widget_path_append_type (path, GTK_TYPE_ICON_VIEW);
-
-  gtk_style_context_set_path (context, path);
-  gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (provider), 600);
-
-  gtk_style_context_save (context);
-  gtk_style_context_add_class (context, "embedded-image");
-
-  gtk_render_frame (context, cr,
-                    0, 0,
-                    dest_width, dest_height);
-
-  gtk_style_context_restore (context);
-
-  gtk_render_icon (context, cr,
-                   source_image,
-                   border_width->left, border_width->top);
-
-  retval = gdk_pixbuf_get_from_surface (surface,
-                                        0, 0, dest_width, dest_height);
-
-  cairo_surface_destroy (surface);
-  cairo_destroy (cr);
-
-  gtk_widget_path_unref (path);
-  g_object_unref (provider);
-  g_object_unref (context);
-  g_free (css_str);
-
-  return retval;
-}
-
 const char *
 gd_filename_get_extension_offset (const char *filename)
 {
diff --git a/src/lib/gd-utils.h b/src/lib/gd-utils.h
index d0c3517..eb2aa32 100644
--- a/src/lib/gd-utils.h
+++ b/src/lib/gd-utils.h
@@ -34,11 +34,6 @@ gboolean gd_queue_thumbnail_job_for_file_finish (GAsyncResult *res);
 void gd_gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
                                                     gboolean should_activate);
 
-GdkPixbuf *gd_embed_image_in_frame (GdkPixbuf *source_image,
-                                    const gchar *frame_image_path,
-                                    GtkBorder *slice_width,
-                                    GtkBorder *border_width);
-
 const char *gd_filename_get_extension_offset (const char *filename);
 
 char *gd_filename_strip_extension (const char * filename_with_extension);
diff --git a/data/thumbnail-frame.png b/src/resources/thumbnail-frame.png
similarity index 100%
rename from data/thumbnail-frame.png
rename to src/resources/thumbnail-frame.png