Fix unique_app_new* bindings, patch by Michael Terry, fixes bug 564064

2008-12-15  Jürg Billeter  <j@bitron.ch>

	* vapi/packages/unique-1.0/:

	Fix unique_app_new* bindings, patch by Michael Terry,
	fixes bug 564064

	* vapi/unique-1.0.vapi: regenerated

svn path=/trunk/; revision=2164

diff --git a/ChangeLog b/ChangeLog
index 5fe528a4f9954ae4569e4acdcaeaafb0b73477e0..3559b084c41baf18271b1d709bb999aa8bc27dbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-15  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/unique-1.0/:
+
+       Fix unique_app_new* bindings, patch by Michael Terry,
+       fixes bug 564064
+
+       * vapi/unique-1.0.vapi: regenerated
+
 2008-12-15  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gio-2.0/:

diff --git a/vapi/gdk-x11-2.0.deps b/vapi/gdk-x11-2.0.deps
index 1949a4ec1acff4d27f8de9edca86016dca6e4816..5fb9885d4286a24293375ca1f739b0c9327f9648 100644 (file)
--- a/vapi/gdk-x11-2.0.deps
+++ b/vapi/gdk-x11-2.0.deps
@@ -1,3 +1,4 @@
+gio-2.0
 gdk-2.0
 gdk-pixbuf-2.0
 cairo

diff --git a/vapi/gnome-desktop-2.0.deps b/vapi/gnome-desktop-2.0.deps
index 57ed9cf587a35755bc5f60b5c66f1254715e5efe..b8b44682110df6e219d3e97debf37f6da8515750 100644 (file)
--- a/vapi/gnome-desktop-2.0.deps
+++ b/vapi/gnome-desktop-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/goocanvas.deps b/vapi/goocanvas.deps
index f0cf8af53af24452eab0806c5889b857841b3275..236d3fa5dbf862a49b01f2bf60aff787c44e075a 100644 (file)
--- a/vapi/goocanvas.deps
+++ b/vapi/goocanvas.deps
@@ -2,5 +2,7 @@ atk
 cairo
 pango
 gdk-2.0
+gio-2.0
 gtk+-2.0
 gdk-pixbuf-2.0
+

diff --git a/vapi/gtksourceview-2.0.deps b/vapi/gtksourceview-2.0.deps
index 96053965be265a0d422301095cbfe24a1cbe7249..54c46b1bad934978cdbfedc97fe1b806ce0f804f 100644 (file)
--- a/vapi/gtksourceview-2.0.deps
+++ b/vapi/gtksourceview-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/hildon-1.deps b/vapi/hildon-1.deps
index 449f66ceaeeed011f49329a31744e520a80aca76..277620623973d7c62d681fe78bf13e4ba3363722 100644 (file)
--- a/vapi/hildon-1.deps
+++ b/vapi/hildon-1.deps
@@ -1,4 +1,5 @@
 gtk+-2.0
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/hildon-fm-2.deps b/vapi/hildon-fm-2.deps
index f290c4cc1b891f7aa0bc096a7f6cb84e2f0f0fd0..1bc6b0778f9fd1912924ff50753ab9fe9c936eb6 100644 (file)
--- a/vapi/hildon-fm-2.deps
+++ b/vapi/hildon-fm-2.deps
@@ -1,4 +1,5 @@
 atk
+gio-2.0
 gdk-2.0
 gdk-pixbuf-2.0
 gtk+-2.0

