GNOME.org
 

[gnome-photos] Drop unused Eye of GNOME files and dependencies

commit d083ad912ac377c0e6d0a5e04494eb8522b4e2ee
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Oct 26 16:19:52 2015 +0100

    Drop unused Eye of GNOME files and dependencies
    
    These were originally dragged in with the printing code. Since then we
    have nicely isolated Eye of GNOME's printing code, so we can drop these
    unused files and dependencies.
    
    I would like to thank the Eye of GNOME guys for their beautiful code.

 configure.ac                  |   25 -
 po/POTFILES.in                |    4 -
 src/Makefile.am               |   34 -
 src/eog-debug.c               |  160 ---
 src/eog-debug.h               |   75 --
 src/eog-enums.h               |   37 -
 src/eog-exif-util.c           |  325 ------
 src/eog-exif-util.h           |   59 -
 src/eog-image-private.h       |   97 --
 src/eog-image-save-info.c     |  147 ---
 src/eog-image-save-info.h     |   57 -
 src/eog-image.c               | 2475 -----------------------------------------
 src/eog-image.h               |  220 ----
 src/eog-job-queue.c           |  212 ----
 src/eog-job-queue.h           |   42 -
 src/eog-jobs.c                |  690 ------------
 src/eog-jobs.h                |  228 ----
 src/eog-metadata-reader-jpg.c |  671 -----------
 src/eog-metadata-reader-jpg.h |   55 -
 src/eog-metadata-reader-png.c |  646 -----------
 src/eog-metadata-reader-png.h |   55 -
 src/eog-metadata-reader.c     |  132 ---
 src/eog-metadata-reader.h     |  112 --
 src/eog-transform.c           |  449 --------
 src/eog-transform.h           |   76 --
 src/eog-uri-converter.c       |  988 ----------------
 src/eog-uri-converter.h       |  107 --
 src/eog-util.c                |  506 ---------
 src/eog-util.h                |   74 --
 src/photos-application.c      |    3 -
 src/photos-utils.c            |  132 ---
 src/photos-utils.h            |    8 -
 32 files changed, 0 insertions(+), 8901 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 438c89d..7bb444d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,15 +30,12 @@ AC_SUBST(LIBM)
 GLIB_GSETTINGS
 
 CAIRO_MIN_VERSION=1.14.0
-EXEMPI_MIN_VERSION=1.99.5
 GDATA_MIN_VERSION=0.15.2
 GFBGRAPH_MIN_VERSION=0.2.1
 GLIB_MIN_VERSION=2.39.3
 GOA_MIN_VERSION=3.8.0
 GRILO_MIN_VERSION=0.3.0
 GTK_MIN_VERSION=3.15.5
-LIBEXIF_MIN_VERSION=0.6.14
-LIBRSVG_MIN_VERSION=2.26.0
 
 AX_REQUIRE_DEFINED([IT_PROG_INTLTOOL])
 IT_PROG_INTLTOOL([0.50.1])
@@ -51,9 +48,6 @@ AM_GLIB_GNU_GETTEXT
 
 LT_INIT
 
-# Used to keep eog-exif-util.c and eog-util.c aligned with EOG
-AC_CHECK_FUNCS(strptime)
-
 # ****************************************************************
 # Support for nl_langinfo (_NL_MEASUREMENT_MEASUREMENT) (optional)
 # ****************************************************************
@@ -68,27 +62,11 @@ if test "$have_langinfo_measurement" = "yes"; then
             [Define if _NL_MEASUREMENT_MEASUREMENT is available])
 fi
 
-# ***************
-# ZLIB (required)
-# ***************
-
-have_zlib=yes
-AC_CHECK_HEADERS([zlib.h],
-       [AC_CHECK_LIB([z], [inflate],
-               [AC_CHECK_LIB([z], [crc32], [], [have_zlib=no])],
-               [have_zlib=no])],
-       [have_zlib=no])
-
-if test x$have_zlib = xno; then
-       AC_MSG_ERROR([No sufficient zlib library found on your system.])
-fi
-
 PKG_CHECK_MODULES(BABL, [babl])
 
 PKG_CHECK_MODULES(CAIRO, [cairo >= $CAIRO_MIN_VERSION cairo-gobject])
 AC_DEFINE([HAVE_CAIRO_GOBJECT], [], [We want gegl-gtk to use the cairo-gobject code path])
 
-PKG_CHECK_MODULES(EXEMPI, [exempi-2.0 >= $EXEMPI_MIN_VERSION])
 PKG_CHECK_MODULES(GFBGRAPH, [libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION])
 PKG_CHECK_MODULES(GDATA, [libgdata >= $GDATA_MIN_VERSION])
 PKG_CHECK_MODULES(GEGL, [gegl-0.3])
@@ -108,9 +86,6 @@ PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_MIN_VERSION])
 AC_DEFINE([HAVE_GTK3], [], [We want gegl-gtk to use the GTK+ 3.x code path])
 
 PKG_CHECK_MODULES(GTK_UNIX_PRINT, [gtk+-unix-print-3.0])
