From 60d2fab857f8edaaf6f182fe52bcccdd95c0d6f3 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Tue, 11 May 2004 20:56:24 +0000
Subject: [PATCH] 2004-05-11  Mike Kestner  <mkestner@ximian.com>

	* *.pc.in : add Requires so that dependent libs are pulled in too.

svn path=/trunk/gtk-sharp/; revision=27132
---
 ChangeLog                     | 4 ++++
 gconf/GConf/gconf-sharp.pc.in | 1 +
 generator/CallbackGen.cs      | 5 +++++
 glade/glade-sharp.pc.in       | 1 +
 gnome/gnome-sharp.pc.in       | 1 +
 gtkhtml/gtkhtml-sharp.pc.in   | 1 +
 vte/vte-sharp.pc.in           | 1 +
 7 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 469fae59d..4fcb147a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-11  Mike Kestner  <mkestner@ximian.com>
+
+	* *.pc.in : add Requires so that dependent libs are pulled in too.
+
 2004-05-11  Mike Kestner  <mkestner@ximian.com>
 
 	* gconf/GConf/NotifyWrapper.cs : add some defensive null checking.
diff --git a/gconf/GConf/gconf-sharp.pc.in b/gconf/GConf/gconf-sharp.pc.in
index 63b3316ed..92be35558 100644
--- a/gconf/GConf/gconf-sharp.pc.in
+++ b/gconf/GConf/gconf-sharp.pc.in
@@ -6,4 +6,5 @@ libdir=${exec_prefix}/lib
 Name: GConf#
 Description: GConf# - GConf .NET Binding
 Version: @VERSION@
+Requires: gnome-sharp
 Libs: -lib:${libdir}/mono/@PACKAGE@ -r:gconf-sharp -r:gconf-sharp-peditors
diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs
index 28e54f1fc..73eabf0a5 100644
--- a/generator/CallbackGen.cs
+++ b/generator/CallbackGen.cs
@@ -116,6 +116,11 @@ namespace GtkSharp.Generation {
 				if ((i == count - 1) && ctype == "gpointer" && (parm_name.EndsWith ("data") || parm_name.EndsWith ("data_or_owner"))) 
 					continue;
 
+				if (ctype == "GError**") {
+					sw.WriteLine ("\t\t\t" + parm_name + " = IntPtr.Zero;");
+					continue;
+				}
+
 				string cstype = parms[i].CSType;
 				ClassBase parm_wrapper = table.GetClassGen (ctype);
 				sw.Write("\t\t\t" + cstype + " _arg" + idx);
diff --git a/glade/glade-sharp.pc.in b/glade/glade-sharp.pc.in
index 4bca6c8af..72fcb0d28 100644
--- a/glade/glade-sharp.pc.in
+++ b/glade/glade-sharp.pc.in
@@ -6,4 +6,5 @@ libdir=${exec_prefix}/lib
 Name: Glade#
 Description: Glade# - Glade .NET Binding
 Version: @VERSION@
+Requires: gtk-sharp
 Libs: -lib:${libdir}/mono/@PACKAGE@ -r:glade-sharp
diff --git a/gnome/gnome-sharp.pc.in b/gnome/gnome-sharp.pc.in
index 0950aa6b8..af09dc94c 100644
--- a/gnome/gnome-sharp.pc.in
+++ b/gnome/gnome-sharp.pc.in
@@ -6,4 +6,5 @@ libdir=${exec_prefix}/lib
 Name: Gnome#
 Description: Gnome# - GNOME .NET Binding
 Version: @VERSION@
+Requires: gtk-sharp art-sharp
 Libs: -lib:${libdir}/mono/@PACKAGE@ -r:gnome-sharp
diff --git a/gtkhtml/gtkhtml-sharp.pc.in b/gtkhtml/gtkhtml-sharp.pc.in
index 0970b9136..d97d9492c 100644
--- a/gtkhtml/gtkhtml-sharp.pc.in
+++ b/gtkhtml/gtkhtml-sharp.pc.in
@@ -6,4 +6,5 @@ libdir=${exec_prefix}/lib
 Name: Gtkhtml#
 Description: Gtkhtml# - Gtkhtml .NET Binding
 Version: @VERSION@
+Requires: gnome-sharp
 Libs: -lib:${libdir}/mono/@PACKAGE@ -r:gtkhtml-sharp
diff --git a/vte/vte-sharp.pc.in b/vte/vte-sharp.pc.in
index e0e3a9630..840c7803f 100644
--- a/vte/vte-sharp.pc.in
+++ b/vte/vte-sharp.pc.in
@@ -6,4 +6,5 @@ libdir=${exec_prefix}/lib
 Name: Vte#
 Description: Vte# - libvte .NET Binding
 Version: @VERSION@
+Requires: gnome-sharp
 Libs: -lib:${libdir}/mono/@PACKAGE@ -r:vte-sharp