GNOME.org
 

[f-spot] update to latest gtk#beans

commit fd53d3c8c26aede92cce0aa64cfb27863753ff06
Author: Stephane Delcroix <stephane delcroix org>
Date:   Mon Aug 31 20:49:42 2009 +0200

    update to latest gtk#beans

 lib/gtk-sharp-beans/.gitignore        |    1 +
 lib/gtk-sharp-beans/Gtk.metadata      |    4 +-
 lib/gtk-sharp-beans/GtkBeans.metadata |    6 ++
 lib/gtk-sharp-beans/Makefile.am       |   14 +++-
 lib/gtk-sharp-beans/gtk-api.raw       |  136 +++++---------------------------
 lib/gtk-sharp-beans/gtkbeans-api.raw  |  138 +++++++++++++++++++++++++++++++++
 6 files changed, 180 insertions(+), 119 deletions(-)
---
diff --git a/lib/gtk-sharp-beans/.gitignore b/lib/gtk-sharp-beans/.gitignore
index 238a8cc..c218419 100644
--- a/lib/gtk-sharp-beans/.gitignore
+++ b/lib/gtk-sharp-beans/.gitignore
@@ -3,6 +3,7 @@ Makefile.in
 fetch
 gtk_generated
 gtk-api.xml
+gtkbeans-api.xml
 gtk-sharp-beans.dll
 gtk-sharp-beans.dll.mdb
 gtk-sharp-beans.snk
diff --git a/lib/gtk-sharp-beans/Gtk.metadata b/lib/gtk-sharp-beans/Gtk.metadata
index 0bdc265..389de6b 100644
--- a/lib/gtk-sharp-beans/Gtk.metadata
+++ b/lib/gtk-sharp-beans/Gtk.metadata
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <attr path="/api/namespace/object[ cname='GtkBuilder']" name="name">Builder</attr>
-  <attr path="/api/namespace/enum[ cname='GtkBuilderError']" name="name">BuilderError</attr>
-  <attr path="/api/namespace/callback[ cname='GtkBuilderConnectFunc']" name="name">BuilderConnectFunc</attr>
+  <attr path="/api/namespace/object[ cname='GtkMountOperation']/method[ name='IsShowing']" name="name">GetIsShowing</attr>
 </metadata>
diff --git a/lib/gtk-sharp-beans/GtkBeans.metadata b/lib/gtk-sharp-beans/GtkBeans.metadata
new file mode 100644
index 0000000..0bdc265
--- /dev/null
+++ b/lib/gtk-sharp-beans/GtkBeans.metadata
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<metadata>
+  <attr path="/api/namespace/object[ cname='GtkBuilder']" name="name">Builder</attr>
+  <attr path="/api/namespace/enum[ cname='GtkBuilderError']" name="name">BuilderError</attr>
+  <attr path="/api/namespace/callback[ cname='GtkBuilderConnectFunc']" name="name">BuilderConnectFunc</attr>
+</metadata>
diff --git a/lib/gtk-sharp-beans/Makefile.am b/lib/gtk-sharp-beans/Makefile.am
index 704bf17..d1461d2 100644
--- a/lib/gtk-sharp-beans/Makefile.am
+++ b/lib/gtk-sharp-beans/Makefile.am
@@ -28,15 +28,22 @@ SNK = snk
 
 all: gtk-sharp-beans.dll
 
+gtkbeans-api.xml: $(srcdir)/gtkbeans-api.raw $(srcdir)/GtkBeans.metadata
+	@echo -e "\n*** Massaging the raw api into $@"
+	cp $(srcdir)/gtkbeans-api.raw gtkbeans-api.xml
+	chmod +w gtkbeans-api.xml
+	$(GAPI2FIXUP) --api=gtkbeans-api.xml --metadata=$(srcdir)/GtkBeans.metadata
+
 gtk-api.xml: $(srcdir)/gtk-api.raw $(srcdir)/Gtk.metadata
 	@echo -e "\n*** Massaging the raw api into $@"
 	cp $(srcdir)/gtk-api.raw gtk-api.xml
 	chmod +w gtk-api.xml
 	$(GAPI2FIXUP) --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
 
-gtk_generated/Builder.cs: gtk-api.xml $(GTK_CUSTOMS)
+gtk_generated/Builder.cs: gtk-api.xml gtkbeans-api.xml $(GTK_CUSTOMS)
 	@echo -e "\n*** Generating C# code"
