gtk+ r19959 - in trunk: . gtk

[tml svn gnome org]

Author: tml
Date: Wed Apr  2 10:59:44 2008
New Revision: 19959
URL: http://svn.gnome.org/viewvc/gtk+?rev=19959&view=rev

Log:
2008-04-02  Tor Lillqvist  <tml novell com>

	* gtk/Makefile.am: Don't bother compiling gtksearchenginebeagle.c
	and gtksearchenginetracker.c on Windows.

	* gtk/gtksearchengine.c: Don't define HAVE_BEAGLE and HAVE_TRACKER
	on Windows.



Modified:
   trunk/ChangeLog
   trunk/gtk/Makefile.am
   trunk/gtk/gtksearchengine.c

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Wed Apr  2 10:59:44 2008
@@ -347,8 +347,6 @@
 gtk_private_h_sources =		\
 	gtkquery.h		\
 	gtksearchengine.h	\
-	gtksearchenginebeagle.h	\
-	gtksearchenginetracker.h\
 	gtksearchenginesimple.h	\
 	gtkdndcursors.h		\
 	gtkentryprivate.h	\
@@ -394,8 +392,6 @@
 gtk_base_c_sources =            \
 	gtkquery.c		\
 	gtksearchengine.c	\
-	gtksearchenginebeagle.c	\
-	gtksearchenginetracker.c\
 	gtksearchenginesimple.c	\
 	fnmatch.c		\
 	gtkaboutdialog.c	\
@@ -662,7 +658,9 @@
 	gtkprintjob.c			\
 	gtkprintoperation-unix.c	\
 	gtkprintunixdialog.c		\
-        gtkprintbackend.c
+        gtkprintbackend.c		\
+	gtksearchenginebeagle.c		\
+	gtksearchenginetracker.c
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
 gtk_private_h_sources += \
@@ -672,7 +670,9 @@
 	gtkprinter-private.h		\
 	gtkprinteroption.h		\
 	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h
+	gtkprinteroptionwidget.h	\
+	gtksearchenginebeagle.h		\
+	gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 

Modified: trunk/gtk/gtksearchengine.c
==============================================================================
--- trunk/gtk/gtksearchengine.c	(original)
+++ trunk/gtk/gtksearchengine.c	Wed Apr  2 10:59:44 2008
@@ -29,9 +29,15 @@
 
 #include <gdk/gdkconfig.h> /* for GDK_WINDOWING_QUARTZ */
 
+#ifndef G_OS_WIN32		/* Beagle and tracker are not ported
+				 * to Windows, as far as I know.
+				 */
+
 #define HAVE_BEAGLE  1 
 #define HAVE_TRACKER 1
 
+#endif
+
 enum 
 {
   HITS_ADDED,