bind Gtk.MountOperation

split the gtk/gtkbeans build in 2 parts, keep gtkbeans for Builder (or stuffs that are already -but broken- in gtk#) and gtk for new ones.
2009-08-31 20:08:18 +02:00 · 2009-08-31 20:08:18 +02:00 · 7de372a665
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,4 @@ Makefile.in
 /autom4te.cache
 /gtk_generated
 /gtk-api.xml
+/gtkbeans-api.xml
--- a/Gtk.metadata
+++ b/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>
--- a/GtkBeans.metadata
+++ b/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>
--- a/Makefile.am
+++ b/Makefile.am
@ -42,9 +42,16 @@ gtk-api.xml: $(srcdir)/gtk-api.raw $(srcdir)/Gtk.metadata
 	chmod +w $(builddir)/gtk-api.xml
 	gapi2-fixup --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata

-gtk_generated/Builder.cs: gtk-api.xml $(GTK_CUSTOMS)
+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 $(builddir)/gtkbeans-api.xml
+	gapi2-fixup --api=gtkbeans-api.xml --metadata=$(srcdir)/GtkBeans.metadata
+
+gtk_generated/Builder.cs: gtk-api.xml gtkbeans-api.xml $(GTK_CUSTOMS)
 	@echo -e "\n*** Generating C# code"
-	gapi2-codegen $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir)/Gtk.Customs --generate gtk-api.xml
+	gapi2-codegen $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir)/Gtk.Customs --generate gtkbeans-api.xml
+	gapi2-codegen $(GLIBSHARP_CFLAGS) $(GTKSHARP_CFLAGS) $(GIOSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir)/Gtk.Customs --generate gtk-api.xml

 gtk-sharp-beans.dll: $(srcdir)/gtk_generated/Builder.cs $(SRCS)
 	@echo -e "\n*** Building $@"
--- a/gtk-api.raw
+++ b/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">
-        <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>
+  <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="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 name="GetScreen" cname="gtk_mount_operation_get_screen">
+        <return-type type="GdkScreen*" />
      </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">
+      <method name="GetType" cname="gtk_mount_operation_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">
+      <method name="IsShowing" cname="gtk_mount_operation_is_showing">
        <return-type type="gboolean" />
+      </method>
+      <constructor cname="gtk_mount_operation_new">
        <parameters>
-          <parameter type="GParamSpec*" name="pspec" />
-          <parameter type="const-gchar*" name="string" />
-          <parameter type="GValue*" name="value" />
-          <parameter type="GError**" name="error" />
+          <parameter type="GtkWindow*" name="parent" />
+        </parameters>
+      </constructor>
+      <method name="SetParent" cname="gtk_mount_operation_set_parent">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkWindow*" name="parent" />
        </parameters>
      </method>
-      <method name="ValueFromStringType" cname="gtk_builder_value_from_string_type">
-        <return-type type="gboolean" />
+      <method name="SetScreen" cname="gtk_mount_operation_set_screen">
+        <return-type type="void" />
        <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>
--- a/gtk-sharp-beans-2.0.pc.in
+++ b/gtk-sharp-beans-2.0.pc.in
@ -7,7 +7,7 @@ gapidir=${prefix}/share/gapi-2.0
 Name: Gtk#Beans
 Description: Gtk#Beans - Blings and API missing from Gtk#
 Version: @VERSION@
-Cflags: -I:${gapidir}/gio-api.xml
+Cflags: -I:${gapidir}/gtk-api.xml -I:$(gapidir)/gtkbeans-api.xml
 Libs: -r:${assemblies_dir}/gtk-sharp-beans.dll
 Requires: glib-sharp-2.0 gtk-sharp-2.0

--- a/gtkbeans-api.raw
+++ b/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>
--- a/sources/sources.xml
+++ b/sources/sources.xml
@ -1,5 +1,5 @@
 <gapi-parser-input>
-  <api filename="../gtk-api.raw">
+  <api filename="../gtkbeans-api.raw">
    <library name="libgtk-win32-2.0-0.dll">
      <namespace name="GtkBeans">
        <file>gtk+-2.14.7/gtk/gtkbuilder.h</file>
@ -7,4 +7,12 @@
      </namespace>
    </library>
  </api>
+  <api filename="../gtk-api.raw">
+    <library name="libgtk-win32-2.0-0.dll">
+      <namespace name="Gtk">
+	<file>gtk+-2.14.7/gtk/gtkmountoperation.h</file>
+	<file>gtk+-2.14.7/gtk/gtkmountoperation.c</file>
+      </namespace>
+    </library>
+  </api>
 </gapi-parser-input>