-	$(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
+	$(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtkbeans-api.xml
+	$(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) $(GTKSHARP_CFLAGS) -I:$(top_builddir)/lib/gio-sharp/gio/gio-api.xml --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
 
 gtk-sharp-beans.snk: $(SNK)
 	cp $< $@
@@ -48,6 +55,7 @@ gtk-sharp-beans.dll: gtk_generated/Builder.cs $(SRCS) gtk-sharp-beans.snk
 CLEANFILES = 			\
 	gtk-sharp-beans.dll 	\
 	gtk-sharp-beans.dll.mdb \
+	gtkbeans-api.xml	\
 	gtk-api.xml
 
 DISTCLEANFILES =		\
@@ -75,11 +83,13 @@ fetch:
 update:
 	cp	fetch/*.cs			\
 		fetch/gtk-api.raw		\
+		fetch/gtkbeans-api.raw		\
 		fetch/Gdk.Sources/*.cs		\
 		fetch/GLib.Sources/*.cs		\
 		fetch/Gtk.Customs/*.custom	\
 		fetch/Gtk.Sources/*.cs		\
 		fetch/Gtk.metadata		\
+		fetch/GtkBeans.metadata		\
 		.
 
 .PHONY: fetch update
diff --git a/lib/gtk-sharp-beans/gtk-api.raw b/lib/gtk-sharp-beans/gtk-api.raw
index 498c8bd..847f673 100644
--- a/lib/gtk-sharp-beans/gtk-api.raw
+++ b/lib/gtk-sharp-beans/gtk-api.raw
@@ -6,131 +6,39 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="GtkBeans" library="libgtk-win32-2.0-0.dll">
-    <enum name="GtkBuilderError" cname="GtkBuilderError" type="enum">
-      <member cname="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" name="InvalidTypeFunction" />
-      <member cname="GTK_BUILDER_ERROR_UNHANDLED_TAG" name="UnhandledTag" />
-      <member cname="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" name="MissingAttribute" />
-      <member cname="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" name="InvalidAttribute" />
-      <member cname="GTK_BUILDER_ERROR_INVALID_TAG" name="InvalidTag" />
-      <member cname="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" name="MissingPropertyValue" />
-      <member cname="GTK_BUILDER_ERROR_INVALID_VALUE" name="InvalidValue" />
-      <member cname="GTK_BUILDER_ERROR_VERSION_MISMATCH" name="VersionMismatch" />
-    </enum>
-    <callback name="GtkBuilderConnectFunc" cname="GtkBuilderConnectFunc">
-      <return-type type="void" />
-      <parameters>
-        <parameter type="GtkBuilder*" name="builder" />
-        <parameter type="GObject*" name="object" />
-        <parameter type="const-gchar*" name="signal_name" />
-        <parameter type="const-gchar*" name="handler_name" />
-        <parameter type="GObject*" name="connect_object" />
-        <parameter type="GConnectFlags" name="flags" />
-        <parameter type="gpointer" name="user_data" />
-      </parameters>
-    </callback>
-    <object name="GtkBuilder" cname="GtkBuilder" parent="GObject">
-      <field name="GSEAL" cname="GSEAL (priv)" type="GtkBuilderPrivate*" />
-      <property name="TranslationDomain" cname="translation-domain" type="gchar*" readable="true" writeable="true" />
-      <virtual_method name="GetTypeFromName" cname="get_type_from_name">
+  <namespace name="Gtk" library="libgtk-win32-2.0-0.dll">
+    <object name="MountOperation" cname="GtkMountOperation" parent="GMountOperation">
+      <field name="Priv" cname="priv" type="GtkMountOperationPrivate*" />
+      <property name="Parent" cname="parent" type="GtkWindow" readable="true" writeable="true" />
+      <property name="IsShowing" cname="is-showing" type="gboolean" readable="true" />
+      <property name="Screen" cname="screen" type="GtkWindow" readable="true" writeable="true" />
+      <method name="GetParent" cname="gtk_mount_operation_get_parent">
+        <return-type type="GtkWindow*" />
+      </method>
+      <method name="GetScreen" cname="gtk_mount_operation_get_screen">
+        <return-type type="GdkScreen*" />
+      </method>
+      <method name="GetType" cname="gtk_mount_operation_get_type" shared="true">
         <return-type type="GType" />
-        <parameters>
-          <parameter type="GtkBuilder*" name="builder" />
-          <parameter type="const-char*" name="type_name" />
-        </parameters>
-      </virtual_method>
-      <method name="AddFromFile" cname="gtk_builder_add_from_file">
-        <return-type type="guint" />
-        <parameters>
-          <parameter type="const-gchar*" name="filename" />
-          <parameter type="GError**" name="error" />
-        </parameters>
       </method>
-      <method name="AddFromString" cname="gtk_builder_add_from_string">
-        <return-type type="guint" />
-        <parameters>
-          <parameter type="const-gchar*" name="buffer" />
-          <parameter type="gsize" name="length" />
-          <parameter type="GError**" name="error" />
-        </parameters>
-      </method>
-      <method name="AddObjectsFromFile" cname="gtk_builder_add_objects_from_file">
-        <return-type type="guint" />
-        <parameters>
-          <parameter type="const-gchar*" name="filename" />
-          <parameter type="gchar**" name="object_ids" />
-          <parameter type="GError**" name="error" />
-        </parameters>
+      <method name="IsShowing" cname="gtk_mount_operation_is_showing">
+        <return-type type="gboolean" />
       </method>
-      <method name="AddObjectsFromString" cname="gtk_builder_add_objects_from_string">
-        <return-type type="guint" />
+      <constructor cname="gtk_mount_operation_new">
         <parameters>
-          <parameter type="const-gchar*" name="buffer" />
-          <parameter type="gsize" name="length" />
-          <parameter type="gchar**" name="object_ids" />
-          <parameter type="GError**" name="error" />
+          <parameter type="GtkWindow*" name="parent" />
         </parameters>
-      </method>
-      <method name="ConnectSignals" cname="gtk_builder_connect_signals">
+      </constructor>
+      <method name="SetParent" cname="gtk_mount_operation_set_parent">
         <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="user_data" />
+          <parameter type="GtkWindow*" name="parent" />
         </parameters>
       </method>
-      <method name="ConnectSignalsFull" cname="gtk_builder_connect_signals_full">
+      <method name="SetScreen" cname="gtk_mount_operation_set_screen">
         <return-type type="void" />
         <parameters>
-          <parameter type="GtkBuilderConnectFunc" name="func" />
-          <parameter type="gpointer" name="user_data" />
-        </parameters>
-      </method>
-      <method name="ErrorQuark" cname="gtk_builder_error_quark" shared="true">
-        <return-type type="GQuark" />
-      </method>
-      <method name="GetObject" cname="gtk_builder_get_object">
-        <return-type type="GObject*" />
-        <parameters>
-          <parameter type="const-gchar*" name="name" />
-        </parameters>
-      </method>
-      <method name="GetObjects" cname="gtk_builder_get_objects">
-        <return-type type="GSList*" />
-      </method>
-      <method name="GetTranslationDomain" cname="gtk_builder_get_translation_domain">
-        <return-type type="const-gchar*" />
-      </method>
-      <method name="GetType" cname="gtk_builder_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
-      <method name="GetTypeFromName" cname="gtk_builder_get_type_from_name">
-        <return-type type="GType" />
-        <parameters>
-          <parameter type="const-char*" name="type_name" />
-        </parameters>
-      </method>
-      <constructor cname="gtk_builder_new" />
-      <method name="SetTranslationDomain" cname="gtk_builder_set_translation_domain">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="const-gchar*" name="domain" />
-        </parameters>
-      </method>
-      <method name="ValueFromString" cname="gtk_builder_value_from_string">
-        <return-type type="gboolean" />
-        <parameters>
-          <parameter type="GParamSpec*" name="pspec" />
-          <parameter type="const-gchar*" name="string" />
-          <parameter type="GValue*" name="value" />
-          <parameter type="GError**" name="error" />
-        </parameters>
-      </method>
-      <method name="ValueFromStringType" cname="gtk_builder_value_from_string_type">
-        <return-type type="gboolean" />
-        <parameters>
-          <parameter type="GType" name="type" />
-          <parameter type="const-gchar*" name="string" />
-          <parameter type="GValue*" name="value" />
-          <parameter type="GError**" name="error" />
+          <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </method>
     </object>
diff --git a/lib/gtk-sharp-beans/gtkbeans-api.raw b/lib/gtk-sharp-beans/gtkbeans-api.raw
new file mode 100644
index 0000000..498c8bd
--- /dev/null
+++ b/lib/gtk-sharp-beans/gtkbeans-api.raw
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<api>
+  <!--
+
+        This file was automatically generated.
+        Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
+
+-->
+  <namespace name="GtkBeans" library="libgtk-win32-2.0-0.dll">
+    <enum name="GtkBuilderError" cname="GtkBuilderError" type="enum">
+      <member cname="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" name="InvalidTypeFunction" />
+      <member cname="GTK_BUILDER_ERROR_UNHANDLED_TAG" name="UnhandledTag" />
+      <member cname="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" name="MissingAttribute" />
+      <member cname="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" name="InvalidAttribute" />
+      <member cname="GTK_BUILDER_ERROR_INVALID_TAG" name="InvalidTag" />
+      <member cname="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" name="MissingPropertyValue" />
+      <member cname="GTK_BUILDER_ERROR_INVALID_VALUE" name="InvalidValue" />
+      <member cname="GTK_BUILDER_ERROR_VERSION_MISMATCH" name="VersionMismatch" />
+    </enum>
+    <callback name="GtkBuilderConnectFunc" cname="GtkBuilderConnectFunc">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GtkBuilder*" name="builder" />
+        <parameter type="GObject*" name="object" />
+        <parameter type="const-gchar*" name="signal_name" />
+        <parameter type="const-gchar*" name="handler_name" />
+        <parameter type="GObject*" name="connect_object" />
+        <parameter type="GConnectFlags" name="flags" />
+        <parameter type="gpointer" name="user_data" />
+      </parameters>
+    </callback>
+    <object name="GtkBuilder" cname="GtkBuilder" parent="GObject">
+      <field name="GSEAL" cname="GSEAL (priv)" type="GtkBuilderPrivate*" />
+      <property name="TranslationDomain" cname="translation-domain" type="gchar*" readable="true" writeable="true" />
+      <virtual_method name="GetTypeFromName" cname="get_type_from_name">
+        <return-type type="GType" />
+        <parameters>
+          <parameter type="GtkBuilder*" name="builder" />
+          <parameter type="const-char*" name="type_name" />
+        </parameters>
+      </virtual_method>
+      <method name="AddFromFile" cname="gtk_builder_add_from_file">
+        <return-type type="guint" />
+        <parameters>
+          <parameter type="const-gchar*" name="filename" />
+          <parameter type="GError**" name="error" />
+        </parameters>
+      </method>
+      <method name="AddFromString" cname="gtk_builder_add_from_string">
+        <return-type type="guint" />
+        <parameters>
+          <parameter type="const-gchar*" name="buffer" />
+          <parameter type="gsize" name="length" />
+          <parameter type="GError**" name="error" />
+        </parameters>
+      </method>
+      <method name="AddObjectsFromFile" cname="gtk_builder_add_objects_from_file">
+        <return-type type="guint" />
+        <parameters>
+          <parameter type="const-gchar*" name="filename" />
+          <parameter type="gchar**" name="object_ids" />
+          <parameter type="GError**" name="error" />
+        </parameters>
+      </method>
+      <method name="AddObjectsFromString" cname="gtk_builder_add_objects_from_string">
+        <return-type type="guint" />
+        <parameters>
+          <parameter type="const-gchar*" name="buffer" />
+          <parameter type="gsize" name="length" />
+          <parameter type="gchar**" name="object_ids" />
+          <parameter type="GError**" name="error" />
+        </parameters>
+      </method>
+      <method name="ConnectSignals" cname="gtk_builder_connect_signals">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gpointer" name="user_data" />
+        </parameters>
+      </method>
+      <method name="ConnectSignalsFull" cname="gtk_builder_connect_signals_full">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkBuilderConnectFunc" name="func" />
+          <parameter type="gpointer" name="user_data" />
+        </parameters>
+      </method>
+      <method name="ErrorQuark" cname="gtk_builder_error_quark" shared="true">
+        <return-type type="GQuark" />
+      </method>
+      <method name="GetObject" cname="gtk_builder_get_object">
+        <return-type type="GObject*" />
+        <parameters>
+          <parameter type="const-gchar*" name="name" />
+        </parameters>
+      </method>
+      <method name="GetObjects" cname="gtk_builder_get_objects">
+        <return-type type="GSList*" />
+      </method>
+      <method name="GetTranslationDomain" cname="gtk_builder_get_translation_domain">
+        <return-type type="const-gchar*" />
+      </method>
+      <method name="GetType" cname="gtk_builder_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="GetTypeFromName" cname="gtk_builder_get_type_from_name">
+        <return-type type="GType" />
+        <parameters>
+          <parameter type="const-char*" name="type_name" />
+        </parameters>
+      </method>
+      <constructor cname="gtk_builder_new" />
+      <method name="SetTranslationDomain" cname="gtk_builder_set_translation_domain">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="domain" />
+        </parameters>
+      </method>
+      <method name="ValueFromString" cname="gtk_builder_value_from_string">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="GParamSpec*" name="pspec" />
+          <parameter type="const-gchar*" name="string" />
+          <parameter type="GValue*" name="value" />
+          <parameter type="GError**" name="error" />
+        </parameters>
+      </method>
+      <method name="ValueFromStringType" cname="gtk_builder_value_from_string_type">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="GType" name="type" />
+          <parameter type="const-gchar*" name="string" />
+          <parameter type="GValue*" name="value" />
+          <parameter type="GError**" name="error" />
+        </parameters>
+      </method>
+    </object>
+  </namespace>
+</api>
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]