[evince] backend: Remove pixbuf backend
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] backend: Remove pixbuf backend
- Date: Sat, 4 Dec 2010 13:34:58 +0000 (UTC)
commit 5b49da80cac07713c01828d33be33e23d2895b98
Author: Christian Persch <chpe gnome org>
Date: Sat Dec 4 14:28:13 2010 +0100
backend: Remove pixbuf backend
Evince is a document viewer, not an image viewer. Eog does the latter job
much better than evince ever could.
Bug #630307.
backend/Makefile.am | 4 -
backend/pixbuf/Makefile.am | 30 ----
backend/pixbuf/pixbuf-document.c | 174 -----------------------
backend/pixbuf/pixbuf-document.h | 38 -----
backend/pixbuf/pixbufdocument.evince-backend.in | 4 -
configure.ac | 21 ---
libdocument/ev-document-factory.c | 78 ----------
7 files changed, 0 insertions(+), 349 deletions(-)
---
diff --git a/backend/Makefile.am b/backend/Makefile.am
index 85f4ff1..da9dc8c 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -10,10 +10,6 @@ if ENABLE_PS
SUBDIRS += ps
endif
-if ENABLE_PIXBUF
-SUBDIRS += pixbuf
-endif
-
if ENABLE_DJVU
SUBDIRS += djvu
endif
diff --git a/configure.ac b/configure.ac
index 1976209..d0712b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,22 +633,6 @@ AM_CONDITIONAL(WITH_TYPE1_FONTS, test x$enable_type1_fonts = xyes)
dnl ================== End of dvi checks ===================================================
-dnl ================== pixbuf checks ===================================================
-
-AC_ARG_ENABLE(pixbuf,
- [AS_HELP_STRING([--enable-pixbuf],
- [Compile with support of pixbuf])],
- [enable_pixbuf=$enableval],
- [enable_pixbuf=no])
-
-if test "x$enable_pixbuf" = "xyes"; then
- AC_DEFINE([ENABLE_PIXBUF], [1], [Enable pixbuf support.])
-fi
-
-AM_CONDITIONAL(ENABLE_PIXBUF, test x$enable_pixbuf = xyes)
-
-dnl ================== End of pixbuf checks ===================================================
-
dnl ================== comic book checks ===================================================
AC_ARG_ENABLE(comics,
@@ -708,9 +692,6 @@ fi
if test "x$enable_comics" = "xyes"; then
EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;"
fi
-if test "x$enable_pixbuf" = "xyes"; then
- EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"
-fi
if test "x$enable_xps" = "xyes"; then
EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
fi
@@ -789,7 +770,6 @@ backend/djvu/Makefile
backend/dvi/Makefile
backend/dvi/mdvi-lib/Makefile
backend/pdf/Makefile
-backend/pixbuf/Makefile
backend/ps/Makefile
backend/tiff/Makefile
backend/xps/Makefile
@@ -873,7 +853,6 @@ Configure summary:
TIFF Backend.......: $enable_tiff
DJVU Backend.......: $enable_djvu
DVI Backend........: $enable_dvi
- Pixbuf Backend.....: $enable_pixbuf
Comics Backend.....: $enable_comics
XPS Backend........: $enable_xps
"
diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 0ace5ec..2bed390 100644
--- a/libdocument/ev-document-factory.c
+++ b/libdocument/ev-document-factory.c
@@ -33,58 +33,6 @@
#include "ev-document-factory.h"
#include "ev-file-helpers.h"
-#ifdef ENABLE_PIXBUF
-static GList*
-gdk_pixbuf_mime_type_list ()
-{
- GSList *formats, *list;
- GList *result = NULL;
-
- formats = gdk_pixbuf_get_formats ();
- for (list = formats; list != NULL; list = list->next) {
- GdkPixbufFormat *format = list->data;
- gchar **mime_types;
-
- if (gdk_pixbuf_format_is_disabled (format))
- continue;
-
- mime_types = gdk_pixbuf_format_get_mime_types (format);
- result = g_list_prepend (result, mime_types);
- }
- g_slist_free (formats);
-
- return result;
-}
-
-/* Would be nice to have this in gdk-pixbuf */
-static gboolean
-mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
-{
- GList *mime_types;
- GList *list;
- gboolean retval = FALSE;
-
- mime_types = gdk_pixbuf_mime_type_list ();
- for (list = mime_types; list; list = list->next) {
- gchar **mtypes = (gchar **)list->data;
- const gchar *mtype;
- gint i = 0;
-
- while ((mtype = mtypes[i++])) {
- if (strcmp (mtype, mime_type) == 0) {
- retval = TRUE;
- break;
- }
- }
- }
-
- g_list_foreach (mime_types, (GFunc)g_strfreev, NULL);
- g_list_free (mime_types);
-
- return retval;
-}
-#endif /* ENABLE_PIXBUF */
-
static EvCompressionType
get_compression_from_mime_type (const gchar *mime_type)
{
@@ -149,12 +97,6 @@ get_document_from_uri (const char *uri,
}
document = ev_backends_manager_get_document (mime_type);
-
-#ifdef ENABLE_PIXBUF
- if (!document && mime_type_supported_by_gdk_pixbuf (mime_type))
- document = ev_backends_manager_get_document ("image/*");
-#endif /* ENABLE_PIXBUF */
-
if (document == NULL) {
gchar *content_type, *mime_desc = NULL;
@@ -304,26 +246,6 @@ file_filter_add_mime_types (EvTypeInfo *info, GtkFileFilter *filter)
const gchar *mime_type;
gint i = 0;
-#ifdef ENABLE_PIXBUF
- if (g_ascii_strcasecmp (info->mime_types[0], "image/*") == 0) {
- GList *pixbuf_types, *l;
-
- pixbuf_types = gdk_pixbuf_mime_type_list ();
- for (l = pixbuf_types; l; l = g_list_next (l)) {
- gchar **mime_types = (gchar **)l->data;
- gint j = 0;
-
- while ((mime_type = mime_types[j++]))
- gtk_file_filter_add_mime_type (filter, mime_type);
-
- g_strfreev (mime_types);
- }
- g_list_free (pixbuf_types);
-
- return;
- }
-#endif /* ENABLE_PIXBUF */
-
while ((mime_type = info->mime_types[i++]))
gtk_file_filter_add_mime_type (filter, mime_type);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]