diff options
| author | Neil Jagdish Patel <neil.patel@canonical.com> | 2010-08-24 13:02:16 +0100 |
|---|---|---|
| committer | Neil Jagdish Patel <neil.patel@canonical.com> | 2010-08-24 13:02:16 +0100 |
| commit | de1d46e08a477e69108fb6aaa5142d66da004278 (patch) | |
| tree | 7e8144ef13214e50ae5f6fd4ff5aca4ff72d78e4 /vapi | |
| parent | 6ece6e81bad2d838899dc040631eafb512341ad1 (diff) | |
| parent | 0bb8516abcda57f320160c87432867de30a7332a (diff) | |
[merge] trunk
(bzr r424.1.28)
Diffstat (limited to 'vapi')
| -rw-r--r-- | vapi/clutter-1.0.vapi | 4 | ||||
| -rw-r--r-- | vapi/mutter-2.28.vapi | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi index bac197fd5..6c3a49fd8 100644 --- a/vapi/clutter-1.0.vapi +++ b/vapi/clutter-1.0.vapi @@ -5654,6 +5654,8 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h")] public static bool get_motion_events_enabled (); [CCode (cheader_filename = "clutter/clutter.h")] + public static bool get_gl_picking_enabled (); + [CCode (cheader_filename = "clutter/clutter.h")] public static GLib.OptionGroup get_option_group (); [CCode (cheader_filename = "clutter/clutter.h")] public static GLib.OptionGroup get_option_group_without_init (); @@ -5698,6 +5700,8 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h")] public static void set_motion_events_enabled (bool enable); [CCode (cheader_filename = "clutter/clutter.h")] + public static void set_gl_picking_enabled (bool enable); + [CCode (cheader_filename = "clutter/clutter.h")] public static uint threads_add_frame_source (uint fps, GLib.SourceFunc func, void* data); [CCode (cheader_filename = "clutter/clutter.h")] public static uint threads_add_frame_source_full (int priority, uint fps, GLib.SourceFunc func, void* data, GLib.DestroyNotify notify); diff --git a/vapi/mutter-2.28.vapi b/vapi/mutter-2.28.vapi index f5f8cbab6..a6a2ed1ea 100644 --- a/vapi/mutter-2.28.vapi +++ b/vapi/mutter-2.28.vapi @@ -130,6 +130,11 @@ namespace Mutter { public static void set_input_focus_window (Mutter.MetaDisplay display, Mutter.MetaWindow window, bool focus_frame, uint32 timestamp); [CCode (cname = "meta_display_xwindow_is_a_no_focus_window")] public static bool xwindow_is_a_no_focus_window (Mutter.MetaDisplay display, X.Window xwindow); + + public signal void overlay_key (); + public signal void overlay_key_down (); + public signal void overlay_key_with_modifier (uint keysym); + public signal void overlay_key_with_modifier_down (uint keysym); } [Compact] [CCode (cheader_filename = "mutter-plugins.h")] |