diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-05-04 17:41:08 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-05-04 17:41:08 (GMT) |
| commit | 16304b33c8c9310bd556b8a56b0a881c0764d278 (patch) | |
| tree | 30971616db56230c59639a26e88e12c6f51d75d2 | |
| parent | bbb96e9c89e6e12fc2a83dc291514ba1859db325 (diff) | |
Take out the HAVE_NS_WEB_BROWSER ifdefs, we finally have this symbol in mozilla's trunk.
| -rw-r--r-- | browser/GeckoBrowserPersist.cpp | 3 | ||||
| -rw-r--r-- | browser/sugar-browser.cpp | 8 | ||||
| -rw-r--r-- | configure.ac | 10 |
3 files changed, 0 insertions, 21 deletions
diff --git a/browser/GeckoBrowserPersist.cpp b/browser/GeckoBrowserPersist.cpp index 2c019c5..a614e4d 100644 --- a/browser/GeckoBrowserPersist.cpp +++ b/browser/GeckoBrowserPersist.cpp @@ -51,7 +51,6 @@ NewURI(const char *uri, nsIURI **result) static nsresult GetPostData(SugarBrowser *browser, nsIInputStream **postData) { -#ifdef HAVE_NS_WEB_BROWSER nsCOMPtr<nsIWebBrowser> webBrowser; gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(browser), getter_AddRefs(webBrowser)); @@ -76,8 +75,6 @@ GetPostData(SugarBrowser *browser, nsIInputStream **postData) } return NS_OK; -#endif - return NS_ERROR_NOT_IMPLEMENTED; } bool diff --git a/browser/sugar-browser.cpp b/browser/sugar-browser.cpp index f3a3d87..d997fff 100644 --- a/browser/sugar-browser.cpp +++ b/browser/sugar-browser.cpp @@ -283,7 +283,6 @@ sugar_browser_get_document_metadata(SugarBrowser *browser) { SugarBrowserMetadata *metadata = sugar_browser_metadata_new(); -#ifdef HAVE_NS_WEB_BROWSER nsCOMPtr<nsIWebBrowser> webBrowser; gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(browser), getter_AddRefs(webBrowser)); @@ -327,7 +326,6 @@ sugar_browser_get_document_metadata(SugarBrowser *browser) if (fileName.Length()) { metadata->filename = g_strdup(fileName.get()); } -#endif return metadata; } @@ -375,7 +373,6 @@ sugar_browser_realize(GtkWidget *widget) { GTK_WIDGET_CLASS(parent_class)->realize(widget); -#ifdef HAVE_NS_WEB_BROWSER GtkMozEmbed *embed = GTK_MOZ_EMBED(widget); nsCOMPtr<nsIWebBrowser> webBrowser; gtk_moz_embed_get_nsIWebBrowser(embed, getter_AddRefs(webBrowser)); @@ -398,7 +395,6 @@ sugar_browser_realize(GtkWidget *widget) commandManager->DoCommand("cmd_clipboardDragDropHook", cmdParamsObj, DOMWindow); } -#endif } static void @@ -706,7 +702,6 @@ gboolean sugar_browser_save_document(SugarBrowser *browser, const char *filename) { -#ifdef HAVE_NS_WEB_BROWSER nsresult rv; nsCString cFile(filename); @@ -749,9 +744,6 @@ sugar_browser_save_document(SugarBrowser *browser, NS_ENSURE_SUCCESS(rv, FALSE); return TRUE; -#else - return FALSE; -#endif } char * diff --git a/configure.ac b/configure.ac index 7bcdf0c..5376c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,16 +16,6 @@ AM_MAINTAINER_MODE AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_ARG_ENABLE(ns-web-browser, - AC_HELP_STRING([--enable-ns-web-browser], - [Enable features which requires access to nsIWebBrowser]), - [have_ns_web_browser=yes], - [have_ns_web_browser=no]) - -if test "x$have_ns_web_browser" != "xno"; then - AC_DEFINE([HAVE_NS_WEB_BROWSER], [1], ["Have nsIWebBrowser"]) -fi - AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AM_PATH_PYTHON |