From 50d2b665017ea4a5284bbcf44fc16a890b3a1a5d Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Fri, 04 May 2007 17:51:15 +0000
Subject: Take out the HAVE_GECKO_1_9 ifdefs, we only support Gecko 1.9 now.

---
(limited to 'browser/sugar-browser.cpp')

diff --git a/browser/sugar-browser.cpp b/browser/sugar-browser.cpp
index d997fff..4afbeaa 100644
--- a/browser/sugar-browser.cpp
+++ b/browser/sugar-browser.cpp
@@ -23,13 +23,10 @@
 #include "sugar-marshal.h"
 #include "GeckoContentHandler.h"
 #include "GeckoDownload.h"
-
-#ifdef HAVE_GECKO_1_9
 #include "GeckoDragDropHooks.h"
 #include "GeckoDocumentObject.h"
 #include "GeckoBrowserPersist.h"
 #include "GeckoDirectoryProvider.h"
-#endif
 
 #include <gdk/gdkx.h>
 #include <gtkmozembed_internal.h>
@@ -591,7 +588,6 @@ location_cb(GtkMozEmbed *embed)
 static gboolean
 dom_mouse_click_cb(GtkMozEmbed *embed, nsIDOMMouseEvent *mouseEvent)
 {
-#ifdef HAVE_GECKO_1_9
     SugarBrowser *browser = SUGAR_BROWSER(embed);
     SugarBrowserEvent *event;
     gint return_value = FALSE;
@@ -621,9 +617,6 @@ dom_mouse_click_cb(GtkMozEmbed *embed, nsIDOMMouseEvent *mouseEvent)
     sugar_browser_event_free(event);
 
     return return_value;
-#else
-    return FALSE;
-#endif
 }
 
 static void
@@ -650,7 +643,6 @@ sugar_browser_scroll_pixels(SugarBrowser *browser,
                             int           dx,
                             int           dy)
 {
-#ifndef HAVE_GECKO_1_9
 	nsCOMPtr<nsIWebBrowser> webBrowser;
 	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED(browser),
 									 getter_AddRefs(webBrowser));
@@ -668,7 +660,6 @@ sugar_browser_scroll_pixels(SugarBrowser *browser,
 	NS_ENSURE_TRUE (DOMWindow, );
 
 	DOMWindow->ScrollBy (dx, dy);
-#endif
 }
 
 void
@@ -690,12 +681,8 @@ sugar_browser_save_uri(SugarBrowser *browser,
                        const char   *uri,
                        const char   *filename)
 {
-#ifdef HAVE_GECKO_1_9
     GeckoBrowserPersist browserPersist(browser);
     return browserPersist.SaveURI(uri, filename);
-#else
-    return FALSE;
-#endif
 }
 
 gboolean
--
cgit v0.9.1