[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / thumbnailer / evince-thumbnailer.c

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index 69c8a8d2620c340d388f69827d6bdc36302b3ce9..94d6b77ea334d3b676aa9ba4f2f840ea819d6ecd 100644 (file)
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -26,9 +26,6 @@
 #include <string.h>
 
 #ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
 #include <io.h>
 #include <conio.h>
 #if !(_WIN32_WINNT >= 0x0500)
@@ -140,8 +137,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si
        ev_document_get_page_size (document, 0, &width, &height);
 
        rc = ev_render_context_new (page, 0, size / width);
-       pixbuf = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (document),
-                                                      rc, FALSE);
+       pixbuf = ev_document_get_thumbnail (document, rc);
        g_object_unref (rc);
        g_object_unref (page);
        
@@ -156,7 +152,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si
                        gchar *overlaid_icon_path = g_build_filename (dir, "share", "evince", overlaid_icon_name, NULL);
                        g_free (dir);
 #else
-                       gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", DATADIR, overlaid_icon_name);
+                       gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", EVINCEDATADIR, overlaid_icon_name);
 #endif
                        overlaid_pixbuf = gdk_pixbuf_new_from_file (overlaid_icon_path, NULL);
                        g_free (overlaid_icon_path);
@@ -273,12 +269,6 @@ main (int argc, char *argv[])
                return -2;
        }
 
-       if (!EV_IS_DOCUMENT_THUMBNAILS (document)) {
-               g_object_unref (document);
-               ev_shutdown ();
-               return -2;
-       }
-
        if (EV_IS_ASYNC_RENDERER (document)) {
                struct AsyncData data;