From: Frederik Zipp Date: Thu, 22 Jul 2010 18:41:06 +0000 (-0700) Subject: clutter-1.0: Fix methods with owned delegate parameters. X-Git-Tag: 0.9.4~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ba4e57b02eadc32ae77073bf0bff68b7d1826b0;p=thirdparty%2Fvala.git clutter-1.0: Fix methods with owned delegate parameters. --- diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi index e140e495c..2a7424002 100644 --- a/vapi/clutter-1.0.vapi +++ b/vapi/clutter-1.0.vapi @@ -7,7 +7,7 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h")] public static uint add (uint fps, GLib.SourceFunc func); [CCode (cheader_filename = "clutter/clutter.h")] - public static uint add_full (int priority, uint fps, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, uint fps, owned GLib.SourceFunc func); } [CCode (cprefix = "ClutterThreads", lower_case_cprefix = "clutter_threads_")] namespace Threads { @@ -16,21 +16,21 @@ namespace Clutter { [CCode (cname = "clutter_threads_add_frame_source", cheader_filename = "clutter/clutter.h")] public static uint add (uint fps, GLib.SourceFunc func); [CCode (cname = "clutter_threads_add_frame_source_full", cheader_filename = "clutter/clutter.h")] - public static uint add_full (int priority, uint fps, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, uint fps, owned GLib.SourceFunc func); } [CCode (cprefix = "ClutterThreadsIdle", lower_case_cprefix = "clutter_threads_idle_")] namespace Idle { [CCode (cname = "clutter_threads_add_idle", cheader_filename = "clutter/clutter.h")] public static uint add (GLib.SourceFunc func); [CCode (cname = "clutter_threads_add_idle_full", cheader_filename = "clutter/clutter.h")] - public static uint add_full (int priority, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, owned GLib.SourceFunc func); } [CCode (cprefix = "ClutterThreadsTimeout", lower_case_cprefix = "clutter_threads_timeout_")] namespace Timeout { [CCode (cname = "clutter_threads_add_timeout", cheader_filename = "clutter/clutter.h")] public static uint add (uint interval, GLib.SourceFunc func); [CCode (cname = "clutter_threads_add_timeout_full", cheader_filename = "clutter/clutter.h")] - public static uint add_full (int priority, uint interval, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func); } [CCode (cheader_filename = "clutter/clutter.h")] public static void enter (); diff --git a/vapi/packages/clutter-1.0/clutter-1.0-custom.vala b/vapi/packages/clutter-1.0/clutter-1.0-custom.vala index 42c2ad2eb..c894effe2 100644 --- a/vapi/packages/clutter-1.0/clutter-1.0-custom.vala +++ b/vapi/packages/clutter-1.0/clutter-1.0-custom.vala @@ -52,7 +52,7 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h")] namespace FrameSource { public static uint add (uint fps, GLib.SourceFunc func); - public static uint add_full (int priority, uint fps, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, uint fps, owned GLib.SourceFunc func); } public class InputDevice { @@ -103,7 +103,7 @@ namespace Clutter { [CCode (cname = "clutter_threads_add_frame_source")] public static uint add (uint fps, GLib.SourceFunc func); [CCode (cname = "clutter_threads_add_frame_source_full")] - public static uint add_full (int priority, uint fps, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, uint fps, owned GLib.SourceFunc func); } [CCode (cheader_filename = "clutter/clutter.h")] @@ -111,7 +111,7 @@ namespace Clutter { [CCode (cname = "clutter_threads_add_idle")] public static uint add (GLib.SourceFunc func); [CCode (cname = "clutter_threads_add_idle_full")] - public static uint add_full (int priority, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, owned GLib.SourceFunc func); } [CCode (cheader_filename = "clutter/clutter.h")] @@ -119,7 +119,7 @@ namespace Clutter { [CCode (cname = "clutter_threads_add_timeout")] public static uint add (uint interval, GLib.SourceFunc func); [CCode (cname = "clutter_threads_add_timeout_full")] - public static uint add_full (int priority, uint interval, GLib.SourceFunc func, GLib.DestroyNotify? notify = null); + public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func); } public static void enter ();