# HG changeset patch # User nadvornik # Date 1237138804 0 # Node ID cb0040be832ee08c2ae7011d508ffe819bf6b38d # Parent a005287bffc7fb8a6b8b4b3c9e9b14a7f3f7fce5 fixed viewing image from dupe and search windows diff -r a005287bffc7 -r cb0040be832e src/dupe.c --- a/src/dupe.c Sun Mar 15 15:01:07 2009 +0000 +++ b/src/dupe.c Sun Mar 15 17:40:04 2009 +0000 @@ -1993,7 +1993,7 @@ } else { - layout_image_set_fd(NULL, di->fd); + layout_set_fd(NULL, di->fd); } } } diff -r a005287bffc7 -r cb0040be832e src/search.c --- a/src/search.c Sun Mar 15 15:01:07 2009 +0000 +++ b/src/search.c Sun Mar 15 17:40:04 2009 +0000 @@ -23,7 +23,7 @@ #include "filedata.h" #include "image-load.h" #include "img-view.h" -#include "layout_image.h" +#include "layout.h" #include "menu.h" #include "metadata.h" #include "misc.h" @@ -877,7 +877,7 @@ { SearchData *sd = data; - if (sd->click_fd) layout_image_set_fd(NULL, sd->click_fd); + if (sd->click_fd) layout_set_fd(NULL, sd->click_fd); } static void sr_menu_viewnew_cb(GtkWidget *widget, gpointer data) @@ -1095,7 +1095,7 @@ if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS) { - layout_image_set_fd(NULL, mfd->fd); + layout_set_fd(NULL, mfd->fd); } if (bevent->button == MOUSE_BUTTON_MIDDLE) return TRUE; @@ -1298,7 +1298,7 @@ switch (event->keyval) { case GDK_Return: case GDK_KP_Enter: - if (mfd) layout_image_set_fd(NULL, mfd->fd); + if (mfd) layout_set_fd(NULL, mfd->fd); break; case 'V': case 'v': {