From c6d0586a4434565922a87b6df6fc0cde1feeb10b Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sat, 13 Nov 2004 05:25:21 +0000 Subject: [PATCH] 2004-11-13 Mike Kestner * sources/gda.patch : fix broken signal defs. * sources/gnomedb.patch : fix broken signal defs. * sources/Makefile.am : apply new patches, and dist some others. svn path=/trunk/gtk-sharp/; revision=36087 --- ChangeLog | 6 ++++++ sources/Makefile.am | 6 ++++++ sources/gda.patch | 15 +++++++++++++++ sources/gnomedb.patch | 11 +++++++++++ 4 files changed, 38 insertions(+) create mode 100644 sources/gda.patch create mode 100644 sources/gnomedb.patch diff --git a/ChangeLog b/ChangeLog index e3e14c4b5..16d383bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-13 Mike Kestner + + * sources/gda.patch : fix broken signal defs. + * sources/gnomedb.patch : fix broken signal defs. + * sources/Makefile.am : apply new patches, and dist some others. + 2004-11-12 Mike Kestner * parser/gapi_pp.pl : fix multi-line extern parsing. diff --git a/sources/Makefile.am b/sources/Makefile.am index ae9e344ca..99eb71ad9 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -1,6 +1,10 @@ EXTRA_DIST = \ README \ gtk-sharp-sources.xml \ + gda.patch \ + gnomedb.patch \ + atkhyperlink.patch \ + gtk_tree_model_signal_fix.patch \ gtkhtml-font-style-enum.patch @@ -47,3 +51,5 @@ get-source-code: get-gtkhtml-code ln -f -s gtkfilechooserprivate.h gtk+-2.4.1/gtk/gtkfilechooserpriv.h patch -p0 atk-1.6.0/atk/atkhyperlink.h < atkhyperlink.patch patch -p0 gtk+-2.4.1/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch + patch -p0 libgnomedb-1.0.0/libgnomedb/gnome-db-list.c < gnomedb.patch + patch -p0 libgda-1.0.0/libgda/gda-export.c < gda.patch diff --git a/sources/gda.patch b/sources/gda.patch new file mode 100644 index 000000000..c4234a0bc --- /dev/null +++ b/sources/gda.patch @@ -0,0 +1,15 @@ +--- gda-export.c 2004-11-13 00:25:44.396760885 -0600 ++++ libgda-1.0.0/libgda/gda-export.c 2004-11-13 00:23:58.405595352 -0600 +@@ -213,10 +213,10 @@ + G_TYPE_NONE, 2, + G_TYPE_INT, G_TYPE_STRING); + gda_export_signals[CANCELLED] = +- g_signal_new ("finished", ++ g_signal_new ("cancelled", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, +- G_STRUCT_OFFSET (GdaExportClass, finished), ++ G_STRUCT_OFFSET (GdaExportClass, cancelled), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); diff --git a/sources/gnomedb.patch b/sources/gnomedb.patch new file mode 100644 index 000000000..a6430284e --- /dev/null +++ b/sources/gnomedb.patch @@ -0,0 +1,11 @@ +--- gnome-db-list.c 2004-11-13 00:01:42.391981026 -0600 ++++ libgnomedb-1.0.0/libgnomedb/gnome-db-list.c 2004-11-13 00:02:10.172354404 -0600 +@@ -111,7 +111,7 @@ + g_signal_new ("selection_cleared", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, +- G_STRUCT_OFFSET (GnomeDbGridClass, row_selected), ++ G_STRUCT_OFFSET (GnomeDbGridClass, selection_cleared), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0);