Skip to content

Commit

Permalink
Renames resourceID because styling.
Browse files Browse the repository at this point in the history
  • Loading branch information
iapazmino committed Sep 22, 2017
1 parent 7c95c38 commit 2ab8eb3
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions gui/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,24 @@ func (account *account) ID() string {

func (account *account) getConversationWith(to, resource string, ui *gtkUI) (conversationView, bool) {
peer, _ := ui.getPeer(account, to)
resourceId := to
resourceID := to
if "" != resource {
resourceId = to + "/" + resource
resourceID = to + "/" + resource
}

c, ok := account.conversations[resourceId]
c, ok := account.conversations[resourceID]

if ok {
_, unifiedType := c.(*conversationStackItem)

if ui.settings.GetSingleWindow() && !unifiedType {
cv1 := c.(*conversationWindow)
c = ui.unified.createConversation(account, to, resource, cv1.conversationPane)
account.conversations[resourceId] = c
account.conversations[resourceID] = c
} else if !ui.settings.GetSingleWindow() && unifiedType {
cv1 := c.(*conversationStackItem)
c = newConversationWindow(account, peer.NameForPresentation(), ui, cv1.conversationPane)
account.conversations[resourceId] = c
account.conversations[resourceID] = c
}
}

Expand All @@ -91,18 +91,18 @@ func (account *account) createConversationView(to, resource string, ui *gtkUI) c
} else {
cv = newConversationWindow(account, peer.NameForPresentation(), ui, nil)
}
resourceId := to
resourceID := to
if "" != resource {
resourceId = to + "/" + resource
resourceID = to + "/" + resource
}
account.conversations[resourceId] = cv
account.conversations[resourceID] = cv

account.delayedConversationsLock.Lock()
defer account.delayedConversationsLock.Unlock()
for _, f := range account.delayedConversations[resourceId] {
for _, f := range account.delayedConversations[resourceID] {
f(cv)
}
delete(account.delayedConversations, resourceId)
delete(account.delayedConversations, resourceID)

return cv
}
Expand Down

0 comments on commit 2ab8eb3

Please sign in to comment.