diff --git a/vapi/libglade-2.0.deps b/vapi/libglade-2.0.deps
index 96053965be265a0d422301095cbfe24a1cbe7249..54c46b1bad934978cdbfedc97fe1b806ce0f804f 100644 (file)
--- a/vapi/libglade-2.0.deps
+++ b/vapi/libglade-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/libgnomeui-2.0.deps b/vapi/libgnomeui-2.0.deps
index 687dfd6b663b30a9364c0ce47c379fadf22debd9..41aac69e1f6d69c15b38d3b279698ddba8083850 100644 (file)
--- a/vapi/libgnomeui-2.0.deps
+++ b/vapi/libgnomeui-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/libnotify.deps b/vapi/libnotify.deps
index 96053965be265a0d422301095cbfe24a1cbe7249..54c46b1bad934978cdbfedc97fe1b806ce0f804f 100644 (file)
--- a/vapi/libnotify.deps
+++ b/vapi/libnotify.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/libsexy.deps b/vapi/libsexy.deps
index 331f51479bfcd7f25daac759e3586905c78ced12..477cc3abc0892468fb9da648e1a2f92a18a83848 100644 (file)
--- a/vapi/libsexy.deps
+++ b/vapi/libsexy.deps
@@ -1,3 +1,4 @@
+gio-2.0
 gtk+-2.0
 atk
 cairo

diff --git a/vapi/libwnck-1.0.deps b/vapi/libwnck-1.0.deps
index 96053965be265a0d422301095cbfe24a1cbe7249..54c46b1bad934978cdbfedc97fe1b806ce0f804f 100644 (file)
--- a/vapi/libwnck-1.0.deps
+++ b/vapi/libwnck-1.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

diff --git a/vapi/packages/unique-1.0/unique-1.0.deps b/vapi/packages/unique-1.0/unique-1.0.deps
index ed3fb6d146f12b7bc58c879aa4590cccfb4270bf..b7ba8435c08b0a864d50ff75fa0f2beb35162590 100644 (file)
--- a/vapi/packages/unique-1.0/unique-1.0.deps
+++ b/vapi/packages/unique-1.0/unique-1.0.deps
@@ -1,3 +1,8 @@
+gio-2.0
+cairo
+atk
+pango
 gdk-2.0
+gdk-pixbuf-2.0
 gtk+-2.0
 

diff --git a/vapi/packages/unique-1.0/unique-1.0.metadata b/vapi/packages/unique-1.0/unique-1.0.metadata
index 9087fa10e014f1469e058388ea707dc17ae2687a..59ee4453efe60491241789adeff766cba453ef3e 100644 (file)
--- a/vapi/packages/unique-1.0/unique-1.0.metadata
+++ b/vapi/packages/unique-1.0/unique-1.0.metadata
@@ -1,5 +1,7 @@
 Unique cheader_filename="unique/unique.h"
 unique_app_is_running hidden="1"
+unique_app_new.startup_id nullable="1"
+unique_app_new_with_commands.startup_id nullable="1"
 unique_app_send_message.message_data nullable="1"
 unique_message_data_copy transfer_ownership="1"
 unique_message_data_set.data nullable="1"

diff --git a/vapi/unique-1.0.deps b/vapi/unique-1.0.deps
index ed3fb6d146f12b7bc58c879aa4590cccfb4270bf..b7ba8435c08b0a864d50ff75fa0f2beb35162590 100644 (file)
--- a/vapi/unique-1.0.deps
+++ b/vapi/unique-1.0.deps
@@ -1,3 +1,8 @@
+gio-2.0
+cairo
+atk
+pango
 gdk-2.0
+gdk-pixbuf-2.0
 gtk+-2.0
 

