[Monodevelop-patches-list] r1239 - in trunk/MonoDevelop: . src/AddIns/Misc/StartPage src/Main/Base src/Main/Base/Gui/BrowserDisplayBinding src/Main/Base/Gui/HtmlControl
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Mar 25 02:35:45 EST 2004
Author: tberman
Date: 2004-03-25 02:35:45 -0500 (Thu, 25 Mar 2004)
New Revision: 1239
Added:
trunk/MonoDevelop/src/AddIns/Misc/StartPage/ChangeLog
Removed:
trunk/MonoDevelop/gtkmozembed-sharp/
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/Makefile.am
trunk/MonoDevelop/configure.in
trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs
trunk/MonoDevelop/src/Main/Base/Makefile.am
Log:
dep on gecko-sharp
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/ChangeLog 2004-03-25 07:35:45 UTC (rev 1239)
@@ -1,3 +1,10 @@
+2004-03-25 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: updated for switchover to gecko-sharp
+ * gtkmozembed/: removed, as we now depend on the mono-cvs gecko-sharp --
+ gtkmozembed-sharp module
+ * Makefile.am: updated for gecko-sharp
+
2004-03-22 John Luke <jluke at cfl.rr.coc>
* configure.in: make ENABLE_XDGMIME work right
Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/Makefile.am 2004-03-25 07:35:45 UTC (rev 1239)
@@ -1,6 +1,6 @@
# leave gdldock first
# (mkdir ../../build/bin/ hack)
-SUBDIRS = gdldock gtkmozembed-sharp src build data
+SUBDIRS = gdldock src build data
bin_SCRIPTS = monodevelop
@@ -43,7 +43,7 @@
run: runmd
runmd: $(PROGRAM)
- cd build/bin && MONO_PATH="`pkg-config --variable=libdir monodoc`/monodoc" mono --debug MonoDevelop.exe
+ cd build/bin && LD_LIBRARY_PATH="$(MOZILLA_HOME)" mono --debug MonoDevelop.exe
pad: $(MONOPAD)
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/configure.in 2004-03-25 07:35:45 UTC (rev 1239)
@@ -45,6 +45,14 @@
GTKSOURCEVIEW_SHARP="`pkg-config --libs gtksourceview-sharp`"
AC_SUBST(GTKSOURCEVIEW_SHARP)
+GECKOSHARP_REQUIRED_VERSION=0.1
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION, enable_geckosharp=yes, enable_geckosharp=no)
+if test "x$enable_geckosharp" = "xno"; then
+ AC_MSG_ERROR([You need to install gecko-sharp])
+fi
+GECKO_SHARP="`pkg-config --libs gecko-sharp`"
+AC_SUBST(GECKO_SHARP)
+
dnl find gnome-vfs
GNOMEVFS_REQUIRED_VERSION=2.0
PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED_VERSION, enable_gnomevfs=yes, enable_gnomevfs=no)
@@ -109,7 +117,6 @@
gdldock/gdl/Makefile
gdldock/sources/Makefile
gdldock/sources/gdl/Makefile
-gtkmozembed-sharp/Makefile
src/Makefile
src/AddIns/Makefile
src/AddIns/BackendBindings/Makefile
Added: trunk/MonoDevelop/src/AddIns/Misc/StartPage/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/ChangeLog 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/ChangeLog 2004-03-25 07:35:45 UTC (rev 1239)
@@ -0,0 +1,4 @@
+2004-03-25 Todd Berman <tberman at sevenl.net>
+
+ * Makefile.am:
+ * StartPage.cs: updated for gecko-sharp
Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am 2004-03-25 07:35:45 UTC (rev 1239)
@@ -14,7 +14,7 @@
@ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
/r:../../../../build/bin/MonoDevelop.Core.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
- /r:../../../../build/bin/gtkmozembed-sharp.dll \
+ $(GECKO_SHARP) \
/r:gtk-sharp \
$(build_sources) \
&& cp $(DLL) ../../../../build/AddIns/AddIns/Misc/StartPage/.
Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs 2004-03-25 07:35:45 UTC (rev 1239)
@@ -13,7 +13,7 @@
using MonoDevelop.Gui.HtmlControl;
using MonoDevelop.Core.Services;
-using GtkMozEmbed;
+using Gecko;
namespace MonoDevelop.StartPage
{
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-03-25 07:35:45 UTC (rev 1239)
@@ -1,5 +1,11 @@
2004-03-25 Todd Berman <tberman at sevenl.net>
+ * Makefile.am:
+ * Gui/HtmlControl/MozillaControl.cs:
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs: updated for gecko-sharp
+
+2004-03-25 Todd Berman <tberman at sevenl.net>
+
* Services/File/DefaultFileService.cs: adding a new method of external
app launching based on gnome vfs stuff, works around broken gnome
installs.
Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-03-25 07:35:45 UTC (rev 1239)
@@ -8,7 +8,7 @@
using System;
using Gtk;
using GtkSharp;
-using GtkMozEmbed;
+using Gecko;
using MonoDevelop.Internal.Undo;
using System.Drawing.Printing;
@@ -105,7 +105,7 @@
public BrowserPane(bool showNavigation) //: base (type)
{
htmlViewPane = new HtmlViewPane(showNavigation);
- htmlViewPane.MozillaControl.Title += new EventHandler (OnTitleChanged);
+ htmlViewPane.MozillaControl.TitleChange += new EventHandler (OnTitleChanged);
}
public BrowserPane() : this(true)
@@ -129,7 +129,7 @@
private void OnTitleChanged (object o, EventArgs args)
{
- ContentName = htmlViewPane.MozillaControl.GeckoTitle;
+ ContentName = htmlViewPane.MozillaControl.Title;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs 2004-03-25 07:35:45 UTC (rev 1239)
@@ -7,12 +7,11 @@
//
using System;
-using GtkMozEmbed;
-using GtkMozEmbedSharp;
+using Gecko;
namespace MonoDevelop.Gui.HtmlControl
{
- public class MozillaControl : EmbedWidget, IWebBrowser
+ public class MozillaControl : WebControl, IWebBrowser
{
private static GLib.GType gtype;
private string html;
@@ -31,7 +30,7 @@
//FIXME: pick a better path, one of the Environment dirs
public MozillaControl () : base (GType)
{
- EmbedWidget.SetProfilePath ("/tmp", "MonoDevelop");
+ WebControl.SetProfilePath ("/tmp", "MonoDevelop");
}
public void GoHome ()
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-25 05:42:27 UTC (rev 1238)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-25 07:35:45 UTC (rev 1239)
@@ -9,9 +9,9 @@
/r:../../../build/bin/MonoDevelop.Gui.Widgets.dll \
/r:System.Data /r:System.Web.Services \
/r:gtk-sharp /r:gdk-sharp /r:glib-sharp /r:pango-sharp \
- /r:../../../build/bin/gtkmozembed-sharp.dll \
/r:../../../build/bin/gdl-sharp.dll \
- /r:glade-sharp /r:gnome-sharp /r:gtkhtml-sharp
+ /r:glade-sharp /r:gnome-sharp /r:gtkhtml-sharp \
+ $(GECKO_SHARP)
FILES= \
./Gui/Pads/ProjectBrowser/ProjectBrowserView.cs \
More information about the Monodevelop-patches-list
mailing list