From fc339613e6d8e680397fe70794c2b822955f0194 Mon Sep 17 00:00:00 2001
From: Wade Berrier <wade@mono-cvs.ximian.com>
Date: Tue, 17 Jan 2006 18:49:14 +0000
Subject: [PATCH] * 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]

svn path=/trunk/gtk-sharp/; revision=55689
---
 ChangeLog               |  8 ++++++++
 configure.in.in         |  4 ----
 sample/VteTest.cs       | 18 ++++++++++--------
 vte/vte-sharp-2.0.pc.in |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 734d62760..cd9e555a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-17  Wade Berrier  <wberrier@novell.com>
+
+	* 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  <mkestner@novell.com>
 
 	* glib/Marshaller.cs : subtract utc_offset when marshaling to time_t.
diff --git a/configure.in.in b/configure.in.in
index 1b2283a46..26b727a3a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -234,12 +234,8 @@ else
 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)
diff --git a/sample/VteTest.cs b/sample/VteTest.cs
index 6b5167e95..852f4cb16 100644
--- a/sample/VteTest.cs
+++ b/sample/VteTest.cs
@@ -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 @@ class T
 	
 	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 @@ class T
 		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)
diff --git a/vte/vte-sharp-2.0.pc.in b/vte/vte-sharp-2.0.pc.in
index df7ba3e25..f6c962cba 100644
--- a/vte/vte-sharp-2.0.pc.in
+++ b/vte/vte-sharp-2.0.pc.in
@@ -7,6 +7,6 @@ gapidir=${prefix}/share/gapi-2.0
 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