Merge lp:~sergiusens/account-polld/qtcontact into lp:~ubuntu-push-hackers/account-polld/trunk

[Sergio Schvezov]

Adding gmail avatar's through QtContacts

This seems to work standalone but falls short when integrated; I am thinking it's a Qt versus glib mainloop problem here.

I haven't done this in callback mode yet; not sure if it's worth it; please advice.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/account-polld-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/72/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

[lp:~sergiusens/account-polld/qtcontact]

39. By Sergio Schvezov on 2014-08-25

Merging poll

[Manuel de la Peña (mandel)]

review: Approve

Unmerged revisions

=== modified file 'accounts/accounts.go'
--- accounts/accounts.go	2014-07-25 20:09:20 +0000
+++ accounts/accounts.go	2014-08-25 14:55:20 +0000
@@ -50,18 +50,10 @@
 }
 
 var (
-	mainLoopOnce     sync.Once
 	authChannels     = make(map[*C.AccountWatcher]chan<- AuthData)
 	authChannelsLock sync.Mutex
 )
 
-func startMainLoop() {
-	mainLoopOnce.Do(func() {
-		mainLoop := C.g_main_loop_new(nil, C.gboolean(1))
-		go C.g_main_loop_run(mainLoop)
-	})
-}
-
 // NewWatcher creates a new account watcher for the given service names
 func NewWatcher(serviceType string) *Watcher {
 	w := new(Watcher)
@@ -75,8 +67,6 @@
 	authChannels[w.watcher] = ch
 	authChannelsLock.Unlock()
 
-	startMainLoop()
-
 	return w
 }
 

=== modified file 'cmd/account-polld/account_manager.go'
--- cmd/account-polld/account_manager.go	2014-08-05 20:14:24 +0000
+++ cmd/account-polld/account_manager.go	2014-08-25 14:55:20 +0000
@@ -19,8 +19,6 @@
 
 import (
 	"log"
-	"os"
-	"strconv"
 	"time"
 
 	"launchpad.net/account-polld/accounts"
@@ -29,62 +27,74 @@
 )
 
 type AccountManager struct {
-	watcher   *accounts.Watcher
-	authData  accounts.AuthData
-	plugin    plugins.Plugin
-	interval  time.Duration
-	postWatch chan *PostWatch
-	authChan  chan accounts.AuthData
+	watcher      *accounts.Watcher
+	authData     accounts.AuthData
+	plugin       plugins.Plugin
+	interval     time.Duration
+	postWatch    chan *PostWatch
+	authChan     chan accounts.AuthData
+	doneChan     chan error
+	penaltyCount int
 }
 
 var (
-	pollInterval = time.Duration(5 * time.Minute)
-	maxInterval  = time.Duration(20 * time.Minute)
+	pollTimeout          = time.Duration(30 * time.Second)
+	bootstrapPollTimeout = time.Duration(5 * time.Minute)
+	maxCounter           = 4
 )
 
-func init() {
-	if intervalEnv := os.Getenv("ACCOUNT_POLLD_POLL_INTERVAL_MINUTES"); intervalEnv != "" {
-		if interval, err := strconv.ParseInt(intervalEnv, 0, 0); err == nil {
-			pollInterval = time.Duration(interval) * time.Minute
-		}
-	}
-}
-
 func NewAccountManager(watcher *accounts.Watcher, postWatch chan *PostWatch, plugin plugins.Plugin) *AccountManager {
 	return &AccountManager{
 		watcher:   watcher,
 		plugin:    plugin,
-		interval:  pollInterval,
 		postWatch: postWatch,
 		authChan:  make(chan accounts.AuthData, 1),
+		doneChan:  make(chan error, 1),
 	}
 }
 
 func (a *AccountManager) Delete() {
 	close(a.authChan)
+	close(a.doneChan)
 }
 
