diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt index 25e407a..a32a086 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt @@ -22,6 +22,7 @@ import io.gitlab.jfronny.inceptum.launcher.system.launch.LaunchType import io.gitlab.jfronny.inceptum.launcher.system.setup.Steps import io.gitlab.jfronny.inceptum.launcher.util.ProcessState import org.gnome.gio.Cancellable +import org.gnome.gio.Menu import org.gnome.gtk.* import java.awt.Toolkit import java.awt.datatransfer.DataFlavor @@ -67,7 +68,7 @@ object GtkMenubar { file.button("exit") { app.quit() } launchMenu = menu.submenu("launch") generateLaunchMenu(app) - accountsMenu = menu.submenu("account") + accountsMenu = MenuBuilder(app, Menu(), "account") // this should ideally be menu.submenu("account"), but that causes a segfault generateAccountsMenu(app) val help = menu.submenu("help") help.button("about") { AboutWindow.createAndShow() } diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt index 2a4dd93..667f10d 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt @@ -1,11 +1,11 @@ package io.gitlab.jfronny.inceptum.gtk.menu +import io.github.jwharm.javagi.glib.types.VariantTypes import io.gitlab.jfronny.commons.throwable.ThrowingRunnable import io.gitlab.jfronny.inceptum.gtk.util.I18n import io.gitlab.jfronny.inceptum.gtk.util.Log import org.gnome.gio.* import org.gnome.glib.Variant -import org.gnome.glib.VariantType import org.gnome.gtk.Application import org.gnome.gtk.MenuButton import org.gnome.gtk.PopoverMenu @@ -88,7 +88,7 @@ class MenuBuilder private constructor(map: ActionMap, menu: Menu, prefix: String ): BuiltRadioItem { var name = name name = prefix + name - val action = SimpleAction.newStateful(name, VariantType("i"), Variant.newInt32(options.indexOf(initial))) + val action = SimpleAction.newStateful(name, VariantTypes.INT32, Variant.newInt32(options.indexOf(initial))) addAction(name, action) action.onActivate { variant: Variant? -> action.state = variant