Skip to content

Commit

Permalink
Merge branch 'main' into danirabbit/updatemanager-updates-number
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored Feb 17, 2024
2 parents 235cdad + 82660f5 commit 38b792b
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
runs-on: ubuntu-22.04
container:
image: ghcr.io/elementary/docker:next-unstable
image: ghcr.io/elementary/docker:development-target

steps:
- name: Install git
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You'll need the following dependencies:
* libflatpak-dev (>= 1.0.7)
* libgee-0.8-dev
* libgranite-7-dev (>=7.1.0)
* libgtk-4-dev
* libgtk-4-dev (>=4.10)
* libjson-glib-dev
* libpackagekit-glib2-dev
* libpolkit-gobject-1-dev
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ glib = dependency ('glib-2.0')
gobject = dependency ('gobject-2.0')
gio = dependency ('gio-2.0')
gee = dependency ('gee-0.8')
gtk = dependency ('gtk4')
gtk = dependency ('gtk4', version: '>=4.10')
granite = dependency ('granite-7', version: '>=7.3.0')
adwaita = dependency('libadwaita-1')
appstream = dependency ('appstream', version: '>=0.15.2')
Expand Down
6 changes: 1 addition & 5 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,7 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow {
network_monitor.bind_property ("network-available", network_info_bar, "revealed", BindingFlags.INVERT_BOOLEAN | BindingFlags.SYNC_CREATE);

network_info_bar.response.connect (() => {
try {
Gtk.show_uri (this, "settings://network", Gdk.CURRENT_TIME);
} catch (GLib.Error e) {
critical (e.message);
}
new Gtk.UriLauncher ("settings://network").launch.begin (this, null);
});

updates_button.clicked.connect (() => {
Expand Down
5 changes: 4 additions & 1 deletion src/Views/AppInfoView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,10 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
append (button);

button.clicked.connect (() => {
Gtk.show_uri ((Gtk.Window) get_root (), uri, Gdk.CURRENT_TIME);
new Gtk.UriLauncher (uri).launch.begin (
(Gtk.Window) get_root (),
null
);
});
} else {
append (box);
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/SharePopover.vala
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public class SharePopover : Gtk.Popover {

private void show_uri (string uri) {
var main_window = ((Gtk.Application) Application.get_default ()).active_window;
Gtk.show_uri (main_window, uri, Gdk.CURRENT_TIME);
new Gtk.UriLauncher (uri).launch.begin (main_window, null);
popdown ();
}
}

0 comments on commit 38b792b

Please sign in to comment.