Place the search icon in the primary slot of the entry

[~andy/gtk] / gtk / gtksearchengine.c

diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
index c1d23a4f55dd94ac0f5a9b22970960c6fcbd5628..b68408cacf41d4ac4ff0505c1686dbe08da2be91 100644 (file)
--- a/gtk/gtksearchengine.c
+++ b/gtk/gtksearchengine.c
@@ -12,25 +12,24 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Anders Carlsson <andersca@imendio.com>
  *
  * Based on nautilus-search-engine.c
  */
 
-#include <config.h>
+#include "config.h"
 #include "gtksearchengine.h"
-#include "gtksearchenginebeagle.h"
 #include "gtksearchenginesimple.h"
 #include "gtksearchenginetracker.h"
 #include "gtksearchenginequartz.h"
 
-#include <gdk/gdkconfig.h> /* for GDK_WINDOWING_QUARTZ */
+#include <gdk/gdk.h> /* for GDK_WINDOWING_QUARTZ */
 
-#define HAVE_BEAGLE  1 
+#ifndef G_OS_WIN32  /* No tracker on Windows */
 #define HAVE_TRACKER 1
+#endif
 
 enum 
 {
@@ -115,12 +114,6 @@ _gtk_search_engine_new (void)
     return engine;
 #endif
   
-#ifdef HAVE_BEAGLE
-  engine = _gtk_search_engine_beagle_new ();
-  if (engine)
-    return engine;
-#endif
-
 #ifdef GDK_WINDOWING_QUARTZ
   engine = _gtk_search_engine_quartz_new ();
   if (engine)