-func (a *AccountManager) Loop() {
-	var ok bool
-	if a.authData, ok = <-a.authChan; !ok {
+func (a *AccountManager) Poll(bootstrap bool) {
+	if !a.authData.Enabled {
+		var ok bool
+		if a.authData, ok = <-a.authChan; !ok {
+			log.Println("Account", a.authData.AccountId, "no longer enabled")
+			return
+		}
+	}
+	if a.penaltyCount > 0 {
+		log.Printf("Leaving poll for account %d as penaly count is %d", a.authData.AccountId, a.penaltyCount)
+		a.penaltyCount--
 		return
 	}
-	// This is an initial out of loop poll
-	a.poll()
-L:
-	for {
-		log.Println("Next poll set to", a.interval, "for account", a.authData.AccountId)
-		select {
-		case <-time.After(a.interval):
-			a.poll()
-		case a.authData, ok = <-a.authChan:
-			if !ok {
-				break L
+	timeout := pollTimeout
+	if bootstrap {
+		timeout = bootstrapPollTimeout
+	}
+
+	log.Printf("Starting poll for account %d", a.authData.AccountId)
+	go a.poll()
+
+	select {
+	case <-time.After(timeout):
+		log.Println("Poll for account", a.authData.AccountId, "has timed out out after", timeout)
+		a.penaltyCount++
+	case err := <-a.doneChan:
+		if err == nil {
+			log.Println("Poll for account", a.authData.AccountId, "was successful")
+			a.penaltyCount = 0
+		} else {
+			log.Println("Poll for account", a.authData.AccountId, "has failed:", err)
+			if a.penaltyCount < maxCounter {
+				a.penaltyCount++
 			}
-			a.poll()
 		}
 	}
-	log.Printf("Ending poll loop for account %d", a.authData.AccountId)
+	log.Printf("Ending poll for account %d", a.authData.AccountId)
 }
 
 func (a *AccountManager) poll() {
@@ -96,11 +106,6 @@
 		return
 	}
 
-	if !a.authData.Enabled {
-		log.Println("Account", a.authData.AccountId, "no longer enabled")
-		return
-	}
-
 	if a.authData.Error != nil {
 		log.Println("Account", a.authData.AccountId, "failed to authenticate:", a.authData.Error)
 		return
@@ -108,10 +113,6 @@
 
 	if n, err := a.plugin.Poll(&a.authData); err != nil {
 		log.Print("Error while polling ", a.authData.AccountId, ": ", err)
-		// penalizing the next poll
-		if a.interval.Minutes() < maxInterval.Minutes() {
-			a.interval += pollInterval
-		}
 
 		// If the error indicates that the authentication
 		// token has expired, request reauthentication and
@@ -120,13 +121,13 @@
 			a.watcher.Refresh(a.authData.AccountId)
 			a.authData.Enabled = false
 		}
+		a.doneChan <- err
 	} else {
 		log.Println("Account", a.authData.AccountId, "has", len(n), "updates to report")
 		if len(n) > 0 {
 			a.postWatch <- &PostWatch{messages: n, appId: a.plugin.ApplicationId()}
 		}
-		// on success we reset the timeout to the default interval
-		a.interval = pollInterval
+		a.doneChan <- nil
 	}
 }
 

=== modified file 'cmd/account-polld/main.go'
--- cmd/account-polld/main.go	2014-08-08 20:11:14 +0000
+++ cmd/account-polld/main.go	2014-08-25 14:55:20 +0000
@@ -21,6 +21,7 @@
 	"encoding/json"
 	"fmt"
 	"strings"
+	"sync"
 
 	"log"
 
@@ -30,6 +31,8 @@
 	"launchpad.net/account-polld/plugins/facebook"
 	"launchpad.net/account-polld/plugins/gmail"
 	"launchpad.net/account-polld/plugins/twitter"
+	"launchpad.net/account-polld/pollbus"
+	"launchpad.net/account-polld/qtcontact"
 	"launchpad.net/go-dbus/v1"
 )
 
@@ -52,7 +55,16 @@
 	POSTAL_OBJECT_PATH_PART = "/com/ubuntu/Postal/"
 )
 
+var mainLoopOnce sync.Once
+
 func init() {
+	startMainLoop()
+}
+
+func startMainLoop() {
+	mainLoopOnce.Do(func() {
+		go qtcontact.MainLoopStart()
+	})
 }
 
 func main() {
@@ -64,52 +76,73 @@
 	gettext.Textdomain("account-polld")
 	gettext.BindTextdomain("account-polld", "/usr/share/locale")
 
-	if bus, err := dbus.Connect(dbus.SessionBus); err != nil {
+	bus, err := dbus.Connect(dbus.SessionBus)
+	if err != nil {
 		log.Fatal("Cannot connect to bus", err)
-	} else {
-		go postOffice(bus, postWatch)
-	}
-
-	go monitorAccounts(postWatch)
+	}
+
+	pollBus := pollbus.New(bus)
+	go postOffice(bus, postWatch)
+	go monitorAccounts(postWatch, pollBus)
+
+	if err := pollBus.Init(); err != nil {
+		log.Fatal("Issue while setting up the poll bus:", err)
+	}
 
 	done := make(chan bool)
 	<-done
 }
 
-func monitorAccounts(postWatch chan *PostWatch) {
+func monitorAccounts(postWatch chan *PostWatch, pollBus *pollbus.PollBus) {
 	watcher := accounts.NewWatcher(SERVICETYPE_POLL)
 	mgr := make(map[uint]*AccountManager)
+
 L:
-	for data := range watcher.C {
-		if account, ok := mgr[data.AccountId]; ok {
-			if data.Enabled {
-				log.Println("New account data for existing account with id", data.AccountId)
-				account.updateAuthData(data)
-			} else {
-				account.Delete()
-				delete(mgr, data.AccountId)
-			}
-		} else if data.Enabled {
-			var plugin plugins.Plugin
-			switch data.ServiceName {
-			case SERVICENAME_GMAIL:
-				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
-				plugin = gmail.New(data.AccountId)
-			case SERVICENAME_FACEBOOK:
-				// This is just stubbed until the plugin exists.
-				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
-				plugin = facebook.New(data.AccountId)
-			case SERVICENAME_TWITTER:
-				// This is just stubbed until the plugin exists.
-				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
-				plugin = twitter.New()
-			default:
-				log.Println("Unhandled account with id", data.AccountId, "for", data.ServiceName)
-				continue L
-			}
-			mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
-			mgr[data.AccountId].updateAuthData(data)
-			go mgr[data.AccountId].Loop()
+	for {
+		select {
+		case data := <-watcher.C:
+			if account, ok := mgr[data.AccountId]; ok {
+				if data.Enabled {
+					log.Println("New account data for existing account with id", data.AccountId)
+					account.updateAuthData(data)
+				} else {
+					account.Delete()
+					delete(mgr, data.AccountId)
+				}
+			} else if data.Enabled {
+				var plugin plugins.Plugin
+				switch data.ServiceName {
+				case SERVICENAME_GMAIL:
+					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
+					plugin = gmail.New(data.AccountId)
+				case SERVICENAME_FACEBOOK:
+					// This is just stubbed until the plugin exists.
+					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
+					plugin = facebook.New(data.AccountId)
+				case SERVICENAME_TWITTER:
+					// This is just stubbed until the plugin exists.
+					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
+					plugin = twitter.New()
+				default:
+					log.Println("Unhandled account with id", data.AccountId, "for", data.ServiceName)
+					continue L
+				}
+				mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
+				mgr[data.AccountId].updateAuthData(data)
+				mgr[data.AccountId].Poll(true)
+			}
+		case <-pollBus.PollChan:
+			var wg sync.WaitGroup
+			for _, v := range mgr {
+				wg.Add(1)
+				poll := v.Poll
+				go func() {
+					defer wg.Done()
+					poll(false)
+				}()
+			}
+			wg.Wait()
+			pollBus.SignalDone()
 		}
 	}
 }

=== added directory 'cmd/qtcontact-test'
=== added file 'cmd/qtcontact-test/main.go'
--- cmd/qtcontact-test/main.go	1970-01-01 00:00:00 +0000
+++ cmd/qtcontact-test/main.go	2014-08-25 14:55:20 +0000
@@ -0,0 +1,37 @@
+/*
+ Copyright 2014 Canonical Ltd.
+ Authors: Sergio Schvezov <[e-mail]>
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"launchpad.net/account-polld/qtcontact"
+)
+
+func main() {
+	qtcontact.MainLoopStart()
+
+	if len(os.Args) != 2 {
+		fmt.Println("usage:", os.Args[0], "[email address]")
+		os.Exit(1)
+	}
+
+	path := qtcontact.GetAvatar(os.Args[1])
+	fmt.Println("Avatar found:", path)
+}

=== modified file 'debian/control'
--- debian/control	2014-07-31 18:08:37 +0000
+++ debian/control	2014-08-25 14:55:20 +0000
@@ -13,6 +13,9 @@
                libaccounts-glib-dev,
                libclick-0.4-dev,
                libsignon-glib-dev,
+               qt5-default,
+               qtbase5-dev,
+               qtpim5-dev,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/account-polld
 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/account-polld/trunk/files

=== modified file 'debian/rules' (properties changed: +x to -x)
=== modified file 'plugins/gmail/gmail.go'
--- plugins/gmail/gmail.go	2014-08-08 20:11:14 +0000
+++ plugins/gmail/gmail.go	2014-08-25 14:55:20 +0000
@@ -32,6 +32,7 @@
 	"launchpad.net/account-polld/accounts"
 	"launchpad.net/account-polld/gettext"
 	"launchpad.net/account-polld/plugins"
+	"launchpad.net/account-polld/qtcontact"
 )
 
 const (
@@ -141,9 +142,12 @@
 		hdr := msg.Payload.mapHeaders()
 
 		from := hdr[hdrFROM]
+		var avatarPath string
+
 		if emailAddress, err := mail.ParseAddress(hdr[hdrFROM]); err == nil {
 			if emailAddress.Name != "" {
 				from = emailAddress.Name
+				avatarPath = qtcontact.GetAvatar(emailAddress.Address)
 			}
 		}
 		msgStamp := hdr.getTimestamp()
@@ -159,7 +163,7 @@
 			// fmt with label personal and threadId
 			action := fmt.Sprintf(gmailDispatchUrl, "personal", msg.ThreadId)
 			epoch := hdr.getEpoch()
-			pushMsgMap[msg.ThreadId] = *plugins.NewStandardPushMessage(summary, body, action, "", epoch)
+			pushMsgMap[msg.ThreadId] = *plugins.NewStandardPushMessage(summary, body, action, avatarPath, epoch)
 		} else {
 			log.Print("gmail plugin ", p.accountId, ": skipping message id ", msg.Id, " with date ", msgStamp, " older than ", timeDelta)
 		}

=== added directory 'pollbus'
=== added file 'pollbus/bus.go'
--- pollbus/bus.go	1970-01-01 00:00:00 +0000
+++ pollbus/bus.go	2014-08-25 14:55:20 +0000
@@ -0,0 +1,94 @@
+/*
+ Copyright 2014 Canonical Ltd.
+ Authors: Sergio Schvezov <[e-mail]>
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package pollbus
+
+import (
+	"fmt"
+	"runtime"
+
+	"log"
+
+	"launchpad.net/go-dbus/v1"
+)
+
+const (
+	busInterface = "com.ubuntu.AccountPolld"
+	busPath      = "/com/ubuntu/AccountPolld"
+	busName      = "com.ubuntu.AccountPolld"
+)
+
+type PollBus struct {
+	conn     *dbus.Connection
+	msgChan  chan *dbus.Message
+	PollChan chan bool
+}
+
+func New(conn *dbus.Connection) *PollBus {
+	p := &PollBus{
+		conn:     conn,
+		msgChan:  make(chan *dbus.Message),
+		PollChan: make(chan bool),
+	}
+	runtime.SetFinalizer(p, clean)
+	return p
+}
+
+func clean(p *PollBus) {
+	p.conn.UnregisterObjectPath(busPath)
+	close(p.msgChan)
+	close(p.PollChan)
+}
+
+func (p *PollBus) Init() error {
+	name := p.conn.RequestName(busName, dbus.NameFlagDoNotQueue)
+	err := <-name.C
+	if err != nil {
+		return fmt.Errorf("bus name could not be take: %s", err)
+	}
+
+	go p.watchMethodCalls()
+	p.conn.RegisterObjectPath(busPath, p.msgChan)
+
+	return nil
+}
+
+func (p *PollBus) SignalDone() error {
+	signal := dbus.NewSignalMessage(busPath, busInterface, "Done")
+	if err := p.conn.Send(signal); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (p *PollBus) watchMethodCalls() {
+	for msg := range p.msgChan {
+		var reply *dbus.Message
+		switch {
+		case msg.Interface == busInterface && msg.Member == "Poll":
+			log.Println("Received Poll()")
+			p.PollChan <- true
+			reply = dbus.NewMethodReturnMessage(msg)
+		default:
+			log.Println("Received unkown method call on", msg.Interface, msg.Member)
+			reply = dbus.NewErrorMessage(msg, "org.freedesktop.DBus.Error.UnknownMethod", "Unknown method")
+		}
+		if err := p.conn.Send(reply); err != nil {
+			log.Println("Could not send reply:", err)
+		}
+	}
+}

=== added directory 'qtcontact'
=== added file 'qtcontact/contacts.go'
--- qtcontact/contacts.go	1970-01-01 00:00:00 +0000
+++ qtcontact/contacts.go	2014-08-25 14:55:20 +0000
@@ -0,0 +1,68 @@
+/*
+ Copyright 2014 Canonical Ltd.
+ Authors: Sergio Schvezov <[e-mail]>
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package qtcontact
+
+// #cgo CXXFLAGS: -std=c++0x -pedantic-errors -Wall -fno-strict-aliasing -I/usr/share/c++/4.8
+// #cgo LDFLAGS: -lstdc++
+// #cgo pkg-config: Qt5Core Qt5Contacts
+// #include "qtcontacts.h"
+import "C"
+
+import (
+	"log"
+	"sync"
+	"time"
+)
+
+var (
+	avatarPathChan chan string
+	m              sync.Mutex
+)
+
+//export callback
+func callback(path *C.char) {
+	avatarPathChan <- C.GoString(path)
+}
+
+func MainLoopStart() {
+	go C.mainloopStart()
+}
+
+// GetAvatar retrieves an avatar path for the specified email
+// address. Multiple calls to this func will be in sync
+func GetAvatar(emailAddress string) string {
+	if emailAddress == "" {
+		return ""
+	}
+
+	m.Lock()
+	defer m.Unlock()
+
+	avatarPathChan = make(chan string, 1)
+	defer close(avatarPathChan)
+
+	C.getAvatar(C.CString(emailAddress))
+
+	select {
+	case <-time.After(3 * time.Second):
+		log.Println("Timeout while seeking avatar for", emailAddress)
+		return ""
+	case path := <-avatarPathChan:
+		return path
+	}
+}

=== added file 'qtcontact/qtcontacts.cpp'
--- qtcontact/qtcontacts.cpp	1970-01-01 00:00:00 +0000
+++ qtcontact/qtcontacts.cpp	2014-08-25 14:55:20 +0000
@@ -0,0 +1,69 @@
+/*
+ Copyright 2014 Canonical Ltd.
+ Authors: Sergio Schvezov <[e-mail]>
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <QContactManager>
+#include <QContactFilter>
+#include <QContactEmailAddress>
+#include <QContactDetailFilter>
+#include <QContactManager>
+#include <QContactAvatar>
+#include <QCoreApplication>
+#include <QScopedPointer>
+#include <QTimer>
+#include <thread>
+
+#include "qtcontacts.h"
+#include "qtcontacts.hpp"
+#include "qtcontacts.moc"
+
+#ifdef __cplusplus
+extern "C" {
+#include "_cgo_export.h"
+}
+#endif
+
+QTCONTACTS_USE_NAMESPACE
+
+int mainloopStart() {
+    static char empty[1] = {0};
+    static char *argv[] = {empty, empty, empty};
+    static int argc = 1;
+
+    QCoreApplication mApp(argc, argv);
+    return mApp.exec();
+}
+
+void getAvatar(char *email) {
+    QScopedPointer<Avatar> avatar(new Avatar());
+    avatar->retrieveThumbnail(QString(email));
+}
+
+void Avatar::retrieveThumbnail(const QString& email) {
+    QString avatar;
+
+    QContactManager manager ("galera");
+    QContactDetailFilter filter(QContactEmailAddress::match(email));
+    QList<QContact> contacts = manager.contacts(filter);
+    if(contacts.size() > 0) {
+        avatar = contacts[0].detail<QContactAvatar>().imageUrl().path();
+    }
+
+    QByteArray byteArray = avatar.toUtf8();
+    char* cString = byteArray.data();
+
+    callback(cString);
+}

=== added file 'qtcontact/qtcontacts.h'
--- qtcontact/qtcontacts.h	1970-01-01 00:00:00 +0000
+++ qtcontact/qtcontacts.h	2014-08-25 14:55:20 +0000
@@ -0,0 +1,32 @@
+/*
+ Copyright 2014 Canonical Ltd.
+ Authors: Sergio Schvezov <[e-mail]>
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __QTCONTACTS_GOLANG__
+#define __QTCONTACTS_GOLANG__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void getAvatar(char *);
+int mainloopStart();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== added file 'qtcontact/qtcontacts.hpp'
--- qtcontact/qtcontacts.hpp	1970-01-01 00:00:00 +0000
+++ qtcontact/qtcontacts.hpp	2014-08-25 14:55:20 +0000
@@ -0,0 +1,33 @@
+/*
+ Copyright 2014 Canonical Ltd.
+ Authors: Sergio Schvezov <[e-mail]>
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __QTCONTACTS_HPP_
+#define __QTCONTACTS_HPP_
+
+#include <QObject>
+#include <QSignalMapper>
+
+class Avatar : QObject {
+    Q_OBJECT
+    public:
+        explicit Avatar(QObject* parent=0)
+            : QObject(parent) {
+        }
+        void retrieveThumbnail(const QString& email);
+};
+
+#endif

=== added file 'qtcontact/qtcontacts.moc'
--- qtcontact/qtcontacts.moc	1970-01-01 00:00:00 +0000
+++ qtcontact/qtcontacts.moc	2014-08-25 14:55:20 +0000
@@ -0,0 +1,88 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'qtcontacts.hpp'
+**
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.2.1)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "qtcontacts.hpp"
+#include <QtCore/qbytearray.h>
+#include <QtCore/qmetatype.h>
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'qtcontacts.hpp' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 67
+#error "This file was generated using the moc from 5.2.1. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+struct qt_meta_stringdata_Avatar_t {
+    QByteArrayData data[1];
+    char stringdata[8];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+    offsetof(qt_meta_stringdata_Avatar_t, stringdata) + ofs \
+        - idx * sizeof(QByteArrayData) \
+    )
+static const qt_meta_stringdata_Avatar_t qt_meta_stringdata_Avatar = {
+    {
+QT_MOC_LITERAL(0, 0, 6)
+    },
+    "Avatar\0"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_Avatar[] = {
+
+ // content:
+       7,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+       0        // eod
+};
+
+void Avatar::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    Q_UNUSED(_o);
+    Q_UNUSED(_id);
+    Q_UNUSED(_c);
+    Q_UNUSED(_a);
+}
+
+const QMetaObject Avatar::staticMetaObject = {
+    { &QObject::staticMetaObject, qt_meta_stringdata_Avatar.data,
+      qt_meta_data_Avatar,  qt_static_metacall, 0, 0}
+};
+
+
+const QMetaObject *Avatar::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *Avatar::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_Avatar.stringdata))
+        return static_cast<void*>(const_cast< Avatar*>(this));
+    return QObject::qt_metacast(_clname);
+}
+
+int Avatar::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    return _id;
+}
+QT_END_MOC_NAMESPACE

=== modified file 'update_translations.sh' (properties changed: +x to -x)