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

[evince.git] / libdocument / ev-document-images.c

diff --git a/libdocument/ev-document-images.c b/libdocument/ev-document-images.c
index 117b104cdeb626228867ca1d9f965d8d666d279a..a312bc7db829e8e7c59b7acba40fe6675b86933f 100644 (file)
--- a/libdocument/ev-document-images.c
+++ b/libdocument/ev-document-images.c
@@ -15,41 +15,33 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <config.h>
 #include "ev-document-images.h"
 
-GType
-ev_document_images_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               const GTypeInfo our_info = {
-                       sizeof (EvDocumentImagesIface),
-                       NULL,
-                       NULL,
-               };
+G_DEFINE_INTERFACE (EvDocumentImages, ev_document_images, 0)
 
-               type = g_type_register_static (G_TYPE_INTERFACE,
-                                              "EvDocumentImages",
-                                              &our_info, (GTypeFlags)0);
-       }
-
-       return type;
+static void
+ev_document_images_default_init (EvDocumentImagesInterface *klass)
+{
 }
 
-GList *
-ev_document_images_get_images (EvDocumentImages *document_images,
-                              gint              page)
+EvMappingList *
+ev_document_images_get_image_mapping (EvDocumentImages *document_images,
+                                     EvPage           *page)
 {
-       EvDocumentImagesIface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images);
-       GList *retval;
+       EvDocumentImagesInterface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images);
 
-       retval = iface->get_images (document_images, page);
-
-       return retval;
+       return iface->get_image_mapping (document_images, page);
 }
 
+GdkPixbuf *
+ev_document_images_get_image (EvDocumentImages *document_images,
+                             EvImage          *image)
+{
+       EvDocumentImagesInterface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images);
 
+       return iface->get_image (document_images, image);
+}