diff --git a/assets.go b/assets.go index c764e7a..2d772dd 100644 --- a/assets.go +++ b/assets.go @@ -204,4 +204,5 @@ func init() { } { loadAsset(key, data) } + } diff --git a/gtk-helpers.go b/gtk-helpers.go index 33f26cd..c047643 100644 --- a/gtk-helpers.go +++ b/gtk-helpers.go @@ -42,11 +42,13 @@ func createTab(jid string, isMuc bool, name string) bool { newTab := new(chatTab) newTab.isMuc = isMuc newTab.msgs = gtk.NewListBox() - newTab.msgs.SetVExpand(true) - newTab.msgs.SetShowSeparators(true) + glib.IdleAdd(func() { + newTab.msgs.SetVExpand(true) + newTab.msgs.SetShowSeparators(true) + newTab.msgs.Append(gtk.NewButtonWithLabel(loadedLocale["getPastMessages"])) + }) newTab.name = name - newTab.msgs.Append(gtk.NewButtonWithLabel(loadedLocale["getPastMessages"])) tabs.Store(jid, newTab) return true } @@ -215,7 +217,6 @@ func switchToTab(jid string, w *gtk.Window) { medal.SetHExpand(true) userbox.Append(medal) - default_av := createIdenticon(u.From, false) userbox.Prepend(default_av) var vcu VCardUpdate diff --git a/gtk-message.go b/gtk-message.go index ad132be..2220b9d 100644 --- a/gtk-message.go +++ b/gtk-message.go @@ -12,12 +12,12 @@ import ( "github.com/google/uuid" "github.com/jasonlovesdoggo/gopen" "gosrc.io/xmpp/stanza" + xmpp_color "mellium.im/xmpp/color" "mellium.im/xmpp/jid" "os" "path/filepath" "runtime" "strings" - xmpp_color "mellium.im/xmpp/color" ) func generatePresenceWidget(p stanza.Packet) gtk.Widgetter { @@ -127,7 +127,7 @@ func generateMessageWidget(p stanza.Packet) gtk.Widgetter { enter_custom.SetHExpand(true) enter_custom.ConnectClicked(func() { - client.SendRaw(fmt.Sprintf(` + client.SendRaw(fmt.Sprintf(` %s @@ -137,7 +137,6 @@ func generateMessageWidget(p stanza.Packet) gtk.Widgetter { }) rc_box.Append(custom) rc_box.Append(enter_custom) - quote := gtk.NewButtonWithLabel("Quote") quote.ConnectClicked(func() { diff --git a/main.go b/main.go index 8364b40..700f10e 100644 --- a/main.go +++ b/main.go @@ -405,7 +405,7 @@ func main() { // The code is basically the exact same as above, we just don't check for mucuser // TODO: Presence handling code goes here - j := presence.From + j := presence.From tab, ok := tabs.Load(j) if ok { typed_tab, ok := tab.(*chatTab) diff --git a/types.go b/types.go index c4fc728..cfaf96b 100644 --- a/types.go +++ b/types.go @@ -2,9 +2,9 @@ package main import ( "github.com/diamondburned/gotk4/pkg/gtk/v4" + "gosrc.io/xmpp/stanza" "mellium.im/xmpp/color" "sync" - "gosrc.io/xmpp/stanza" ) type chatTab struct { @@ -27,7 +27,7 @@ type lambdaConfig struct { Identicons bool Debug bool ShowPresenceUpdates bool - CompactMode bool + CompactMode bool CustomNicks map[string]string } diff --git a/xmpp-ping.go b/xmpp-ping.go index a6c273f..918a194 100644 --- a/xmpp-ping.go +++ b/xmpp-ping.go @@ -10,7 +10,7 @@ import ( type Ping struct { stanza.IQ - XMLName xml.Name `xml:"urn:xmpp:ping ping"` + XMLName xml.Name `xml:"urn:xmpp:ping ping"` ResultSet *stanza.ResultSet `xml:"set,omitempty"` } diff --git a/xmpp-vcard.go b/xmpp-vcard.go index 7bbdafa..98eca16 100644 --- a/xmpp-vcard.go +++ b/xmpp-vcard.go @@ -51,4 +51,3 @@ func init() { stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{Space: "vcard-temp", Local: "vCard"}, VCard{}) stanza.TypeRegistry.MapExtension(stanza.PKTPresence, xml.Name{Space: "vcard-temp:x:update", Local: "x"}, VCardUpdate{}) } -