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 --git a/src/image-overlay.c b/src/image-overlay.c
index 78f47a5..f27938f 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -697,6 +697,29 @@ static GdkPixbuf *image_osd_icon_pixbuf(ImageOSDFlag flag)
        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 --git a/src/image.c b/src/image.c
index 059252c..5a2d6c5 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1138,27 +1138,6 @@ static gint image_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, gpointer
        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 --git a/src/image.h b/src/image.h
index 140449a..98ecc53 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -114,13 +114,6 @@ void image_set_delay_flip(ImageWindow *imd, gint delay);
 /* 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,