diff --git a/vapi/unique-1.0.vapi b/vapi/unique-1.0.vapi
index ed02dffffe6817490370cfac6e4b58677a2501ac..857ebea3db12b18c9af2a0004afdfa2f0e758f90 100644 (file)
--- a/vapi/unique-1.0.vapi
+++ b/vapi/unique-1.0.vapi
@@ -1,45 +1,16 @@
-/* unique-1.0.vapi generated by vapigen, do not modify. */
+/* unique-1.0.vapi generated by lt-vapigen, do not modify. */
 
 [CCode (cprefix = "Unique", lower_case_cprefix = "unique_")]
 namespace Unique {
-       [CCode (cprefix = "UNIQUE_", has_type_id = "0", cheader_filename = "unique/unique.h")]
-       public enum Command {
-               INVALID,
-               ACTIVATE,
-               NEW,
-               OPEN,
-               CLOSE
-       }
-       [CCode (cprefix = "UNIQUE_RESPONSE_", has_type_id = "0", cheader_filename = "unique/unique.h")]
-       public enum Response {
-               INVALID,
-               OK,
-               CANCEL,
-               FAIL
-       }
-       [Compact]
-       [CCode (copy_function = "unique_message_data_copy", cheader_filename = "unique/unique.h")]
-       public class MessageData {
-               public Unique.MessageData copy ();
-               public weak Gdk.Screen get_screen ();
-               public weak string get_startup_id ();
-               public string get_text ();
-               [NoArrayLength]
-               public string[] get_uris ();
-               public uint get_workspace ();
-               public MessageData ();
-               public void set (uchar[] data, ulong length);
-               public bool set_text (string str, long length);
-               [NoArrayLength]
-               public bool set_uris (string[] uris);
-       }
        [CCode (cheader_filename = "unique/unique.h")]
        public class App : GLib.Object {
                public void add_command (string command_name, int command_id);
-               public App (string name, string startup_id);
-               public App.with_commands (string name, string startup_id, ...);
+               [CCode (has_construct_function = false)]
+               public App (string name, string? startup_id);
                public Unique.Response send_message (int command_id, Unique.MessageData? message_data);
                public void watch_window (Gtk.Window window);
+               [CCode (has_construct_function = false)]
+               public App.with_commands (string name, string? startup_id, ...);
                [NoAccessorMethod]
                public bool is_running { get; }
                [NoAccessorMethod]
@@ -52,21 +23,53 @@ namespace Unique {
        }
        [CCode (cheader_filename = "unique/unique.h")]
        public class Backend : GLib.Object {
-               public weak Unique.App parent;
                public weak string name;
-               public weak string startup_id;
+               public weak Unique.App parent;
                public weak Gdk.Screen screen;
+               public weak string startup_id;
                public uint workspace;
                public static weak Unique.Backend create ();
                public weak string get_name ();
                public weak Gdk.Screen get_screen ();
                public weak string get_startup_id ();
                public uint get_workspace ();
+               public virtual bool request_name ();
+               public virtual Unique.Response send_message (int command_id, Unique.MessageData message_data, uint time_);
                public void set_name (string name);
                public void set_screen (Gdk.Screen screen);
                public void set_startup_id (string startup_id);
-               public virtual bool request_name ();
-               public virtual Unique.Response send_message (int command_id, Unique.MessageData message_data, uint time_);
+       }
+       [Compact]
+       [CCode (copy_function = "unique_message_data_copy", cheader_filename = "unique/unique.h")]
+       public class MessageData {
+               public Unique.MessageData copy ();
+               public weak Gdk.Screen get_screen ();
+               public weak string get_startup_id ();
+               public string get_text ();
+               [NoArrayLength]
+               public string[] get_uris ();
+               public uint get_workspace ();
+               [CCode (has_construct_function = false)]
+               public MessageData ();
+               public void set (uchar[]? data, size_t length);
+               public bool set_text (string str, ssize_t length);
+               [NoArrayLength]
+               public bool set_uris (string[] uris);
+       }
+       [CCode (cprefix = "UNIQUE_", has_type_id = "0", cheader_filename = "unique/unique.h")]
+       public enum Command {
+               INVALID,
+               ACTIVATE,
+               NEW,
+               OPEN,
+               CLOSE
+       }
+       [CCode (cprefix = "UNIQUE_RESPONSE_", has_type_id = "0", cheader_filename = "unique/unique.h")]
+       public enum Response {
+               INVALID,
+               OK,
+               CANCEL,
+               FAIL
        }
        [CCode (cheader_filename = "unique/unique.h")]
        public const string API_VERSION_S;

diff --git a/vapi/webkit-1.0.deps b/vapi/webkit-1.0.deps
index abadb70a59e868e08c15aafee5c09857cd2e4622..4dc3754e6566a274259fe8e0908c322d360903ab 100644 (file)
--- a/vapi/webkit-1.0.deps
+++ b/vapi/webkit-1.0.deps
@@ -1,4 +1,5 @@
 atk
+gio-2.0
 cairo
 pango
 gdk-pixbuf-2.0