Merge branch 'ke' into ke-lua
authorKlaus Ethgen <Klaus@Ethgen.de>
Sat, 29 Oct 2011 22:41:36 +0000 (23:41 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sat, 29 Oct 2011 22:41:36 +0000 (23:41 +0100)
* ke: (74 commits)
  rename file_data_new_simple to file_data_new_group, filedata.c cleanup
  recognize all registered extensions, even if they contain dots
  sidecar_file_priority function is already called with extension as an argument
  call notify functions in in an idle call
  move the grouping code from file_data_new to filelist_read
  separate function fortesting changed files without sidecars
  consistent use of fd->extension
  simplified grouping of sidecars
  fixed filelist_sort_compare_filedata to not return 0 no different files
  always check for sidecars by readdir
  do not use FileData entries with empty path
  updated copyright notice
  added custom tiff loader
  added long-term cache for keywords
  set stereo.fixed default values to hdmi stereo standard
  fixed stereo.fixed preferences
  fixed stereo_temp_disable functionality
  ignore raw image support reported by the pixbuf loader
  fixed using DEBUG_N from multiple threads
  Fix bug 3006812: ensure exif cache is initialized even when all files are unreadable.
  ...

1  2 
configure.in
src/Makefile.am
src/main.c

diff --cc configure.in
@@@ -476,7 -492,7 +519,7 @@@ Flags
    Gtk:           $GTK_CFLAGS
    Glib:          $GLIB_CFLAGS
    Thread:        $GTHREAD_LIBS
-   Others:      $LCMS_LIBS $EXIV2_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS $LUA_LIBS
 -  Others:      $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS
++  Others:      $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS $LUA_LIBS
  
  Localization:
    NLS support:   $USE_NLS
diff --cc src/Makefile.am
@@@ -243,10 -251,9 +253,10 @@@ geeqie_SOURCES = 
        view_file_icon.c        \
        view_file_icon.h        \
        window.c        \
 -      window.h
 +      window.h        \
 +      lua.c
  
- geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS)
 -geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS)
++geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS)
  
  EXTRA_DIST = \
        $(extra_SLIK)
diff --cc src/main.c
Simple merge