Skip to content

Prepare for GLib 2.86.0 typelib break #13091

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.

Sign up for GitHub

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

Merged
mtwebster merged 2 commits into from
Sep 15, 2025
Merged

Prepare for GLib 2.86.0 typelib break #13091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e40c404
js: Use DesktopAppInfo form GioUnix, not Gio
3v1n0 Sep 11, 2025
8f20400
meson: Build dependency on 2.79.2
3v1n0 Sep 12, 2025
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
18 changes: 9 additions & 9 deletions files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,10 @@ def __init__(self):

while self.this_item is not None and count_up < len(apps):
self.this_item = apps[count_up]
cat_val = Gio.DesktopAppInfo.get_categories(self.this_item)
exec_val = Gio.DesktopAppInfo.get_string(self.this_item, "Exec")
name_val = Gio.DesktopAppInfo.get_string(self.this_item, "Name")
icon_val = Gio.DesktopAppInfo.get_string(self.this_item, "Icon")
cat_val = GioUnix.DesktopAppInfo.get_categories(self.this_item)
exec_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Exec")
name_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Name")
icon_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Icon")
# terminals don't have mime types, so we check for "TerminalEmulator" under the "Category" key in desktop files
if cat_val is not None and "TerminalEmulator" in cat_val:
# this crazy if statement makes sure remaining desktop file info is not empty, then prevents root terminals from showing, then prevents repeating terminals from trying to being added which leave a blank space and Gtk-WARNING's
Expand Down Expand Up @@ -364,11 +364,11 @@ def __init__(self):

while self.this_item is not None and count_up < len(apps):
self.this_item = apps[count_up]
cat_val = Gio.DesktopAppInfo.get_categories(self.this_item)
exec_val = Gio.DesktopAppInfo.get_string(self.this_item, "Exec")
name_val = Gio.DesktopAppInfo.get_string(self.this_item, "Name")
icon_val = Gio.DesktopAppInfo.get_string(self.this_item, "Icon")
comment_val = Gio.DesktopAppInfo.get_string(self.this_item, "Comment")
cat_val = GioUnix.DesktopAppInfo.get_categories(self.this_item)
exec_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Exec")
name_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Name")
icon_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Icon")
comment_val = GioUnix.DesktopAppInfo.get_string(self.this_item, "Comment")
#calculators don't have mime types, so we check for "Calculator" under the "Category" key in desktop files
if (cat_val is not None and "Calculator" in cat_val) or \
(exec_val is not None and "alculator" in exec_val.lower()) or \
Expand Down
3 changes: 2 additions & 1 deletion js/ui/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@

const Clutter = imports.gi.Clutter;
const Gio = imports.gi.Gio;
const GioUnix = imports.gi.GioUnix;
const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk;
const Mainloop = imports.mainloop;
Expand Down Expand Up @@ -312,7 +313,7 @@ function start() {
// Chain up async errors reported from C
global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });

Gio.DesktopAppInfo.set_desktop_env('X-Cinnamon');
GioUnix.DesktopAppInfo.set_desktop_env('X-Cinnamon');

Clutter.get_default_backend().set_input_method(new InputMethod.InputMethod());

Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ atk = dependency('atk-bridge-2.0')
gio = dependency('gio-2.0', version: '>= 2.36.0')
gio_unix = dependency('gio-unix-2.0')
gl = dependency('gl')
glib_version = '2.52.0'
glib_version = '2.79.2'
glib = dependency('glib-2.0', version: '>= ' + glib_version)
gtk = dependency('gtk+-3.0', version: '>= 3.12.0')
muffin = dependency('libmuffin-0', version: '>= 5.2.0')
Expand Down
Loading