From 775f8b26f2fd2d3cb7d604754e853aaed83070ad Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Wed, 18 Feb 2015 12:20:10 -0500
Subject: Remove vapi.

---
 data/Makefile.am               |   8 +-
 deps/GnomeDesktop-3.0.metadata |   1 +
 deps/README                    |  47 ------
 deps/accountsservice.vapi      | 151 -------------------
 deps/fcitx.vapi                |  98 -------------
 deps/fontconfig.vapi           |  13 --
 deps/freetype2.vapi            |  20 ---
 deps/gnome-desktop-3.0.vapi    | 320 -----------------------------------------
 deps/pangoft2.vapi             |  33 -----
 lib/Makefile.am                |   6 +-
 10 files changed, 8 insertions(+), 689 deletions(-)
 create mode 100644 deps/GnomeDesktop-3.0.metadata
 delete mode 100644 deps/README
 delete mode 100644 deps/accountsservice.vapi
 delete mode 100644 deps/fcitx.vapi
 delete mode 100644 deps/fontconfig.vapi
 delete mode 100644 deps/freetype2.vapi
 delete mode 100644 deps/gnome-desktop-3.0.vapi
 delete mode 100644 deps/pangoft2.vapi

diff --git a/data/Makefile.am b/data/Makefile.am
index 06ed4662..61e5c37f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,12 +17,12 @@ indicator_keyboard_icon_generator_SOURCES = main.vala                     \
                                             $(top_srcdir)/lib/common.vala
 indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS)         \
                                               --pkg gee-1.0           \
-                                              --pkg fontconfig        \
-                                              --pkg freetype2         \
-                                              --pkg pangoft2          \
+                                              --pkg fontconfig-2.0    \
+                                              --pkg freetype2-2.0     \
+                                              --pkg PangoFT2-1.0      \
                                               --pkg gtk+-3.0          \
                                               --pkg GDesktopEnums-3.0 \
-                                              --pkg gnome-desktop-3.0 \
+                                              --pkg GnomeDesktop-3.0  \
                                               --pkg Xkl-1.0
 indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS)            \
                                            $(GEE_CFLAGS)           \
diff --git a/deps/GnomeDesktop-3.0.metadata b/deps/GnomeDesktop-3.0.metadata
new file mode 100644
index 00000000..3e4f88f4
--- /dev/null
+++ b/deps/GnomeDesktop-3.0.metadata
@@ -0,0 +1 @@
+RRScreen.new_async skip
diff --git a/deps/README b/deps/README
deleted file mode 100644
index c3666140..00000000
--- a/deps/README
+++ /dev/null
@@ -1,47 +0,0 @@
-To generate fontconfig.vapi:
-
-vapigen --library fontconfig /path/to/fontconfig-2.0.gir
-
-To generate freetype2.vapi:
-
-vapigen --library freetype2 /path/to/freetype2-2.0.gir
-
-To generate pangoft2.vapi:
-
-vapigen --library pangoft2 /path/to/PangoFT2-1.0.gir
-
-To generate gnome-desktop-3.0.vapi:
-
-vapigen --pkg gio-2.0 --pkg gtk+-3.0 --library gnome-desktop-3.0 /path/to/GnomeDesktop-3.0.gir
-
-To generate gnome-desktop-3.0.vapi docs:
-
-valadoc --vapidir /path/to/vapi/dir --pkg gdk-3.0 -o gnome-desktop-3.0 gnome-desktop-3.0.vapi
-
-To generate libxklavier.vapi:
-
-vapigen --metadatadir . --pkg x11 --library libxklavier /path/to/Xkl-1.0.gir
-
-To generate libxklavier.vapi docs:
-
-valadoc --vapidir /path/to/vapi/dir --pkg x11 -o libxklavier libxklavier.vapi
-
-To generate libgnomekbd.vapi:
-
-vapigen --metadatadir . --pkg gtk+-3.0 --library libgnomekbd /path/to/Gkbd-3.0.gir
-
-To generate libgnomekbd.vapi docs:
-
-valadoc --metadatadir . --vapidir /path/to/vapi/dir --pkg gtk+-3.0 --pkg Xkl-1.0 -o libgnomekbd libgnomekbd.vapi
-
-To generate ibus-1.0.vapi docs:
-
-valadoc --vapidir /path/to/vapi/dir -o ibus-1.0 /path/to/ibus-1.0.vapi
-
-To generate fcitx.vapi:
-
-vapigen --metadatadir . --pkg gio-2.0 --library fcitx /path/to/Fcitx-1.0.gir
-
-To generate libbamf3.vapi:
-
-vapigen --library libbamf3 /path/to/Bamf-3.gir
diff --git a/deps/accountsservice.vapi b/deps/accountsservice.vapi
deleted file mode 100644
index 809726d0..00000000
--- a/deps/accountsservice.vapi
+++ /dev/null
@@ -1,151 +0,0 @@
-/* accountsservice.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Act", gir_namespace = "AccountsService", gir_version = "1.0", lower_case_cprefix = "act_")]
-namespace Act {
-	[CCode (cheader_filename = "act/act.h", type_id = "act_user_get_type ()")]
-	public class User : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected User ();
-		public int collate (Act.User user2);
-		public Act.UserAccountType get_account_type ();
-		public bool get_automatic_login ();
-		public unowned string get_email ();
-		public unowned string get_formats_locale ();
-		public unowned string get_home_dir ();
-		public unowned string get_icon_file ();
-		public unowned GLib.Variant get_input_sources ();
-		public unowned string get_language ();
-		public unowned string get_location ();
-		public bool get_locked ();
-		public int get_login_frequency ();
-		public unowned GLib.Variant get_login_history ();
-		public int64 get_login_time ();
-		public uint get_num_sessions ();
-		public uint get_num_sessions_anywhere ();
-		public unowned string get_object_path ();
-		public unowned string get_password_hint ();
-		public Act.UserPasswordMode get_password_mode ();
-		public unowned string get_primary_session_id ();
-		public unowned string get_real_name ();
-		public unowned string get_shell ();
-		public uint get_uid ();
-		public unowned string get_user_name ();
-		public unowned string get_x_session ();
-		public bool is_local_account ();
-		public bool is_logged_in ();
-		public bool is_logged_in_anywhere ();
-		public bool is_nonexistent ();
-		public bool is_system_account ();
-		public void set_account_type (Act.UserAccountType account_type);
-		public void set_automatic_login (bool enabled);
-		public void set_email (string email);
-		public void set_formats_locale (string formats_locale);
-		public void set_icon_file (string icon_file);
-		public void set_input_sources (GLib.Variant sources);
-		public void set_language (string language);
-		public void set_location (string location);
-		public void set_locked (bool locked);
-		public void set_multiple_passwords (GLib.HashTable<uint,string> password_map);
-		public void set_password (string password, string hint);
-		public void set_password_mode (Act.UserPasswordMode password_mode);
-		public void set_real_name (string real_name);
-		public void set_user_name (string user_name);
-		public void set_x_session (string x_session);
-		public int account_type { get; }
-		public bool automatic_login { get; }
-		[NoAccessorMethod]
-		public string background_file { owned get; }
-		public string email { get; }
-		public string formats_locale { get; }
-		[NoAccessorMethod]
-		public string home_directory { owned get; }
-		public string icon_file { get; }
-		public GLib.Variant input_sources { get; }
-		[NoAccessorMethod]
-		public bool is_loaded { get; }
-		public string language { get; }
-		[NoAccessorMethod]
-		public bool local_account { get; }
-		public string location { get; }
-		public bool locked { get; }
-		public int login_frequency { get; }
-		public GLib.Variant login_history { get; }
-		public int64 login_time { get; }
-		[NoAccessorMethod]
-		public bool nonexistent { get; }
-		public string password_hint { get; }
-		public int password_mode { get; }
-		public string real_name { get; }
-		public string shell { get; }
-		[NoAccessorMethod]
-		public bool system_account { get; }
-		public int uid { get; }
-		public string user_name { get; }
-		public string x_session { get; }
-		[NoAccessorMethod]
-		public bool xhas_messages { get; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] xkeyboard_layouts { owned get; }
-		public signal void changed ();
-		public signal void sessions_changed ();
-	}
-	[CCode (cheader_filename = "act/act.h", type_id = "act_user_manager_get_type ()")]
-	public class UserManager : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected UserManager ();
-		public bool activate_user_session (Act.User user);
-		public Act.User cache_user (string username) throws GLib.Error;
-		public async Act.User cache_user_async (string username, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool can_switch ();
-		public Act.User create_user (string username, string fullname, Act.UserAccountType accounttype) throws GLib.Error;
-		public async Act.User create_user_async (string username, string fullname, Act.UserAccountType accounttype, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool delete_user (Act.User user, bool remove_files) throws GLib.Error;
-		public async bool delete_user_async (Act.User user, bool remove_files, GLib.Cancellable? cancellable) throws GLib.Error;
-		public static unowned Act.UserManager get_default ();
-		public unowned Act.User get_user (string username);
-		public unowned Act.User get_user_by_id (uint id);
-		public bool goto_login_session ();
-		public GLib.SList<weak Act.User> list_users ();
-		public bool no_service ();
-		public bool uncache_user (string username) throws GLib.Error;
-		[NoAccessorMethod]
-		public void* exclude_usernames_list { get; set; }
-		[NoAccessorMethod]
-		public bool has_multiple_users { get; }
-		[NoAccessorMethod]
-		public void* include_usernames_list { get; set; }
-		[NoAccessorMethod]
-		public bool is_loaded { get; }
-		public virtual signal void user_added (Act.User user);
-		public virtual signal void user_changed (Act.User user);
-		public virtual signal void user_is_logged_in_changed (Act.User user);
-		public virtual signal void user_removed (Act.User user);
-	}
-	[CCode (cheader_filename = "act/act.h", cprefix = "ACT_USER_ACCOUNT_TYPE_", type_id = "act_user_account_type_get_type ()")]
-	public enum UserAccountType {
-		STANDARD,
-		ADMINISTRATOR
-	}
-	[CCode (cheader_filename = "act/act.h", cprefix = "ACT_USER_PASSWORD_MODE_", type_id = "act_user_password_mode_get_type ()")]
-	public enum UserPasswordMode {
-		REGULAR,
-		SET_AT_LOGIN,
-		NONE
-	}
-	[CCode (cheader_filename = "act/act.h", cprefix = "ACT_USER_PASSWORD_", type_id = "act_user_password_type_get_type ()")]
-	public enum UserPasswordType {
-		REGULAR,
-		HINT,
-		PIN
-	}
-	[CCode (cheader_filename = "act/act.h", cprefix = "ACT_USER_MANAGER_ERROR_")]
-	public errordomain UserManagerError {
-		FAILED,
-		USER_EXISTS,
-		USER_DOES_NOT_EXIST,
-		PERMISSION_DENIED,
-		NOT_SUPPORTED;
-		public static GLib.Quark quark ();
-	}
-}
diff --git a/deps/fcitx.vapi b/deps/fcitx.vapi
deleted file mode 100644
index 70ce5849..00000000
--- a/deps/fcitx.vapi
+++ /dev/null
@@ -1,98 +0,0 @@
-/* fcitx.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Fcitx", gir_namespace = "Fcitx", gir_version = "1.0", lower_case_cprefix = "fcitx_")]
-namespace Fcitx {
-	[CCode (cheader_filename = "fcitx-gclient/fcitxclient.h", type_id = "fcitx_client_get_type ()")]
-	public class Client : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Client ();
-		public void close_ic ();
-		public void enable_ic ();
-		public void focus_in ();
-		public void focus_out ();
-		public bool is_valid ();
-		[Deprecated]
-		public async int process_key (uint32 keyval, uint32 keycode, uint32 state, int type, uint32 t);
-		public async int process_key_async (uint32 keyval, uint32 keycode, uint32 state, int type, uint32 t, int timeout_msec, GLib.Cancellable? cancellable);
-		public int process_key_sync (uint32 keyval, uint32 keycode, uint32 state, int type, uint32 t);
-		public void reset ();
-		public void set_capacity (uint flags);
-		public void set_cursor_rect (int x, int y, int w, int h);
-		[Deprecated]
-		public void set_cusor_rect (int x, int y, int w, int h);
-		public void set_surrounding_text (string? text, uint cursor, uint anchor);
-		public signal void close_im ();
-		public signal void commit_string (string string);
-		public signal void connected ();
-		public signal void delete_surrounding_text (int cursor, uint len);
-		public signal void disconnected ();
-		public signal void enable_im ();
-		public signal void forward_key (uint keyval, int state, int type);
-		public signal void update_client_side_ui (string auxup, string auxdown, string preedit, string candidateword, string imname, int cursor_pos);
-		public signal void update_formatted_preedit (GLib.GenericArray<Fcitx.PreeditItem> preedit, int cursor);
-	}
-	[CCode (cheader_filename = "fcitx-gclient/fcitxconnection.h", type_id = "fcitx_connection_get_type ()")]
-	public class Connection : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Connection ();
-		public unowned GLib.DBusConnection get_g_dbus_connection ();
-		public bool is_valid ();
-		public signal void connected ();
-		public signal void disconnected ();
-	}
-	[CCode (cheader_filename = "fcitx-gclient/fcitxinputmethod.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "fcitx_im_item_get_type ()")]
-	[Compact]
-	public class IMItem {
-		public bool enable;
-		public weak string langcode;
-		public weak string name;
-		public weak string unique_name;
-		[CCode (has_construct_function = false)]
-		public IMItem (string name, string unique_name, string langcode, bool enable);
-	}
-	[CCode (cheader_filename = "fcitx-gclient/fcitxinputmethod.h", type_id = "fcitx_input_method_get_type ()")]
-	public class InputMethod : GLib.DBusProxy, GLib.AsyncInitable, GLib.DBusInterface, GLib.Initable {
-		[CCode (has_construct_function = false)]
-		public InputMethod (GLib.BusType bus_type, GLib.DBusProxyFlags flags, int display_number, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public void activate ();
-		public void configure ();
-		public void configure_addon (string addon);
-		public void configure_im (string imname);
-		public void exit ();
-		public string get_current_im ();
-		public int get_current_state ();
-		public string get_current_ui ();
-		public string get_im_addon (string imname);
-		public GLib.GenericArray<Fcitx.IMItem> get_imlist_nofree ();
-		public void inactivate ();
-		public void reload_config ();
-		public void restart ();
-		public void set_current_im (string imname);
-		public void set_imlist (GLib.GenericArray<Fcitx.IMItem> array);
-		public void toggle ();
-		public string current_im { owned get; set construct; }
-		public signal void imlist_changed ();
-	}
-	[CCode (cheader_filename = "fcitx-gclient/fcitxkbd.h", type_id = "fcitx_kbd_get_type ()")]
-	public class Kbd : GLib.DBusProxy, GLib.AsyncInitable, GLib.DBusInterface, GLib.Initable {
-		[CCode (has_construct_function = false)]
-		public Kbd (GLib.BusType bus_type, GLib.DBusProxyFlags flags, int display_number, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public void get_layout_for_im (string imname, out string layout, out string variant);
-		public GLib.GenericArray<Fcitx.LayoutItem> get_layouts_nofree ();
-		public void set_default_layout (string layout, string variant);
-		public void set_layout_for_im (string imname, string layout, string variant);
-	}
-	[CCode (cheader_filename = "fcitx-gclient/fcitxkbd.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "fcitx_layout_item_get_type ()")]
-	[Compact]
-	public class LayoutItem {
-		public weak string langcode;
-		public weak string layout;
-		public weak string name;
-		public weak string variant;
-	}
-	[CCode (cheader_filename = "fcitx-gclient/fcitxclient.h", has_type_id = false)]
-	public struct PreeditItem {
-		public weak global::string string;
-		public int32 type;
-	}
-}
diff --git a/deps/fontconfig.vapi b/deps/fontconfig.vapi
deleted file mode 100644
index dc3f450b..00000000
--- a/deps/fontconfig.vapi
+++ /dev/null
@@ -1,13 +0,0 @@
-/* fontconfig.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Fc", gir_namespace = "fontconfig", gir_version = "2.0", lower_case_cprefix = "fc_")]
-namespace Fc {
-	[CCode (cheader_filename = "fontconfig-2.0.h", has_type_id = false)]
-	public struct CharSet {
-	}
-	[CCode (cheader_filename = "fontconfig-2.0.h", has_type_id = false)]
-	public struct Pattern {
-	}
-	[CCode (cheader_filename = "fontconfig-2.0.h", cname = "FcInit")]
-	public static void init ();
-}
diff --git a/deps/freetype2.vapi b/deps/freetype2.vapi
deleted file mode 100644
index 5403be26..00000000
--- a/deps/freetype2.vapi
+++ /dev/null
@@ -1,20 +0,0 @@
-/* freetype2.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "FT", gir_namespace = "freetype2", gir_version = "2.0", lower_case_cprefix = "FT_")]
-namespace FT {
-	[CCode (cheader_filename = "freetype2-2.0.h", cname = "FT_Bitmap", has_type_id = false)]
-	public struct Bitmap {
-	}
-	[CCode (cheader_filename = "freetype2-2.0.h", cname = "FT_Face", has_type_id = false)]
-	public struct Face {
-	}
-	[CCode (cheader_filename = "freetype2-2.0.h", cname = "FT_Int32")]
-	[SimpleType]
-	public struct Int32 : int32 {
-	}
-	[CCode (cheader_filename = "freetype2-2.0.h", cname = "FT_Library", has_type_id = false)]
-	public struct Library {
-	}
-	[CCode (cheader_filename = "freetype2-2.0.h", cname = "FT_Library_Version")]
-	public static void library_version ();
-}
diff --git a/deps/gnome-desktop-3.0.vapi b/deps/gnome-desktop-3.0.vapi
deleted file mode 100644
index 80f38b35..00000000
--- a/deps/gnome-desktop-3.0.vapi
+++ /dev/null
@@ -1,320 +0,0 @@
-/* gnome-desktop-3.0.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Gnome", gir_namespace = "GnomeDesktop", gir_version = "3.0", lower_case_cprefix = "gnome_")]
-namespace Gnome {
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_bg_get_type ()")]
-	public class BG : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public BG ();
-		public bool changes_with_time ();
-		public Gdk.Pixbuf create_frame_thumbnail (Gnome.DesktopThumbnailFactory factory, Gdk.Screen screen, int dest_width, int dest_height, int frame_num);
-		public Cairo.Surface create_surface (Gdk.Window window, int width, int height, bool root);
-		public Gdk.Pixbuf create_thumbnail (Gnome.DesktopThumbnailFactory factory, Gdk.Screen screen, int dest_width, int dest_height);
-		public void draw (Gdk.Pixbuf dest, Gdk.Screen screen, bool is_root);
-		public void get_color (GDesktop.BackgroundShading type, Gdk.Color primary, Gdk.Color secondary);
-		public bool get_draw_background ();
-		public unowned string get_filename ();
-		public bool get_image_size (Gnome.DesktopThumbnailFactory factory, int best_width, int best_height, int width, int height);
-		public GDesktop.BackgroundStyle get_placement ();
-		public static Cairo.Surface get_surface_from_root (Gdk.Screen screen);
-		public bool has_multiple_sizes ();
-		public bool is_dark (int dest_width, int dest_height);
-		public void load_from_preferences (GLib.Settings settings);
-		public void save_to_preferences (GLib.Settings settings);
-		public void set_color (GDesktop.BackgroundShading type, Gdk.Color primary, Gdk.Color secondary);
-		public void set_draw_background (bool draw_background);
-		public void set_filename (string filename);
-		public void set_placement (GDesktop.BackgroundStyle placement);
-		public static void set_surface_as_root (Gdk.Screen screen, Cairo.Surface surface);
-		public static Gnome.BGCrossfade set_surface_as_root_with_crossfade (Gdk.Screen screen, Cairo.Surface surface);
-		public signal void changed ();
-		public signal void transitioned ();
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_bg_crossfade_get_type ()")]
-	public class BGCrossfade : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public BGCrossfade (int width, int height);
-		public bool is_started ();
-		public bool set_end_surface (Cairo.Surface surface);
-		public bool set_start_surface (Cairo.Surface surface);
-		public void start (Gdk.Window window);
-		public void stop ();
-		[NoAccessorMethod]
-		public int height { get; construct; }
-		[NoAccessorMethod]
-		public int width { get; construct; }
-		public virtual signal void finished (GLib.Object window);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_bg_slide_show_get_type ()")]
-	public class BGSlideShow : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public BGSlideShow (string filename);
-		public void get_current_slide (int width, int height, out double progress, out double duration, out bool is_fixed, out unowned string file1, out unowned string file2);
-		public bool get_has_multiple_sizes ();
-		public int get_num_slides ();
-		public bool get_slide (int frame_number, int width, int height, double progress, out double duration, out bool is_fixed, out unowned string file1, out unowned string file2);
-		public double get_start_time ();
-		public double get_total_duration ();
-		public bool load () throws GLib.Error;
-		public async void load_async (GLib.Cancellable? cancellable);
-		[NoAccessorMethod]
-		public string filename { owned get; construct; }
-		public bool has_multiple_sizes { get; }
-		public double start_time { get; }
-		public double total_duration { get; }
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_desktop_thumbnail_factory_get_type ()")]
-	public class DesktopThumbnailFactory : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public DesktopThumbnailFactory (Gnome.DesktopThumbnailSize size);
-		public bool can_thumbnail (string uri, string mime_type, long mtime);
-		public void create_failed_thumbnail (string uri, long mtime);
-		public Gdk.Pixbuf generate_thumbnail (string uri, string mime_type);
-		public bool has_valid_failed_thumbnail (string uri, long mtime);
-		public string lookup (string uri, long mtime);
-		public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, long original_mtime);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_idle_monitor_get_type ()")]
-	public class IdleMonitor : GLib.Object, GLib.Initable {
-		[CCode (has_construct_function = false)]
-		public IdleMonitor ();
-		public uint add_idle_watch (uint64 interval_msec, owned Gnome.IdleMonitorWatchFunc? callback);
-		public uint add_user_active_watch (owned Gnome.IdleMonitorWatchFunc? callback);
-		[CCode (has_construct_function = false)]
-		public IdleMonitor.for_device (Gdk.Device device);
-		public int64 get_idletime ();
-		public void remove_watch (uint id);
-		[NoAccessorMethod]
-		public Gdk.Device device { owned get; construct; }
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_pnp_ids_get_type ()")]
-	public class PnpIds : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public PnpIds ();
-		public string get_pnp_id (string pnp_id);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_rr_config_get_type ()")]
-	public class RRConfig : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected RRConfig ();
-		public bool applicable (Gnome.RRScreen screen) throws GLib.Error;
-		public static bool apply_from_filename_with_time (Gnome.RRScreen screen, string filename, uint32 timestamp) throws GLib.Error;
-		public bool apply_with_time (Gnome.RRScreen screen, uint32 timestamp) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public RRConfig.current (Gnome.RRScreen screen) throws GLib.Error;
-		public bool ensure_primary ();
-		public bool equal (Gnome.RRConfig config2);
-		public static string get_backup_filename ();
-		public bool get_clone ();
-		public static string get_intended_filename ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned Gnome.RROutputInfo[] get_outputs ();
-		public bool load_current () throws GLib.Error;
-		public bool load_filename (string filename) throws GLib.Error;
-		public bool match (Gnome.RRConfig config2);
-		public void sanitize ();
-		public bool save () throws GLib.Error;
-		public void set_clone (bool clone);
-		[CCode (has_construct_function = false)]
-		public RRConfig.stored (Gnome.RRScreen screen) throws GLib.Error;
-		public Gnome.RRScreen screen { construct; }
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gnome_rr_crtc_get_type ()")]
-	[Compact]
-	public class RRCrtc {
-		public bool can_drive_output (Gnome.RROutput output);
-		public Gnome.RRMode get_current_mode ();
-		public Gnome.RRRotation get_current_rotation ();
-		public bool get_gamma (int size, ushort red, ushort green, ushort blue);
-		public uint32 get_id ();
-		public void get_position (out int x, out int y);
-		public Gnome.RRRotation get_rotations ();
-		public bool set_config_with_time (uint32 timestamp, int x, int y, Gnome.RRMode mode, Gnome.RRRotation rotation, Gnome.RROutput outputs, int n_outputs) throws GLib.Error;
-		public void set_gamma (int size, ushort red, ushort green, ushort blue);
-		public bool supports_rotation (Gnome.RRRotation rotation);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gnome_rr_mode_get_type ()")]
-	[Compact]
-	public class RRMode {
-		public int get_freq ();
-		public uint get_height ();
-		public uint32 get_id ();
-		public uint get_width ();
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gnome_rr_output_get_type ()")]
-	[Compact]
-	public class RROutput {
-		public bool can_clone (Gnome.RROutput clone);
-		public int get_backlight () throws GLib.Error;
-		public int get_backlight_max ();
-		public int get_backlight_min ();
-		public unowned string get_connector_type ();
-		public Gnome.RRCrtc get_crtc ();
-		public Gnome.RRMode get_current_mode ();
-		public unowned string get_display_name ();
-		public uint8 get_edid_data (size_t size);
-		public int get_height_mm ();
-		public uint32 get_id ();
-		public bool get_ids_from_edid (out string vendor, out int product, out int serial);
-		public bool get_is_primary ();
-		public unowned string get_name ();
-		public void get_position (out int x, out int y);
-		public Gnome.RRCrtc get_possible_crtcs ();
-		public Gnome.RRMode get_preferred_mode ();
-		public int get_size_inches ();
-		public int get_width_mm ();
-		public bool is_connected ();
-		public bool is_laptop ();
-		public Gnome.RRMode list_modes ();
-		public bool set_backlight (int value) throws GLib.Error;
-		public bool supports_mode (Gnome.RRMode mode);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_rr_output_info_get_type ()")]
-	public class RROutputInfo : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected RROutputInfo ();
-		public double get_aspect_ratio ();
-		public unowned string get_display_name ();
-		public void get_geometry (out int x, out int y, out int width, out int height);
-		public unowned string get_name ();
-		public int get_preferred_height ();
-		public int get_preferred_width ();
-		public bool get_primary ();
-		public uint get_product ();
-		public int get_refresh_rate ();
-		public Gnome.RRRotation get_rotation ();
-		public uint get_serial ();
-		public void get_vendor ([CCode (array_length = false)] out unowned string[] vendor);
-		public bool is_active ();
-		public bool is_connected ();
-		public void set_active (bool active);
-		public void set_geometry (int x, int y, int width, int height);
-		public void set_primary (bool primary);
-		public void set_refresh_rate (int rate);
-		public void set_rotation (Gnome.RRRotation rotation);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_rr_screen_get_type ()")]
-	public class RRScreen : GLib.Object, GLib.Initable {
-		[CCode (has_construct_function = false)]
-		public RRScreen (Gdk.Screen screen) throws GLib.Error;
-		public Gnome.RRMode create_clone_modes ();
-		public unowned Gnome.RRCrtc get_crtc_by_id (uint32 id);
-		public bool get_dpms_mode (out Gnome.RRDpmsMode mode) throws GLib.Error;
-		public unowned Gnome.RROutput get_output_by_id (uint32 id);
-		public unowned Gnome.RROutput get_output_by_name (string name);
-		public void get_ranges (out int min_width, out int max_width, out int min_height, out int max_height);
-		public void get_timestamps (out uint32 change_timestamp_ret, out uint32 config_timestamp_ret);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned Gnome.RRMode[] list_clone_modes ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned Gnome.RRCrtc[] list_crtcs ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned Gnome.RRMode[] list_modes ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned Gnome.RROutput[] list_outputs ();
-		public bool refresh () throws GLib.Error;
-		public bool set_dpms_mode (Gnome.RRDpmsMode mode) throws GLib.Error;
-		public void set_primary_output (Gnome.RROutput output);
-		public void set_size (int width, int height, int mm_width, int mm_height);
-		[NoAccessorMethod]
-		public Gdk.Screen gdk_screen { owned get; construct; }
-		public virtual signal void changed ();
-		public virtual signal void output_connected (void* output);
-		public virtual signal void output_disconnected (void* output);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_wall_clock_get_type ()")]
-	public class WallClock : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public WallClock ();
-		public unowned string get_clock ();
-		public unowned GLib.TimeZone get_timezone ();
-		public string clock { get; }
-		[NoAccessorMethod]
-		public bool time_only { get; set; }
-		public GLib.TimeZone timezone { get; }
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", type_id = "gnome_xkb_info_get_type ()")]
-	public class XkbInfo : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public XkbInfo ();
-		public unowned string description_for_group (string group_id);
-		public unowned string description_for_option (string group_id, string id);
-		public GLib.List<weak string> get_all_layouts ();
-		public GLib.List<weak string> get_all_option_groups ();
-		public bool get_layout_info (string id, out unowned string display_name, out unowned string short_name, out unowned string xkb_layout, out unowned string xkb_variant);
-		public GLib.List<weak string> get_layouts_for_country (string country_code);
-		public GLib.List<weak string> get_layouts_for_language (string language_code);
-		public GLib.List<weak string> get_options_for_group (string group_id);
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", cprefix = "GNOME_DESKTOP_THUMBNAIL_SIZE_", has_type_id = false)]
-	public enum DesktopThumbnailSize {
-		NORMAL,
-		LARGE
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", cprefix = "GNOME_RR_DPMS_", has_type_id = false)]
-	public enum RRDpmsMode {
-		ON,
-		STANDBY,
-		SUSPEND,
-		OFF,
-		DISABLED,
-		UNKNOWN
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", cprefix = "GNOME_RR_", has_type_id = false)]
-	[Flags]
-	public enum RRRotation {
-		ROTATION_NEXT,
-		ROTATION_0,
-		ROTATION_90,
-		ROTATION_180,
-		ROTATION_270,
-		REFLECT_X,
-		REFLECT_Y
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", cprefix = "GNOME_RR_ERROR_")]
-	public errordomain RRError {
-		UNKNOWN,
-		NO_RANDR_EXTENSION,
-		RANDR_ERROR,
-		BOUNDS_ERROR,
-		CRTC_ASSIGNMENT,
-		NO_MATCHING_CONFIG,
-		NO_DPMS_EXTENSION;
-		public static GLib.Quark quark ();
-	}
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", instance_pos = 2.9)]
-	public delegate void IdleMonitorWatchFunc (Gnome.IdleMonitor monitor, uint id);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h", cname = "GNOME_RR_CONNECTOR_TYPE_PANEL")]
-	public const string RR_CONNECTOR_TYPE_PANEL;
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static bool desktop_thumbnail_has_uri (Gdk.Pixbuf pixbuf, string uri);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static bool desktop_thumbnail_is_valid (Gdk.Pixbuf pixbuf, string uri, long mtime);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	[Deprecated (since = "2.22")]
-	public static string desktop_thumbnail_md5 (string uri);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string desktop_thumbnail_path_for_uri (string uri, Gnome.DesktopThumbnailSize size);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static Gdk.Pixbuf desktop_thumbnail_scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height);
-	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string[] get_all_languages ();
-	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string[] get_all_locales ();
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string get_country_from_code (string code, string? translation);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string get_country_from_locale (string locale, string? translation);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static bool get_input_source_from_locale (string locale, out unowned string type, out unowned string id);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string get_language_from_code (string code, string? translation);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string get_language_from_locale (string locale, string? translation);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static bool language_has_translations (string code);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static string normalize_locale (string locale);
-	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-crossfade.h,libgnome-desktop/gnome-bg-slide-show.h,libgnome-desktop/gnome-bg.h,libgnome-desktop/gnome-desktop-thumbnail.h,libgnome-desktop/gnome-idle-monitor.h,libgnome-desktop/gnome-languages.h,libgnome-desktop/gnome-pnp-ids.h,libgnome-desktop/gnome-rr-config.h,libgnome-desktop/gnome-rr.h,libgnome-desktop/gnome-wall-clock.h,libgnome-desktop/gnome-xkb-info.h")]
-	public static bool parse_locale (string locale, out string language_codep, out string country_codep, out string codesetp, out string modifierp);
-}
diff --git a/deps/pangoft2.vapi b/deps/pangoft2.vapi
deleted file mode 100644
index 8dc85109..00000000
--- a/deps/pangoft2.vapi
+++ /dev/null
@@ -1,33 +0,0 @@
-/* pangoft2.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "PangoFT2", gir_namespace = "PangoFT2", gir_version = "1.0", lower_case_cprefix = "pango_ft2_")]
-namespace PangoFT2 {
-	[CCode (cheader_filename = "pango/pangoft2.h", type_id = "pango_ft2_font_map_get_type ()")]
-	public class FontMap : Pango.FontMap {
-		[CCode (has_construct_function = false, type = "PangoFontMap*")]
-		public FontMap ();
-		public void set_default_substitute (owned PangoFT2.SubstituteFunc func);
-		public void set_resolution (double dpi_x, double dpi_y);
-		public void substitute_changed ();
-	}
-	[CCode (cheader_filename = "pango/pangoft2.h", has_target = false)]
-	public delegate void SubstituteFunc (Fc.Pattern pattern, void* data);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static int font_get_kerning (Pango.Font font, Pango.Glyph left, Pango.Glyph right);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static Pango.Glyph get_unknown_glyph (Pango.Font font);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void render (FT.Bitmap bitmap, Pango.Font font, Pango.GlyphString glyphs, int x, int y);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void render_layout (FT.Bitmap bitmap, Pango.Layout layout, int x, int y);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void render_layout_line (FT.Bitmap bitmap, Pango.LayoutLine line, int x, int y);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void render_layout_line_subpixel (FT.Bitmap bitmap, Pango.LayoutLine line, int x, int y);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void render_layout_subpixel (FT.Bitmap bitmap, Pango.Layout layout, int x, int y);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void render_transformed (FT.Bitmap bitmap, Pango.Matrix matrix, Pango.Font font, Pango.GlyphString glyphs, int x, int y);
-	[CCode (cheader_filename = "pango/pangoft2.h")]
-	public static void shutdown_display ();
-}
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 14c8f1ba..d45b98dd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,12 +22,12 @@ indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \
                                        --pkg pangocairo           \
                                        --pkg gtk+-3.0             \
                                        --pkg GDesktopEnums-3.0    \
-                                       --pkg gnome-desktop-3.0    \
+                                       --pkg GnomeDesktop-3.0     \
                                        --pkg Xkl-1.0              \
                                        --pkg Gkbd-3.0             \
                                        --pkg ibus-1.0             \
-                                       --pkg fcitx                \
-                                       --pkg accountsservice      \
+                                       --pkg Fcitx-1.0            \
+                                       --pkg AccountsService-1.0  \
                                        --pkg liblightdm-gobject-1
 indicator_keyboard_service_CFLAGS = $(AM_CFLAGS)              \
                                     $(GEE_CFLAGS)             \
-- 
cgit v1.2.3