From b71dfc3f33f7da167833442bb2ed4174dea98843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Mon, 15 Dec 2008 20:54:51 +0000 Subject: Fix unique_app_new* bindings, patch by Michael Terry, fixes bug 564064 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-12-15 Jürg Billeter * 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 --- ChangeLog | 9 ++++ vapi/gdk-x11-2.0.deps | 1 + vapi/gnome-desktop-2.0.deps | 1 + vapi/goocanvas.deps | 2 + vapi/gtksourceview-2.0.deps | 1 + vapi/hildon-1.deps | 1 + vapi/hildon-fm-2.deps | 1 + vapi/libglade-2.0.deps | 1 + vapi/libgnomeui-2.0.deps | 1 + vapi/libnotify.deps | 1 + vapi/libsexy.deps | 1 + vapi/libwnck-1.0.deps | 1 + vapi/packages/unique-1.0/unique-1.0.deps | 5 ++ vapi/packages/unique-1.0/unique-1.0.metadata | 2 + vapi/unique-1.0.deps | 5 ++ vapi/unique-1.0.vapi | 79 +++++++++++++++------------- vapi/webkit-1.0.deps | 1 + 17 files changed, 75 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fe528a4f..3559b084c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-12-15 Jürg Billeter + + * 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 * vapi/packages/gio-2.0/: diff --git a/vapi/gdk-x11-2.0.deps b/vapi/gdk-x11-2.0.deps index 1949a4ec1..5fb9885d4 100644 --- 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 57ed9cf58..b8b446821 100644 --- 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 f0cf8af53..236d3fa5d 100644 --- 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 96053965b..54c46b1ba 100644 --- 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 449f66cea..277620623 100644 --- 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 f290c4cc1..1bc6b0778 100644 --- 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 96053965b..54c46b1ba 100644 --- 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 687dfd6b6..41aac69e1 100644 --- 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 96053965b..54c46b1ba 100644 --- 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 331f51479..477cc3abc 100644 --- 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 96053965b..54c46b1ba 100644 --- 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 ed3fb6d14..b7ba8435c 100644 --- 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 9087fa10e..59ee4453e 100644 --- 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 ed3fb6d14..b7ba8435c 100644 --- 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 ed02dffff..857ebea3d 100644 --- 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 abadb70a5..4dc3754e6 100644 --- 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 -- cgit v1.2.1