-PKG_CHECK_MODULES(LCMS, [lcms2])
-PKG_CHECK_MODULES(LIBEXIF, [libexif >= $LIBEXIF_MIN_VERSION])
-PKG_CHECK_MODULES(LIBRSVG, [librsvg-2.0 >= $LIBRSVG_MIN_VERSION])
 PKG_CHECK_MODULES(TRACKER, [tracker-control-1.0 tracker-sparql-1.0])
 
 AX_REQUIRE_DEFINED([LIBGD_INIT])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a7c91b4..30437fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,10 +3,6 @@
 data/org.gnome.Photos.appdata.xml.in
 data/org.gnome.Photos.desktop.in.in
 data/org.gnome.photos.gschema.xml
-src/eog-exif-util.c
-src/eog-image.c
-src/eog-uri-converter.c
-src/eog-util.c
 src/photos-application.c
 src/photos-base-item.c
 src/photos-delete-notification.c
diff --git a/src/Makefile.am b/src/Makefile.am
index aedf3ff..c3e2b39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,32 +35,6 @@ nodist_gnome_photos_SOURCES = \
        $(NULL)
 
 gnome_photos_SOURCES = \
-       eog-debug.c \
-       eog-debug.h \
-       eog-enums.h \
-       eog-exif-util.c \
-       eog-exif-util.h \
-       eog-image.c \
-       eog-image.h \
-       eog-image-private.h \
-       eog-image-save-info.c \
-       eog-image-save-info.h \
-       eog-job-queue.c \
-       eog-job-queue.h \
-       eog-jobs.c \
-       eog-jobs.h \
-       eog-metadata-reader.c \
-       eog-metadata-reader.h \
-       eog-metadata-reader-jpg.c \
-       eog-metadata-reader-jpg.h \
-       eog-metadata-reader-png.c \
-       eog-metadata-reader-png.h \
-       eog-transform.c \
-       eog-transform.h \
-       eog-uri-converter.c \
-       eog-uri-converter.h \
-       eog-util.c \
-       eog-util.h \
        gegl-gtk-enums.h \
        gegl-gtk-view.c \
        gegl-gtk-view.h \
@@ -263,7 +237,6 @@ AM_CPPFLAGS = \
        -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
        $(BABL_CFLAGS) \
        $(CAIRO_CFLAGS) \
-       $(EXEMPI_CFLAGS) \
        $(GDATA_CFLAGS) \
        $(GDK_PIXBUF_CFLAGS) \
        $(GFBGRAPH_CFLAGS) \
@@ -275,9 +248,6 @@ AM_CPPFLAGS = \
        $(GRILO_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GTK_UNIX_PRINT_CFLAGS) \
-       $(LCMS_CFLAGS) \
-       $(LIBEXIF_CFLAGS) \
-       $(LIBRSVG_CFLAGS) \
        $(TRACKER_CFLAGS) \
        -I$(top_srcdir)/libgd \
        $(NULL)
@@ -293,7 +263,6 @@ gnome_photos_LDFLAGS = \
 gnome_photos_LDADD = \
        $(BABL_LIBS) \
        $(CAIRO_LIBS) \
-       $(EXEMPI_LIBS) \
        $(GDATA_LIBS) \
        $(GDK_PIXBUF_LIBS) \
        $(GFBGRAPH_LIBS) \
@@ -305,9 +274,6 @@ gnome_photos_LDADD = \
        $(GRILO_LIBS) \
        $(GTK_LIBS) \
        $(GTK_UNIX_PRINT_LIBS) \
-       $(LCMS_LIBS) \
-       $(LIBEXIF_LIBS) \
-       $(LIBRSVG_LIBS) \
        $(TRACKER_LIBS) \
        $(LIBM) \
        $(top_builddir)/libgd/libgd.la \
diff --git a/src/photos-application.c b/src/photos-application.c
index 7c65cc0..7101fa2 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -34,7 +34,6 @@
 #include <grilo.h>
 #include <libgnome-desktop/gnome-bg.h>
 
-#include "eog-debug.h"
 #include "photos-application.h"
 #include "photos-base-item.h"
 #include "photos-camera-cache.h"
@@ -1209,8 +1208,6 @@ photos_application_init (PhotosApplication *self)
   self->priv = photos_application_get_instance_private (self);
   priv = self->priv;
 
-  eog_debug_init ();
-
   photos_utils_ensure_builtins ();
 
   priv->search_provider = photos_search_provider_new ();
diff --git a/src/photos-utils.c b/src/photos-utils.c
index 99f9ef1..ef0e7ea 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -52,9 +52,6 @@
 #include "photos-utils.h"
 
 
-static const gchar *dot_dir;
-
-
 static void
 photos_utils_put_pixel (guchar *p)
 {
@@ -430,27 +427,6 @@ photos_utils_get_icon_from_cursor (TrackerSparqlCursor *cursor)
 }
 
 
