sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Take out the HAVE_NS_WEB_BROWSER ifdefs, we finally have this symbol in mozilla's trunk.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-05-04 19:41:08 +02:00
parent bbb96e9c89
commit 16304b33c8
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/GeckoBrowserPersist.cpp
View File

@ -51,7 +51,6 @@ NewURI(const char *uri, nsIURI **result)
static nsresult static nsresult
GetPostData(SugarBrowser *browser, nsIInputStream **postData) GetPostData(SugarBrowser *browser, nsIInputStream **postData)
{ {
#ifdef HAVE_NS_WEB_BROWSER
nsCOMPtr<nsIWebBrowser> webBrowser; nsCOMPtr<nsIWebBrowser> webBrowser;
gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(browser), gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(browser),
getter_AddRefs(webBrowser)); getter_AddRefs(webBrowser));
@ -76,8 +75,6 @@ GetPostData(SugarBrowser *browser, nsIInputStream **postData)
} }
return NS_OK; return NS_OK;
#endif
return NS_ERROR_NOT_IMPLEMENTED;
} }
bool bool

8
browser/sugar-browser.cpp
View File

@ -283,7 +283,6 @@ sugar_browser_get_document_metadata(SugarBrowser *browser)
{ {
SugarBrowserMetadata *metadata = sugar_browser_metadata_new(); SugarBrowserMetadata *metadata = sugar_browser_metadata_new();
#ifdef HAVE_NS_WEB_BROWSER
nsCOMPtr<nsIWebBrowser> webBrowser; nsCOMPtr<nsIWebBrowser> webBrowser;
gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(browser), gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(browser),
getter_AddRefs(webBrowser)); getter_AddRefs(webBrowser));
@ -327,7 +326,6 @@ sugar_browser_get_document_metadata(SugarBrowser *browser)
if (fileName.Length()) { if (fileName.Length()) {
metadata->filename = g_strdup(fileName.get()); metadata->filename = g_strdup(fileName.get());
} }
#endif
return metadata; return metadata;
} }
@ -375,7 +373,6 @@ sugar_browser_realize(GtkWidget *widget)
{ {
GTK_WIDGET_CLASS(parent_class)->realize(widget); GTK_WIDGET_CLASS(parent_class)->realize(widget);
#ifdef HAVE_NS_WEB_BROWSER
GtkMozEmbed *embed = GTK_MOZ_EMBED(widget); GtkMozEmbed *embed = GTK_MOZ_EMBED(widget);
nsCOMPtr<nsIWebBrowser> webBrowser; nsCOMPtr<nsIWebBrowser> webBrowser;
gtk_moz_embed_get_nsIWebBrowser(embed, getter_AddRefs(webBrowser)); gtk_moz_embed_get_nsIWebBrowser(embed, getter_AddRefs(webBrowser));
@ -398,7 +395,6 @@ sugar_browser_realize(GtkWidget *widget)
commandManager->DoCommand("cmd_clipboardDragDropHook", cmdParamsObj, commandManager->DoCommand("cmd_clipboardDragDropHook", cmdParamsObj,
DOMWindow); DOMWindow);
} }
#endif
} }
static void static void
@ -706,7 +702,6 @@ gboolean
sugar_browser_save_document(SugarBrowser *browser, sugar_browser_save_document(SugarBrowser *browser,
const char *filename) const char *filename)
{ {
#ifdef HAVE_NS_WEB_BROWSER
nsresult rv; nsresult rv;
nsCString cFile(filename); nsCString cFile(filename);
@ -749,9 +744,6 @@ sugar_browser_save_document(SugarBrowser *browser,
NS_ENSURE_SUCCESS(rv, FALSE); NS_ENSURE_SUCCESS(rv, FALSE);
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
char * char *

10
configure.ac
View File

@ -16,16 +16,6 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL 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]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
AM_PATH_PYTHON AM_PATH_PYTHON