From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Tue, 2 Oct 2012 21:19:13 +0000 (+0100)
Subject: Merge branch 'master' into ke-lua
X-Git-Tag: v1.2~11^2
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=632d09215f133ab09c1f56de26b12cb35a794806

Merge branch 'master' into ke-lua

* master: (185 commits)
  better fix for big-endian architectures
  Minor indentation fixes.
  Cleanup checker shader code.
  Fix exif orientation in clutter rendering mode.
  Silent 2 warnings using explicit type casting.
  Polish translation was updated, thanks to Grzegorz Gibas.
  Update pt_BR translation.
  Add *~, *.rej, *.orig files to git ignore list.
  Fix for support >=automake-1.11.4
  Trim trailing white spaces on empty lines.
  Trim trailing white spaces.
  Add missing vim modeline.
  Fix indentation and few trailing white spaces.
  Clear few more warnings, unused variables mostly.
  Drop unused variable.
  Remove commented out code.
  Remove commented out code.
  Remove commented out code.
  Remove commented out code.
  Remove commented out code.
  ...
---

632d09215f133ab09c1f56de26b12cb35a794806
diff --cc configure.in
index 2481debe,59f88a12..c5b726c8
--- a/configure.in
+++ b/configure.in
@@@ -519,7 -551,7 +578,7 @@@ Flags
    Gtk:           $GTK_CFLAGS
    Glib:          $GLIB_CFLAGS
    Thread:        $GTHREAD_LIBS
-   Others:	 $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS $LUA_LIBS
 -  Others:	 $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $CLUTTER_LIBS $CLUTTER_GTK_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS
++  Others:	 $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $CLUTTER_LIBS $CLUTTER_GTK_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS $LUA_LIBS
  
  Localization:
    NLS support:   $USE_NLS
@@@ -535,9 -567,9 +594,10 @@@ Support
    LCMS:          $HAVE_LCMS
    Exiv2:	 $HAVE_EXIV2
    Lirc:          $HAVE_LIRC
+   Clutter:       $HAVE_CLUTTER
    Libchamplain:		$HAVE_LIBCHAMPLAIN
    Libchamplain-gtk:	$HAVE_LIBCHAMPLAIN_GTK
 +  Lua:	         $HAVE_LUA
  
  Documentation:
    Doxygen:       $DOXYGEN
diff --cc src/Makefile.am
index cbb9e8a4,329973cb..02cfeec0
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -7,7 -7,8 +7,9 @@@ AM_CFLAGS =				
  	$(EXIV2_CFLAGS)			\
  	$(LIBCHAMPLAIN_CFLAGS)		\
  	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
 +	$(LUA_CFLAGS)			\
+ 	$(CLUTTER_CFLAGS)		\
+ 	$(CLUTTER_GTK_CFLAGS)	\
  	-I$(top_srcdir)			\
  	-I$(top_builddir)
  
@@@ -18,7 -19,8 +20,9 @@@ AM_CXXFLAGS =				
  	$(EXIV2_CFLAGS)			\
  	$(LIBCHAMPLAIN_CFLAGS)		\
  	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
 +	$(LUA_CFLAGS)			\
+ 	$(CLUTTER_CFLAGS)		\
+ 	$(CLUTTER_GTK_CFLAGS)	\
  	-I$(top_srcdir)			\
  	-I$(top_builddir)
  
@@@ -253,10 -257,9 +259,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) $(JPEG_LIBS) $(TIFF_LIBS) $(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) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
++geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
  
  EXTRA_DIST = \
  	$(extra_SLIK)
diff --cc src/filedata.c
index 62e77497,e0d70f00..4b7e70e4
--- a/src/filedata.c
+++ b/src/filedata.c
@@@ -2631,10 -2725,21 +2718,10 @@@ void file_data_send_notification(FileDa
  	while (work)
  		{
  		NotifyData *nd = (NotifyData *)work->data;
- 		
+ 
 -		nd->func(nid->fd, nid->type, nd->data);
 +		nd->func(fd, type, nd->data);
  		work = work->next;
  		}
 -	file_data_unref(nid->fd);
 -	g_free(nid);
 -	return FALSE;
 -}
 -
 -void file_data_send_notification(FileData *fd, NotifyType type)
 -{
 -	NotifyIdleData *nid = g_new0(NotifyIdleData, 1);
 -	nid->fd = file_data_ref(fd);
 -	nid->type = type;
 -	g_idle_add_full(G_PRIORITY_HIGH, file_data_send_notification_idle_cb, nid, NULL);
  }
  
  static GHashTable *file_data_monitor_pool = NULL;
diff --cc src/main.c
index db832a15,d40416f8..c56ab57c
--- a/src/main.c
+++ b/src/main.c
@@@ -45,13 -46,10 +46,11 @@@
  #include "exif.h"
  #include "histogram.h"
  #include "pixbuf_util.h"
 +#include "glua.h"
  
- #ifdef HAVE_LIBCHAMPLAIN
- #ifdef HAVE_LIBCHAMPLAIN_GTK
+ #ifdef HAVE_CLUTTER
  #include <clutter-gtk/clutter-gtk.h>
  #endif
- #endif
  
  
  gboolean thumb_format_changed = FALSE;