Permalink
Browse files

Update with new package locations.

otr has landed in go.crypto and exp/terminal moved into ssh.
  • Loading branch information...
1 parent cecb2d3 commit a12b07faded610b01200e03dea0e2803c89fb4f3 Adam Langley committed Jun 14, 2012
Showing with 9 additions and 7 deletions.
  1. +4 −3 config.go
  2. +2 −1 input.go
  3. +3 −3 ui.go
View
@@ -7,13 +7,14 @@ import (
"encoding/json"
"errors"
"exp/proxy"
- "exp/terminal"
- "github.com/agl/xmpp"
- "gocrypto.googlecode.com/git/otr"
"io/ioutil"
"net/url"
"strconv"
"strings"
+
+ "code.google.com/p/go.crypto/otr"
+ "code.google.com/p/go.crypto/ssh/terminal"
+ "github.com/agl/xmpp"
)
type Config struct {
View
@@ -2,11 +2,12 @@ package main
import (
"bytes"
- "exp/terminal"
"reflect"
"strconv"
"strings"
"sync"
+
+ "code.google.com/p/go.crypto/ssh/terminal"
)
type uiCommand struct {
View
6 ui.go
@@ -5,7 +5,6 @@ import (
"encoding/xml"
"errors"
"exp/proxy"
- "exp/terminal"
"flag"
"fmt"
"io"
@@ -20,7 +19,8 @@ import (
"time"
"github.com/agl/xmpp"
- "gocrypto.googlecode.com/git/otr"
+ "code.google.com/p/go.crypto/otr"
+ "code.google.com/p/go.crypto/ssh/terminal"
)
var configFile *string = flag.String("config-file", "", "Location of the config file")
@@ -559,7 +559,7 @@ func (s *Session) processClientMessage(stanza *xmpp.ClientMessage) {
s.conversations[from] = conversation
}
- out, encrypted, change, toSend, err := conversation.Process([]byte(stanza.Body))
+ out, encrypted, change, toSend, err := conversation.Receive([]byte(stanza.Body))
if err != nil {
alert(s.term, "While processing message from "+from+": "+err.Error())
}

0 comments on commit a12b07f

Please sign in to comment.