Various cleanup changes

- Move (*Object).GetProperty to call.go
- Don't export SessionBusPlatform
- Remove (*Conn).Unexport

Author: guelfey

call.go

@@ -48,6 +48,27 @@ func (o *Object) Call(method string, flags Flags, args ...interface{}) *Call {
 	return <-o.Go(method, flags, make(chan *Call, 1), args...).Done
 }
 
+// GetProperty calls org.freedesktop.DBus.Properties.GetProperty on the given
+// object. The property name must be given in interface.member notation.
+func (o *Object) GetProperty(p string) (Variant, error) {
+	idx := strings.LastIndex(p, ".")
+	if idx == -1 || idx+1 == len(p) {
+		return Variant{}, errors.New("dbus: invalid property " + p)
+	}
+
+	iface := p[:idx]
+	prop := p[idx+1:]
+
+	result := Variant{}
+	err := obj.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
+
+	if err != nil {
+		return Variant{}, err
+	}
+
+	return result, nil
+}
+
 // Go calls a method with the given arguments asynchronously. It returns a
 // Call structure representing this method call. The passed channel will
 // return the same value once the call is done. If ch is nil, a new channel

conn.go

@@ -96,7 +96,7 @@ func SessionBusPrivate() (*Conn, error) {
 		return Dial(address)
 	}
 
-	return SessionBusPlatform()
+	return sessionBusPlatform()
 }
 
 // SystemBus returns a shared connection to the system bus, connecting to it if
@@ -490,26 +490,6 @@ func (conn *Conn) Signal(ch chan<- *Signal) {
 	conn.signalsLck.Unlock()
 }
 
-func (obj *Object) GetProperty(p string) (Variant, error) {
-
-	idx := strings.LastIndex(p, ".")
-	if idx == -1 || idx+1 == len(p) {
-		return Variant{}, errors.New("dbus: invalid property " + p)
-	}
-
-	iface := p[:idx]
-	prop := p[idx+1:]
-
-	result := Variant{}
-	err := obj.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
-
-	if err != nil {
-		return Variant{}, err
-	}
-
-	return result, nil
-}
-
 // SupportsUnixFDs returns whether the underlying transport supports passing of
 // unix file descriptors. If this is false, method calls containing unix file
 // descriptors will return an error and emitted signals containing them will

conn_darwin.go

@@ -5,7 +5,7 @@ import (
 	"os/exec"
 )
 
-func SessionBusPlatform() (*Conn, error) {
+func sessionBusPlatform() (*Conn, error) {
 	cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
 	b, err := cmd.CombinedOutput()
 

conn_other.go

@@ -8,7 +8,7 @@ import (
 	"os/exec"
 )
 
-func SessionBusPlatform() (*Conn, error) {
+func sessionBusPlatform() (*Conn, error) {
 	cmd := exec.Command("dbus-launch")
 	b, err := cmd.CombinedOutput()
 

export.go

@@ -254,11 +254,6 @@ func (conn *Conn) RequestName(name string, flags RequestNameFlags) (RequestNameR
 	return RequestNameReply(r), nil
 }
 
-func (conn *Conn) Unexport(path ObjectPath, iface string) {
-	conn.handlersLck.Lock()
-	conn.handlersLck.Unlock()
-}
-
 // ReleaseNameReply is the reply to a ReleaseName call.
 type ReleaseNameReply uint32