# HG changeset patch
# User zas_
# Date 1213301842 0
# Node ID fb249b8e63e479867a73e3da6d80e9a370a28981
# Parent  e9e3fb483cdc0dbbd72a987a6fc6dfa57b14d72f
Move some functions from image.[ch] to image-overlay.c and make them static:
- image_overlay_add()
- image_overlay_set()
- image_overlay_remove()
- image_overlay_get() (unused)

diff -r e9e3fb483cdc -r fb249b8e63e4 src/image-overlay.c
--- a/src/image-overlay.c	Thu Jun 12 18:30:33 2008 +0000
+++ b/src/image-overlay.c	Thu Jun 12 20:17:22 2008 +0000
@@ -697,6 +697,29 @@
 	return icon;
 }
 
+static gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
+			      gint relative, gint always)
+{
+	return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always);
+}
+
+static void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
+{
+	pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
+}
+
+#if 0 /* unused for now */
+static gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
+{
+	return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
+}
+#endif
+
+static void image_overlay_remove(ImageWindow *imd, gint id)
+{
+	pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
+}
+
 static void image_osd_icon_show(OverlayStateData *osd, ImageOSDFlag flag)
 {
 	GdkPixbuf *pixbuf;
diff -r e9e3fb483cdc -r fb249b8e63e4 src/image.c
--- a/src/image.c	Thu Jun 12 18:30:33 2008 +0000
+++ b/src/image.c	Thu Jun 12 20:17:22 2008 +0000
@@ -1138,27 +1138,6 @@
 	return TRUE;
 }
 
-gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
-		       gint relative, gint always)
-{
-	return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always);
-}
-
-void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
-{
-	pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-
-gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
-{
-	return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-
-void image_overlay_remove(ImageWindow *imd, gint id)
-{
-	pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
-}
-
 static gint image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 {
 	ImageWindow *imd = data;
diff -r e9e3fb483cdc -r fb249b8e63e4 src/image.h
--- a/src/image.h	Thu Jun 12 18:30:33 2008 +0000
+++ b/src/image.h	Thu Jun 12 20:17:22 2008 +0000
@@ -114,13 +114,6 @@
 /* wallpaper util */
 void image_to_root_window(ImageWindow *imd, gint scaled);
 
-/* overlays */
-gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
-		       gint relative, gint always);
-void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y);
-gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y);
-void image_overlay_remove(ImageWindow *imd, gint id);
-
 
 
 void image_set_image_as_tiles(ImageWindow *imd, gint width, gint height,