elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-24 17:53:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

update mutter bindings for 3.5.2+ and keep it building with 3.4.x

Browse Source
This commit is contained in:
Rico Tzschichholz 2012-06-08 22:38:08 +02:00
parent de2ace94ba
commit 68c8e3c6f0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -21,6 +21,7 @@ set (VERSION_INFO "Release")
set (CMAKE_C_FLAGS "-ggdb")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (DOLLAR "$")
set (GALAVALAFLAGS "")
list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@ -30,6 +31,11 @@ add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
find_package(PkgConfig)
pkg_check_modules(DEPS REQUIRED libmutter granite clutter-1.0 clutter-gtk-1.0 libbamf3 xfixes)
pkg_check_modules(MUTTER36 libmutter>=3.5.2)
if (MUTTER36_FOUND)
set (GALAVALAFLAGS "--define=HAS_MUTTER36")
endif (MUTTER36_FOUND)
add_definitions(${DEPS_CFLAGS})
link_libraries(${DEPS_LIBRARIES})
@ -57,6 +63,7 @@ PACKAGES
bamf
OPTIONS
--vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
${GALAVALAFLAGS}
)
#add_subdirectory (po)

4
src/Main.vala
View File

@ -593,7 +593,11 @@ namespace Gala
Meta.exit (Meta.ExitCode.ERROR);
}
#if HAS_MUTTER36
Meta.Plugin.manager_set_plugin_type (new Gala.Plugin ().get_type ());
#else
Meta.Plugin.type_register (new Gala.Plugin ().get_type ());
#endif
/**
* Prevent Meta.init () from causing gtk to load gail and at-bridge

9
vapi/libmutter.vapi
View File

@ -153,8 +153,6 @@ namespace Meta {
public static void later_remove (uint later_id);
[CCode (cheader_filename = "meta/main.h", cname = "meta_pop_no_msg_prefix")]
public static void pop_no_msg_prefix ();
[CCode (cheader_filename = "meta/main.h", cname = "meta_print_backtrace")]
public static void print_backtrace ();
[CCode (cheader_filename = "meta/main.h", cname = "meta_push_no_msg_prefix")]
public static void push_no_msg_prefix ();
[CCode (cheader_filename = "meta/main.h", cname = "meta_rect")]
@ -219,7 +217,7 @@ namespace Meta {
public void show_window (Meta.Window window, Meta.CompEffect effect);
public void switch_workspace (Meta.Screen screen, Meta.Workspace from, Meta.Workspace to, Meta.MotionDirection direction);
public void sync_screen_size (Meta.Screen screen, uint width, uint height);
public void sync_stack (Meta.Screen screen, GLib.List<Meta.WindowActor> stack);
public void sync_stack (Meta.Screen screen, [CCode (type = "GList*")] GLib.List<Meta.WindowActor> stack);
public void sync_window_geometry (Meta.Window window);
public void unmanage_screen (Meta.Screen screen);
public void unmaximize_window (Meta.Window window, Meta.Rectangle old_rect, Meta.Rectangle new_rect);
@ -313,6 +311,7 @@ namespace Meta {
public virtual void kill_switch_workspace ();
[NoWrapper]
public virtual void kill_window_effects (Meta.WindowActor actor);
public static void manager_set_plugin_type (GLib.Type gtype);
[NoWrapper]
public virtual void map (Meta.WindowActor actor);
public void map_completed (Meta.WindowActor actor);
@ -338,10 +337,6 @@ namespace Meta {
public virtual bool xevent_filter (X.Event event);
[NoAccessorMethod]
public bool debug_mode { get; }
[NoAccessorMethod]
public bool disabled { get; set; }
[NoAccessorMethod]
public ulong features { get; }
}
[CCode (cheader_filename = "meta/main.h")]
[Compact]