-const gchar *
-photos_utils_dot_dir (void)
-{
-  const gchar *config_dir;
-
-  if (dot_dir == NULL)
-    {
-      config_dir = g_get_user_config_dir ();
-      dot_dir = g_build_filename (config_dir, PACKAGE_TARNAME, NULL);
-    }
-
-  if (g_file_test (dot_dir, G_FILE_TEST_IS_DIR))
-    goto out;
-
-  g_mkdir_with_parents (dot_dir, 0700);
-
- out:
-  return dot_dir;
-}
-
-
 GdkPixbuf *
 photos_utils_downscale_pixbuf_for_scale (GdkPixbuf *pixbuf, gint size, gint scale)
 {
@@ -722,114 +698,6 @@ photos_utils_get_pixbuf_common_suffix (GdkPixbufFormat *format)
 }
 
 
-static gchar *
-photos_utils_get_pixbuf_suffix_from_basename (const gchar *basename)
-{
-  gchar *suffix;
-  gchar *suffix_start;
-  guint len;
-
-  /* FIXME: does this work for all locales? */
-  suffix_start = g_utf8_strrchr (basename, -1, '.');
-
-  if (suffix_start == NULL)
-    return NULL;
-
-  len = strlen (suffix_start) - 1;
-  suffix = g_strndup (suffix_start+1, len);
-
-  return suffix;
-}
-
-
-GdkPixbufFormat *
-photos_utils_get_pixbuf_format (GFile *file)
-{
-  GdkPixbufFormat *format;
-  gchar *basename;
-  gchar *path;
-  gchar *suffix;
-
-  g_return_val_if_fail (file != NULL, NULL);
-
-  path = g_file_get_path (file);
-  basename = g_path_get_basename (path);
-  suffix = photos_utils_get_pixbuf_suffix_from_basename (basename);
-
-  format = photos_utils_get_pixbuf_format_by_suffix (suffix);
-
-  g_free (path);
-  g_free (basename);
-  g_free (suffix);
-
-  return format;
-}
-
-
-GdkPixbufFormat*
-photos_utils_get_pixbuf_format_by_suffix (const gchar *suffix)
-{
-  GSList *list;
-  GSList *it;
-  GdkPixbufFormat *result = NULL;
-
-  g_return_val_if_fail (suffix != NULL, NULL);
-
-  list = gdk_pixbuf_get_formats ();
-
-  for (it = list; (it != NULL) && (result == NULL); it = it->next)
-    {
-      GdkPixbufFormat *format;
-      gchar **extensions;
-      gint i;
-
-      format = (GdkPixbufFormat*) it->data;
-
-      extensions = gdk_pixbuf_format_get_extensions (format);
-      for (i = 0; extensions[i] != NULL; i++)
-        {
-          /* g_print ("check extension: %s against %s\n", extensions[i], suffix); */
-          if (g_ascii_strcasecmp (suffix, extensions[i]) == 0)
-            {
-              result = format;
-              break;
-          }
-        }
-
-      g_strfreev (extensions);
-    }
-
-  g_slist_free (list);
-
-  return result;
-}
-
-
-GSList *
-photos_utils_get_pixbuf_savable_formats (void)
-{
-  GSList *list;
-  GSList *write_list = NULL;
-  GSList *it;
-
-  list = gdk_pixbuf_get_formats ();
-
-  for (it = list; it != NULL; it = it->next)
-    {
-      GdkPixbufFormat *format;
-
-      format = (GdkPixbufFormat*) it->data;
-      if (gdk_pixbuf_format_is_writable (format))
-        write_list = g_slist_prepend (write_list, format);
-    }
-
-  g_slist_free (list);
-  write_list = g_slist_reverse (write_list);
-
-  return write_list;
-}
-
-
 const gchar *
 photos_utils_get_provider_name (PhotosBaseManager *src_mngr, PhotosBaseItem *item)
 {
diff --git a/src/photos-utils.h b/src/photos-utils.h
index 76bb932..6df0573 100644
--- a/src/photos-utils.h
+++ b/src/photos-utils.h
@@ -63,8 +63,6 @@ gboolean         photos_utils_create_thumbnail            (GFile *file, GCancell
 
 GIcon           *photos_utils_get_icon_from_cursor        (TrackerSparqlCursor *cursor);
 
-const gchar     *photos_utils_dot_dir                     (void);
-
 GdkPixbuf       *photos_utils_downscale_pixbuf_for_scale  (GdkPixbuf *pixbuf, gint size, gint scale);
 
 void             photos_utils_ensure_builtins             (void);
@@ -87,12 +85,6 @@ gint             photos_utils_get_icon_size_unscaled      (void);
 
 char*            photos_utils_get_pixbuf_common_suffix    (GdkPixbufFormat *format);
 
-GdkPixbufFormat* photos_utils_get_pixbuf_format           (GFile *file);
-
-GdkPixbufFormat* photos_utils_get_pixbuf_format_by_suffix (const char *suffix);
-
-GSList*          photos_utils_get_pixbuf_savable_formats  (void);
-
 const gchar     *photos_utils_get_provider_name           (PhotosBaseManager *src_mngr, PhotosBaseItem 
*item);
 
 GtkBorder       *photos_utils_get_thumbnail_frame_border  (void);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]