From 963ae98d5defc23cf3246d8bda94f43b24ccb5d2 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 9 Aug 2005 20:10:45 +0000 Subject: [PATCH] * configure.in.in: kill off all gda/gnomedb references. (Henceforth gda# and gnomedb# will be part of gda and gnomedb. Or maybe separate modules in Mono SVN. Not part of gtk-sharp though.) * Makefile.am (SUBDIRS): remove gda and gnomedb * gda/, gnomedb/: buh-bye svn path=/trunk/gtk-sharp/; revision=48200 --- ChangeLog | 10 + Makefile.am | 2 +- configure.in.in | 22 +- gda/Application.cs | 89 - gda/Gda.metadata | 29 - gda/Makefile.am | 22 - gda/XmlConnection.custom | 29 - gda/gda-api.raw | 3234 --------------------------- gda/gda-sharp-2.0.pc.in | 11 - gda/gda-sharp.dll.config.in | 4 - generator/CallbackGen.cs | 2 +- gnomedb/Application.cs | 91 - gnomedb/Editor.custom | 21 - gnomedb/GnomeDb.metadata | 7 - gnomedb/Makefile.am | 23 - gnomedb/gnomedb-api.raw | 1348 ----------- gnomedb/gnomedb-sharp-2.0.pc.in | 11 - gnomedb/gnomedb-sharp.dll.config.in | 4 - 18 files changed, 13 insertions(+), 4946 deletions(-) delete mode 100644 gda/Application.cs delete mode 100644 gda/Gda.metadata delete mode 100644 gda/Makefile.am delete mode 100644 gda/XmlConnection.custom delete mode 100644 gda/gda-api.raw delete mode 100644 gda/gda-sharp-2.0.pc.in delete mode 100644 gda/gda-sharp.dll.config.in delete mode 100644 gnomedb/Application.cs delete mode 100644 gnomedb/Editor.custom delete mode 100644 gnomedb/GnomeDb.metadata delete mode 100644 gnomedb/Makefile.am delete mode 100644 gnomedb/gnomedb-api.raw delete mode 100644 gnomedb/gnomedb-sharp-2.0.pc.in delete mode 100644 gnomedb/gnomedb-sharp.dll.config.in diff --git a/ChangeLog b/ChangeLog index af2e27c7a..fe3d8565a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-08-09 Dan Winship + + * configure.in.in: kill off all gda/gnomedb references. + (Henceforth gda# and gnomedb# will be part of gda and gnomedb. Or + maybe separate modules in Mono SVN. Not part of gtk-sharp though.) + + * Makefile.am (SUBDIRS): remove gda and gnomedb + + * gda/, gnomedb/: buh-bye + 2005-08-09 Dan Winship * generator/ClassBase.cs (Validate): Don't fully validate the diff --git a/Makefile.am b/Makefile.am index 131359949..497adf223 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gda gnomedb gtkhtml gconf rsvg vte gtkdotnet sample doc +SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gtkhtml gconf rsvg vte gtkdotnet sample doc EXTRA_DIST = \ gtk-sharp.snk \ diff --git a/configure.in.in b/configure.in.in index bac1da4dd..7c873b9b4 100644 --- a/configure.in.in +++ b/configure.in.in @@ -155,16 +155,6 @@ PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=y AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_LIBS) -LIBGDA_REQUIRED_VERSION=1.0.0 -PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no) - -enable_gnomedb=no -if test "x$enable_gnome" = "xyes"; then -if test "x$enable_gda" = "xyes"; then - PKG_CHECK_MODULES(LIBGNOMEDB_DEPENDENCIES, libgnomedb >= $LIBGDA_REQUIRED_VERSION, enable_gnomedb=yes, enable_gnomedb=no) -fi -fi - RSVG_REQUIRED_VERSION=2.0.1 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no) @@ -226,14 +216,12 @@ AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes") AM_CONDITIONAL(ENABLE_GNOMEVFS, test "x$enable_gnomevfs" = "xyes") AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") -AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") -AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes") AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes") AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes") AM_CONDITIONAL(ENABLE_DOTNET, test "x$enable_dotnet" = "xyes") AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") -AM_CONDITIONAL(ENABLE_ALL_OPTIONAL, test "x$enable_libart" = "xyes" -a "x$enable_gnomevfs" = "xyes" -a "x$enable_gnome" = "xyes" -a "x$enable_glade" = "xyes" -a "x$enable_gda" = "xyes" -a "x$enable_gnomedb" = "xyes" -a "x$enable_rsvg" = "xyes" -a "x$enable_gtkhtml" = "xyes" -a "x$enable_vte" = "xyes" -a "x$enable_dotnet" = "xyes" -a "x$enable_monodoc" = "xyes") +AM_CONDITIONAL(ENABLE_ALL_OPTIONAL, test "x$enable_libart" = "xyes" -a "x$enable_gnomevfs" = "xyes" -a "x$enable_gnome" = "xyes" -a "x$enable_glade" = "xyes" -a "x$enable_rsvg" = "xyes" -a "x$enable_gtkhtml" = "xyes" -a "x$enable_vte" = "xyes" -a "x$enable_dotnet" = "xyes" -a "x$enable_monodoc" = "xyes") AC_SUBST(CFLAGS) @@ -276,12 +264,6 @@ gnome/glue/Makefile gnomevfs/Makefile gnomevfs/gnome-vfs-sharp.dll.config gnomevfs/gnome-vfs-sharp-2.0.pc -gda/Makefile -gda/gda-sharp.dll.config -gda/gda-sharp-2.0.pc -gnomedb/Makefile -gnomedb/gnomedb-sharp.dll.config -gnomedb/gnomedb-sharp-2.0.pc gconf/Makefile gconf/doc/Makefile gconf/GConf/Makefile @@ -330,8 +312,6 @@ echo " * art-sharp.dll: $enable_libart" echo " * gnomevfs-sharp.dll: $enable_gnomevfs" echo " * gnome-sharp.dll: $enable_gnome" echo " * glade-sharp.dll: $enable_glade" -echo " * gda-sharp.dll: $enable_gda" -echo " * gnomedb-sharp.dll: $enable_gnomedb" echo " * rsvg-sharp.dll: $enable_rsvg " echo " * gtkhtml-sharp.dll: $enable_gtkhtml " echo " * vte-sharp.dll: $enable_vte " diff --git a/gda/Application.cs b/gda/Application.cs deleted file mode 100644 index de0a37c56..000000000 --- a/gda/Application.cs +++ /dev/null @@ -1,89 +0,0 @@ -// Gda.Application.cs - libgda initialization and event loop -// -// Author: Rodrigo Moya -// -// Copyright (c) 2002 Rodrigo Moya -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of version 2 of the Lesser GNU General -// Public License as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. - -using System; -using System.Runtime.InteropServices; - -namespace Gda -{ - public class Application - { - private const string VERSION = "0.10"; - - [DllImport("gda-2")] - static extern void gda_init (IntPtr app_id, IntPtr version, int nargs, IntPtr args); - - [DllImport("gda-2")] - static extern void gda_init (IntPtr app_id, IntPtr version, ref int argc, ref IntPtr argv); - - public static void Init () - { - Init ("Gda#", VERSION); - } - - public static void Init (string app_id, string version) - { - IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id); - IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version); - gda_init (native_appid, native_version, 0, IntPtr.Zero); - GLib.Marshaller.Free (native_appid); - GLib.Marshaller.Free (native_version); - } - - public static void Init (ref string[] args) - { - Init ("Gda#", VERSION, ref args); - } - - public static void Init (string app_id, string version, ref string[] args) - { - IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id); - IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version); - GLib.Argv argv = new GLib.Argv (args); - IntPtr arg_ptr = argv.Handle; - int argc = args.Length; - gda_init (native_appid, native_version, ref argc, ref arg_ptr); - GLib.Marshaller.Free (native_appid); - GLib.Marshaller.Free (native_version); - if (arg_ptr != argv.Handle) - throw new Exception ("Init returned new argv handle."); - if (argc <= 1) - args = new string [0]; - else - args = argv.GetArgs (argc); - } - - [DllImport("gda-2")] - static extern void gda_main_run (IntPtr init_func, IntPtr user_data); - - public static void Run () - { - gda_main_run (IntPtr.Zero, IntPtr.Zero); - } - - [DllImport("gda-2")] - static extern void gda_main_quit (); - - public static void Quit () - { - gda_main_quit (); - } - } -} diff --git a/gda/Gda.metadata b/gda/Gda.metadata deleted file mode 100644 index c3d084f19..000000000 --- a/gda/Gda.metadata +++ /dev/null @@ -1,29 +0,0 @@ - - - 1 - 1 - DataChanged - BeginEditing - CancelEditing - EndEditing - RowInsertedEvent - RowUpdatedEvent - RowRemovedEvent - 1 - 1 - 1 - DataChanged - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - GetGdaType - - diff --git a/gda/Makefile.am b/gda/Makefile.am deleted file mode 100644 index c0ee007de..000000000 --- a/gda/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -if ENABLE_GDA -pkg = gda -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gda-sharp-2.0.pc -else -pkg = -endif - -METADATA = Gda.metadata -SYMBOLS = -references = ../glib/glib-sharp.dll - -sources = \ - Application.cs - -customs = \ - XmlConnection.custom - -add_dist = gda-sharp-2.0.pc.in - -include ../Makefile.include - diff --git a/gda/XmlConnection.custom b/gda/XmlConnection.custom deleted file mode 100644 index 957a81c12..000000000 --- a/gda/XmlConnection.custom +++ /dev/null @@ -1,29 +0,0 @@ -// Gda.XmlConnection.custom - XmlConnection class customizations -// -// Author: Mike Kestner -// -// Copyright (C) 2005 Novell, Inc. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of version 2 of the Lesser GNU General -// Public License as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. - - - public static XmlConnection NewFromFile (string filename) - { - IntPtr filename_as_native = GLib.Marshaller.StringToPtrGStrdup (filename); - XmlConnection ret = new XmlConnection (gda_xml_connection_new_from_file (filename_as_native)); - GLib.Marshaller.Free (filename_as_native); - return ret; - } - diff --git a/gda/gda-api.raw b/gda/gda-api.raw deleted file mode 100644 index 005053058..000000000 --- a/gda/gda-api.raw +++ /dev/null @@ -1,3234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gda/gda-sharp-2.0.pc.in b/gda/gda-sharp-2.0.pc.in deleted file mode 100644 index 24c3680c6..000000000 --- a/gda/gda-sharp-2.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -gapidir=${prefix}/share/gapi-2.0 - - -Name: Gda# -Description: Gda# - Gda .NET Binding -Version: @VERSION@ -Cflags: -I:${gapidir}/gda-api.xml -Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gda-sharp.dll diff --git a/gda/gda-sharp.dll.config.in b/gda/gda-sharp.dll.config.in deleted file mode 100644 index 02f1b6fb5..000000000 --- a/gda/gda-sharp.dll.config.in +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs index c55539e63..a211b19ef 100644 --- a/generator/CallbackGen.cs +++ b/generator/CallbackGen.cs @@ -143,7 +143,7 @@ namespace GtkSharp.Generation { SymbolTable table = SymbolTable.Table; ClassBase ret_wrapper = table.GetClassGen (retval.CType); - if (ret_wrapper != null && (ret_wrapper is ObjectGen || ret_wrapper is OpaqueGen || ret_wrapper is InterfaceGen)) + if (ret_wrapper != null && ret_wrapper is HandleBase) sw.WriteLine ("(({0}) {1}).Handle;", retval.CSType, invoke); else if (table.IsStruct (retval.CType) || table.IsBoxed (retval.CType)) { // Shoot. I have no idea what to do here. diff --git a/gnomedb/Application.cs b/gnomedb/Application.cs deleted file mode 100644 index 2c0ade21e..000000000 --- a/gnomedb/Application.cs +++ /dev/null @@ -1,91 +0,0 @@ -// GnomeDb.Application.cs - libgnomedb initialization and event loop -// -// Author: Rodrigo Moya -// -// Copyright (c) 2002 Rodrigo Moya -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of version 2 of the Lesser GNU General -// Public License as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. - - -using System; -using System.Runtime.InteropServices; - -namespace GnomeDb -{ - - public class Application - { - private const string VERSION = "0.10"; - - [DllImport("gnomedb-2")] - static extern void gnome_db_init (IntPtr app_id, IntPtr version, int nargs, IntPtr args); - - public static void Init () - { - Init ("GnomeDb#", VERSION); - } - - public static void Init (string app_id, string version) - { - IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id); - IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version); - gnome_db_init (native_appid, native_version, 0, IntPtr.Zero); - GLib.Marshaller.Free (native_appid); - GLib.Marshaller.Free (native_version); - } - - [DllImport("gnomedb-2")] - static extern void gnome_db_init (IntPtr app_id, IntPtr version, ref int argc, ref IntPtr argv); - - public static void Init (ref string [] args) - { - Init ("GnomeDb#", VERSION, ref args); - } - - public static void Init (string app_id, string version, ref string[] args) - { - IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id); - IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version); - GLib.Argv argv = new GLib.Argv (args); - IntPtr arg_ptr = argv.Handle; - int argc = args.Length; - gnome_db_init (native_appid, native_version, ref argc, ref arg_ptr); - GLib.Marshaller.Free (native_appid); - GLib.Marshaller.Free (native_version); - if (arg_ptr != argv.Handle) - throw new Exception ("Init returned new argv handle."); - if (argc <= 1) - args = new string [0]; - else - args = argv.GetArgs (argc); - } - - [DllImport("gnomedb-2")] - static extern void gnome_db_main_run (IntPtr init_func, IntPtr user_data); - - public static void Run () - { - gnome_db_main_run (IntPtr.Zero, IntPtr.Zero); - } - - [DllImport("gnomedb-2")] - static extern void gnome_db_main_quit (); - - public static void Quit () - { - gnome_db_main_quit (); - } - } -} diff --git a/gnomedb/Editor.custom b/gnomedb/Editor.custom deleted file mode 100644 index 967666995..000000000 --- a/gnomedb/Editor.custom +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2005 Novell, Inc. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of version 2 of the Lesser GNU General -// Public License as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. - -[Obsolete ("Replaced by Test property.")] -public void SetText (string text) -{ - Text = text; -} diff --git a/gnomedb/GnomeDb.metadata b/gnomedb/GnomeDb.metadata deleted file mode 100644 index 47b2a1fd7..000000000 --- a/gnomedb/GnomeDb.metadata +++ /dev/null @@ -1,7 +0,0 @@ - - - 1 - StockManager - 1 - 1 - diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am deleted file mode 100644 index 55d3e904e..000000000 --- a/gnomedb/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -if ENABLE_GNOMEDB -pkg = gnomedb -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gnomedb-sharp-2.0.pc -else -pkg = -APIS = -endif -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml ../gnome/gnome-api.xml ../gda/gda-api.xml -METADATA = GnomeDb.metadata -SYMBOLS = -references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll ../gnome/gnome-sharp.dll ../gda/gda-sharp.dll - -sources = \ - Application.cs - -customs = \ - Editor.custom - -add_dist = gnomedb-sharp-2.0.pc.in - -include ../Makefile.include - diff --git a/gnomedb/gnomedb-api.raw b/gnomedb/gnomedb-api.raw deleted file mode 100644 index 08fd8a943..000000000 --- a/gnomedb/gnomedb-api.raw +++ /dev/null @@ -1,1348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gnomedb/gnomedb-sharp-2.0.pc.in b/gnomedb/gnomedb-sharp-2.0.pc.in deleted file mode 100644 index ce519b767..000000000 --- a/gnomedb/gnomedb-sharp-2.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -gapidir=${prefix}/share/gapi-2.0 - - -Name: GnomeDB# -Description: GnomeDB# - GNOMEDB .NET Binding -Version: @VERSION@ -Cflags: -I:${gapidir}/gnomedb-api.xml -Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnomedb-sharp.dll diff --git a/gnomedb/gnomedb-sharp.dll.config.in b/gnomedb/gnomedb-sharp.dll.config.in deleted file mode 100644 index 38d6eb598..000000000 --- a/gnomedb/gnomedb-sharp.dll.config.in +++ /dev/null @@ -1,4 +0,0 @@ - - - -