From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 6 Apr 2011 20:34:32 +0000 (+0200)
Subject: libgda-4.0, gedit-2.20: Fix gedit typo and GdaXaTransactionId.data
X-Git-Tag: 0.12.1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e14a9fa7e0da9822aa26fdec0726e0f1ffe729;p=thirdparty%2Fvala.git

libgda-4.0, gedit-2.20: Fix gedit typo and GdaXaTransactionId.data

Fixes bug 627035.
---

diff --git a/vapi/gedit-2.20.vapi b/vapi/gedit-2.20.vapi
index da0438bde..ee5a318be 100644
--- a/vapi/gedit-2.20.vapi
+++ b/vapi/gedit-2.20.vapi
@@ -195,7 +195,7 @@ namespace Gedit {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Statusbar ();
 		public void clear_overwrite ();
-		public void flash_message (uint context_id, string format);
+		public void flash_message (uint context_id, string format, ...);
 		public void set_cursor_position (int line, int col);
 		public void set_overwrite (bool overwrite);
 		public void set_window_state (Gedit.WindowState state, int num_of_errors);
diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi
index e0068d238..53b6437dd 100644
--- a/vapi/libgda-4.0.vapi
+++ b/vapi/libgda-4.0.vapi
@@ -1471,7 +1471,7 @@ namespace Gda {
 	public class XaTransactionId {
 		public ushort bqual_length;
 		[CCode (array_length = false)]
-		public weak GLib.ObjectPath[] data;
+		public uint8[] data;
 		public uint32 format;
 		public ushort gtrid_length;
 		public unowned string to_string ();
diff --git a/vapi/packages/gedit-2.20/gedit-2.20.metadata b/vapi/packages/gedit-2.20/gedit-2.20.metadata
index 6364ae929..f830ffe07 100644
--- a/vapi/packages/gedit-2.20/gedit-2.20.metadata
+++ b/vapi/packages/gedit-2.20/gedit-2.20.metadata
@@ -22,7 +22,7 @@ gedit_document_get_uri transfer_ownership="1"
 
 #Encoding
 #in realta' 
-GeditEncoding  base_class="GObject" cheader_filename="gedit/gedit-encodings.h"
+GeditEncoding base_class="GObject" cheader_filename="gedit/gedit-encodings.h"
 
 #EncodingsOptionMenu
 GeditEncodingsOptionMenu  base_class="GObject" cheader_filename="gedit/gedit-encodings-option-menu.h"
@@ -49,7 +49,7 @@ GeditProgressMessageArea base_class="GtkInfoBar" cheader_filename="gedit/gedit-p
 
 #Statusbar
 GeditStatusbar base_class="GtkStatusbar" cheader_filename="gedit/gedit-statusbar.h"
-gedit_statusbar_flash_message cheader_filename="gedit/gedit-statusbar.h" ellypsis="1"
+gedit_statusbar_flash_message cheader_filename="gedit/gedit-statusbar.h" ellipsis="1"
 
 #Tab
 GeditTab base_class="GtkVBox" cheader_filename="gedit/gedit-tab.h"
diff --git a/vapi/packages/libgda-4.0/libgda-4.0.metadata b/vapi/packages/libgda-4.0/libgda-4.0.metadata
index 2216ac965..40160307b 100644
--- a/vapi/packages/libgda-4.0/libgda-4.0.metadata
+++ b/vapi/packages/libgda-4.0/libgda-4.0.metadata
@@ -67,5 +67,6 @@ gda_data_model_get_value_at transfer_ownership="0" nullable="1"
 gda_data_model_iter_get_value_at transfer_ownership="0" nullable="1"
 gda_data_model_iter_get_value_for_field transfer_ownership="0" nullable="1"
 GdaDsnInfo is_value_type="1"
+GdaXaTransactionId.data type_name="uint8[]"
 gda_xa_transaction_commit.cnc_to_recover is_out="1" transfer_ownership="1" type_arguments="Connection"
 gda_xa_transaction_commit_recovered.cnc_to_recover is_out="1" transfer_ownership="1" type_arguments="Connection"