fix: prevent segfault by not exporting account menu.
Why does this work? No idea. But it seems to fix the crash.
This commit is contained in:
parent
475717b6b4
commit
c94c8b59af
|
@ -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.system.setup.Steps
|
||||||
import io.gitlab.jfronny.inceptum.launcher.util.ProcessState
|
import io.gitlab.jfronny.inceptum.launcher.util.ProcessState
|
||||||
import org.gnome.gio.Cancellable
|
import org.gnome.gio.Cancellable
|
||||||
|
import org.gnome.gio.Menu
|
||||||
import org.gnome.gtk.*
|
import org.gnome.gtk.*
|
||||||
import java.awt.Toolkit
|
import java.awt.Toolkit
|
||||||
import java.awt.datatransfer.DataFlavor
|
import java.awt.datatransfer.DataFlavor
|
||||||
|
@ -67,7 +68,7 @@ object GtkMenubar {
|
||||||
file.button("exit") { app.quit() }
|
file.button("exit") { app.quit() }
|
||||||
launchMenu = menu.submenu("launch")
|
launchMenu = menu.submenu("launch")
|
||||||
generateLaunchMenu(app)
|
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)
|
generateAccountsMenu(app)
|
||||||
val help = menu.submenu("help")
|
val help = menu.submenu("help")
|
||||||
help.button("about") { AboutWindow.createAndShow() }
|
help.button("about") { AboutWindow.createAndShow() }
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package io.gitlab.jfronny.inceptum.gtk.menu
|
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.commons.throwable.ThrowingRunnable
|
||||||
import io.gitlab.jfronny.inceptum.gtk.util.I18n
|
import io.gitlab.jfronny.inceptum.gtk.util.I18n
|
||||||
import io.gitlab.jfronny.inceptum.gtk.util.Log
|
import io.gitlab.jfronny.inceptum.gtk.util.Log
|
||||||
import org.gnome.gio.*
|
import org.gnome.gio.*
|
||||||
import org.gnome.glib.Variant
|
import org.gnome.glib.Variant
|
||||||
import org.gnome.glib.VariantType
|
|
||||||
import org.gnome.gtk.Application
|
import org.gnome.gtk.Application
|
||||||
import org.gnome.gtk.MenuButton
|
import org.gnome.gtk.MenuButton
|
||||||
import org.gnome.gtk.PopoverMenu
|
import org.gnome.gtk.PopoverMenu
|
||||||
|
@ -88,7 +88,7 @@ class MenuBuilder private constructor(map: ActionMap, menu: Menu, prefix: String
|
||||||
): BuiltRadioItem<T> {
|
): BuiltRadioItem<T> {
|
||||||
var name = name
|
var name = name
|
||||||
name = prefix + 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)
|
addAction(name, action)
|
||||||
action.onActivate { variant: Variant? ->
|
action.onActivate { variant: Variant? ->
|
||||||
action.state = variant
|
action.state = variant
|
||||||
|
|
Loading…
Reference in New Issue