Author: wade
Date: 2006-01-17 13:49:14 -0500 (Tue, 17 Jan 2006)
New Revision: 55689
Modified:
trunk/gtk-sharp/ChangeLog
trunk/gtk-sharp/configure.in.in
trunk/gtk-sharp/sample/VteTest.cs
trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in
Log:
* Have vte-sharp only depend on gtk-sharp instead of gnome-sharp
* sample/VteTest.cs: use gtk# calls instead of gnome#
* vte/vte-sharp-2.0.pc.in: depend on gtk-sharp instead of gnome-sharp
* configure.in.in: Allow vte to be build if gnome isn't going to be built
[Fixes #77182]
Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog 2006-01-17 18:26:19 UTC (rev 55688)
+++ trunk/gtk-sharp/ChangeLog 2006-01-17 18:49:14 UTC (rev 55689)
@@ -1,3 +1,11 @@
+2006-01-17 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Have vte-sharp only depend on gtk-sharp instead of gnome-sharp
+ * sample/VteTest.cs: use gtk# calls instead of gnome#
+ * vte/vte-sharp-2.0.pc.in: depend on gtk-sharp instead of gnome-sharp
+ * configure.in.in: Allow vte to be build if gnome isn't going to be
built
+ [Fixes #77182]
+
2005-01-13 Mike Kestner <[EMAIL PROTECTED]>
* glib/Marshaller.cs : subtract utc_offset when marshaling to time_t.
Modified: trunk/gtk-sharp/configure.in.in
===================================================================
--- trunk/gtk-sharp/configure.in.in 2006-01-17 18:26:19 UTC (rev 55688)
+++ trunk/gtk-sharp/configure.in.in 2006-01-17 18:49:14 UTC (rev 55689)
@@ -234,12 +234,8 @@
enable_gtkhtml=no
fi
-if test "x$enable_gnome" = "xyes"; then
VTE_REQUIRED_VERSION=0.11.10
PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION,
enable_vte=yes, enable_vte=no)
-else
-enable_vte=no
-fi
AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
AC_PATH_PROG(MONODOCER, monodocer, no)
Modified: trunk/gtk-sharp/sample/VteTest.cs
===================================================================
--- trunk/gtk-sharp/sample/VteTest.cs 2006-01-17 18:26:19 UTC (rev 55688)
+++ trunk/gtk-sharp/sample/VteTest.cs 2006-01-17 18:49:14 UTC (rev 55689)
@@ -1,11 +1,12 @@
using System;
using System.Collections;
using Gtk;
-using Gnome;
using Vte;
class T
{
+ private Gtk.Window window;
+
static void Main (string[] args)
{
new T (args);
@@ -13,10 +14,11 @@
T (string[] args)
{
- Program program = new Program ("vte-sharp-test", "0.0",
Modules.UI, args);
- App app = new App ("vte-sharp-test", "Test for vte widget");
- app.SetDefaultSize (600, 450);
- app.DeleteEvent += new DeleteEventHandler (OnAppDelete);
+
+ Application.Init();
+ window = new Gtk.Window("Test for vte widget");
+ window.SetDefaultSize(600, 450);
+ window.DeleteEvent += new DeleteEventHandler (OnAppDelete);
HBox hbox = new HBox ();
Terminal term = new Terminal ();
@@ -71,9 +73,9 @@
int pid = term.ForkCommand (Environment.GetEnvironmentVariable
("SHELL"), argv, envv, Environment.CurrentDirectory, false, true, true);
Console.WriteLine ("Child pid: {0}", pid);
- app.Contents = hbox;
- app.ShowAll ();
- program.Run ();
+ window.Add(hbox);
+ window.ShowAll();
+ Application.Run();
}
private void OnTextDeleted (object o, EventArgs args)
Modified: trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in 2006-01-17 18:26:19 UTC (rev
55688)
+++ trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in 2006-01-17 18:49:14 UTC (rev
55689)
@@ -7,6 +7,6 @@
Name: Vte#
Description: Vte# - libvte .NET Binding
Version: @VERSION@
-Requires: gnome-sharp-2.0
+Requires: gtk-sharp-2.0
Cflags: -I:${gapidir}/vte-api.xml
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/vte-sharp.dll
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches