mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-09-13 13:01:25 +00:00
Support the API change in libexif > 0.5.12.
2005-01-27 Chris Lahey <clahey@ximian.com> * acconfig.h, configure.in, src/nautilus-image-properties-page.c: Support the API change in libexif > 0.5.12.
This commit is contained in:
parent
c123abcb46
commit
c18bd686a7
|
@ -1,3 +1,8 @@
|
|||
2005-01-27 Chris Lahey <clahey@ximian.com>
|
||||
|
||||
* acconfig.h, configure.in, src/nautilus-image-properties-page.c:
|
||||
Support the API change in libexif > 0.5.12.
|
||||
|
||||
2005-01-27 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* src/nautilus-main.c: Don't leak the icon info
|
||||
|
|
|
@ -23,3 +23,4 @@
|
|||
#define HAVE_GTK_MULTIHEAD /* needed for egg-screen-exec functions */
|
||||
#undef HAVE_STARTUP_NOTIFICATION
|
||||
#undef HAVE_EXIF
|
||||
#undef HAVE_OLD_EXIF
|
||||
|
|
15
configure.in
15
configure.in
|
@ -211,10 +211,17 @@ dnl exif checking
|
|||
|
||||
AC_MSG_CHECKING(for libExif)
|
||||
|
||||
PKG_CHECK_MODULES(EXIF, libexif >= exif_minver, have_exif=yes, have_exif=no)
|
||||
if test "x$have_exif" = "xyes"; then
|
||||
AC_DEFINE(HAVE_EXIF,1, [define to enable EXIF support])
|
||||
fi
|
||||
PKG_CHECK_MODULES(EXIF, libexif > exif_minver, [
|
||||
AC_DEFINE(HAVE_EXIF, 1, [Define to enable EXIF support])
|
||||
AC_SUBST(EXIF_CFLAGS)
|
||||
AC_SUBST(EXIF_LIBS)
|
||||
], [
|
||||
PKG_CHECK_MODULES(EXIF, libexif = exif_minver, [
|
||||
AC_DEFINE(HAVE_EXIF, 1)
|
||||
AC_DEFINE(HAVE_OLD_EXIF, 1, [Define if your EXIF library has old API.])
|
||||
AC_SUBST(EXIF_CFLAGS)
|
||||
AC_SUBST(EXIF_LIBS)
|
||||
])])
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
|
|
|
@ -144,13 +144,20 @@ static void
|
|||
exif_content_callback (ExifContent *content, gpointer data)
|
||||
{
|
||||
struct ExifAttribute *attribute;
|
||||
#if !HAVE_OLD_EXIF
|
||||
char b[1024];
|
||||
#endif
|
||||
|
||||
attribute = (struct ExifAttribute *)data;
|
||||
if (attribute->found) {
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef HAVE_OLD_EXIF
|
||||
attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
|
||||
#else
|
||||
attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, b, sizeof(b)));
|
||||
#endif
|
||||
if (attribute->value != NULL) {
|
||||
attribute->found = TRUE;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue