Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop all Vapi files that are already included with Vala #392

Merged
merged 1 commit into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/panel/applets/keyboard-layout/KeyboardLayoutApplet.vala
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ class InputSource {
}

/* Get useful display string */
string? language = Gnome.get_language_from_code(engine.language, null);
string? language = Gnome.Languages.get_language_from_code(engine.language, null);
if (language == null) {
language = Gnome.get_language_from_locale(engine.language, null);
language = Gnome.Languages.get_language_from_locale(engine.language, null);
}
this.description = "%s (%s)".printf(language, engine.name);

Expand All @@ -172,7 +172,6 @@ class InputSource {
}
}


class InputSourceMenuItem : Gtk.Button {
private Gtk.Label tick_label;
public uint idx;
Expand Down Expand Up @@ -441,8 +440,8 @@ public class KeyboardLayoutApplet : Budgie.Applet {
locale = DEFAULT_LOCALE;
}

if (!Gnome.get_input_source_from_locale(locale, out type, out id)) {
Gnome.get_input_source_from_locale(DEFAULT_LOCALE, out type, out id);
if (!Gnome.Languages.get_input_source_from_locale(locale, out type, out id)) {
Gnome.Languages.get_input_source_from_locale(DEFAULT_LOCALE, out type, out id);
}

try {
Expand Down
2 changes: 0 additions & 2 deletions src/panel/applets/keyboard-layout/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ applet_keyboardlayout_deps = [
dep_gtk3,
dep_peas,
dep_gnomedesktop,
dep_gsettings,
dep_ibus,
link_libpanelplugin,
]
Expand All @@ -32,7 +31,6 @@ shared_library(
'--pkg', 'gtk+-3.0',
'--pkg', 'ibus-1.0',
'--pkg', 'gnome-desktop-3.0',
'--pkg', 'gsettings-desktop-schemas',
'--vapidir', join_paths(meson.source_root(), 'vapi'),
],
c_args: [
Expand Down
4 changes: 2 additions & 2 deletions src/wm/keyboard.vala
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ namespace Budgie {
locale = DEFAULT_LOCALE;
}

if (!Gnome.get_input_source_from_locale(locale, out type, out id)) {
Gnome.get_input_source_from_locale(DEFAULT_LOCALE, out type, out id);
if (!Gnome.Languages.get_input_source_from_locale(locale, out type, out id)) {
Gnome.Languages.get_input_source_from_locale(DEFAULT_LOCALE, out type, out id);
}

if (xkb.get_layout_info(id, out display_name, out short_name, out xkb_layout, out xkb_variant)) {
Expand Down
2 changes: 0 additions & 2 deletions src/wm/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ budgie_wm_deps = [
dep_giounix,
dep_mutter,
dep_gnomedesktop,
dep_gsettings,
dep_ibus,
]

Expand All @@ -65,7 +64,6 @@ budgie_wm_vala_args = [
'--pkg', 'gnome-desktop-3.0',
'--pkg', vapi_mutter,
'--pkg', 'budgie-config',
'--pkg', 'gsettings-desktop-schemas',
'--vapidir', join_paths(meson.source_root(), 'vapi'),
'--vapidir', dir_libconfig,
budgie_wm_status_vala_args,
Expand Down
2 changes: 0 additions & 2 deletions vapi/gio-2.0.deps

This file was deleted.

4,975 changes: 0 additions & 4,975 deletions vapi/gio-2.0.vapi

This file was deleted.

1 change: 0 additions & 1 deletion vapi/gio-unix-2.0.deps

This file was deleted.

189 changes: 0 additions & 189 deletions vapi/gio-unix-2.0.vapi

This file was deleted.

Loading