From: Sudheer K <scifi1947 at gmail.com>
Date: Sat, 14 Jan 2012 06:11:07 +0000 (-0800)
Subject: Merge branch 'master' of ssh://drop.maemo.org/git/vicar
X-Git-Url: https://vcs.maemo.org/git/?p=vicar;a=commitdiff_plain;h=2beca638f4ba146e25320c9c07cc1f29d0b2bba2

Merge branch 'master' of ssh://drop.maemo.org/git/vicar

Conflicts:
	qtc_packaging/debian_harmattan/prerm
	qtc_packaging/debian_harmattan/rules
	qtc_packaging/debian_harmattan/vicar.aegis
	qtc_packaging/debian_harmattan/vicar.substvars
	src/data/accounts/vicar.service
	src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
	src/vicar-daemon/vicar-daemon.pro
	src/vicar-lib/cpp/gconfutility.cpp
	src/vicar-lib/cpp/gconfutility.h
	src/vicar-lib/cpp/logutility.h
	src/vicar-lib/cpp/telepathyutility.cpp
	src/vicar-lib/vicar-lib.pro
	src/vicar-telepathy/cpp/connection.cpp
	src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
	src/vicar-telepathy/cpp/connectionmanager.cpp
	src/vicar-telepathy/cpp/main.cpp
	src/vicar-telepathy/vicar-telepathy.pro
	src/vicar-utils/cpp/main.cpp
---

2beca638f4ba146e25320c9c07cc1f29d0b2bba2
diff --cc qtc_packaging/debian_harmattan/prerm
index e650ab5,0d0de12..d4b71f2
--- a/qtc_packaging/debian_harmattan/prerm
+++ b/qtc_packaging/debian_harmattan/prerm
@@@ -20,14 -20,15 +20,26 @@@ set -
  case "$1" in
      remove|deconfigure)
  
++<<<<<<< HEAD
 +        echo "Deleting Vicar Telepathy account ..."
 +        [[ -x /opt/vicar/bin/vicar-utils ]] && /opt/vicar/bin/vicar-utils REMOVE
 +
 +        echo "Deleting Vicar Harmattan account ..."
 +        [[ -x /opt/vicar/bin/vicar-utils ]] && /opt/vicar/bin/vicar-utils --delete-account
 +
 +        #echo "Deleting Vicar Profiles database ..."
 +        #[[ -d /home/user/.vicar ]] && rm -rf /home/user/.vicar/
++=======
+ 	eval $(dbus-launch --sh-syntax)
+ 	export DBUS_SESSION_BUS_ADDRESS
+ 	export DBUS_SESSION_BUS_PID
+ 
+         echo "Deleting Vicar Telepathy account ..."
+         #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils REMOVE"
+ 
+         echo "Deleting Vicar Profiles database ..."
+         #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils DROPDB"
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  
  	# Kill any running instances of the daemon (only used on Linux based systems)
  	killall -q vicar-daemon || true
diff --cc qtc_packaging/debian_harmattan/rules
index 3273a26,46da245..eeb9a8b
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@@ -62,7 -62,7 +62,11 @@@ binary-arch: build instal
  	dh_testroot
  	dh_installchangelogs 
  	dh_installdocs
++<<<<<<< HEAD
 +#	dh_installexamples
++=======
+ 	dh_installexamples
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  #	dh_install
  #	dh_installmenu
  #	dh_installdebconf	
@@@ -74,15 -74,15 +78,25 @@@
  #	dh_installinit
  #	dh_installcron
  #	dh_installinfo
++<<<<<<< HEAD
 +#	dh_installman
 +	dh_link
 +	dh_strip #Uncomment to remove debug symbols
++=======
+ 	dh_installman
+ 	dh_link
+ 	dh_strip
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  	dh_compress
  	dh_fixperms
  #	dh_perl
  #	dh_makeshlibs
  	dh_installdeb
++<<<<<<< HEAD
 +	dh_shlibdeps # Uncomment this line for use without Qt Creator
++=======
+ 	# dh_shlibdeps # Uncomment this line for use without Qt Creator
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  	dh_gencontrol
  	dh_md5sums
  	dh_builddeb
diff --cc qtc_packaging/debian_harmattan/vicar.aegis
index 4c310f9,319b253..4062f81
--- a/qtc_packaging/debian_harmattan/vicar.aegis
+++ b/qtc_packaging/debian_harmattan/vicar.aegis
@@@ -8,7 -8,7 +8,11 @@@
       Modify the file or remove the checksum to disable this functionality. -->
  <aegis>
  
++<<<<<<< HEAD
 +	 <!--provide>
++=======
+ 	 <!-- provide>
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  	    <dbus name="org.freedesktop.Telepathy.Connection.vicar.tel.vicar" own="Cellular" bus="session">
  		<node name="/">
  			<interface name="org.freedesktop.Telepathy.Connection">
@@@ -43,6 -43,10 +47,13 @@@
  		<for path="/opt/vicar/bin/vicar-telepathy" />
  		<for path="/opt/vicar/bin/vicar-daemon" />
  		<for path="/opt/vicar/bin/vicar-utils" />
++<<<<<<< HEAD
++=======
+ 		<!-- These entries to be used only when debug package is included
+ 		<for path="/usr/lib/debug/opt/vicar/bin/vicar-telepathy" />
+ 		<for path="/usr/lib/debug/opt/vicar/bin/vicar-daemon" />
+ 		<for path="/usr/lib/debug/opt/vicar/bin/vicar-utils" /> -->
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  	</request>
  
  	<request context="INSTALL">
diff --cc qtc_packaging/debian_harmattan/vicar.substvars
index 218df44,abd3ebe..d264d1f
--- a/qtc_packaging/debian_harmattan/vicar.substvars
+++ b/qtc_packaging/debian_harmattan/vicar.substvars
@@@ -1,2 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +shlibs:Depends=applauncherd-launcher, libaccounts-qt1, libc6 (>= 2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.71), libgcc1 (>= 1:4.1.1), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.12.0), libqt4-dbus (>= 4.7.4~git20110517), libqt4-declarative (>= 4.7.4~git20110517), libqt4-sql (>= 4.7.4~git20110517), libqt4-xml (>= 4.7.4~git20110517), libqtcore4 (>= 4.7.4~git20110517), libqtgui4 (>= 4.7.4~git20110517), libstdc++6 (>= 4.4.0)
++=======
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  misc:Depends=
diff --cc src/data/accounts/vicar.service
index 13a981d,47db52c..85bd555
--- a/src/data/accounts/vicar.service
+++ b/src/data/accounts/vicar.service
@@@ -1,7 -1,7 +1,11 @@@
  <?xml version="1.0" encoding="UTF-8" ?>
  <service id="vicar">
    <type>IM</type>
++<<<<<<< HEAD
 +  <name>Vicar</name>
++=======
+   <name>VICaR Service Name</name>
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
    <provider>vicar</provider>
    <icon>icon-m-service-vicar</icon>
  
diff --cc src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
index f5b1fe3,0583583..df5c276
--- a/src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
+++ b/src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
@@@ -26,7 -26,7 +26,11 @@@ function initialize() 
              // Create the settings table if it doesn't already exist
              // If the table exists, this is skipped
              tx.executeSql('CREATE TABLE IF NOT EXISTS settings(setting TEXT PRIMARY KEY, value TEXT)');
++<<<<<<< HEAD
 +            tx.executeSql('CREATE TABLE IF NOT EXISTS profiles(id INTEGER PRIMARY KEY, numberpattern TEXT, gatewaynumber TEXT, dtmfformat TEXT, dtmfprefix TEXT, dtmfsuffix TEXT)');
++=======
+             tx.executeSql('CREATE TABLE IF NOT EXISTS rules(id INTEGER PRIMARY KEY, numberpattern TEXT, gatewaynumber TEXT, dtmfformat TEXT, dtmfprefix TEXT, dtmfsuffix TEXT)');
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
            },
          function(error) {
              logMessage("Error ["+error.code +"] - " + error.DOMString+" occurred.");
@@@ -75,13 -75,13 +79,21 @@@ function setSetting(setting, value) 
  }
  
  function addRule(ruleObj){
++<<<<<<< HEAD
 +    logMessage('SQL> INSERT INTO profiles(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, '+[ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]+')');
++=======
+     logMessage('SQL> INSERT INTO rules(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, '+[ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]+')');
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      var db = getDatabase();
      var res = "";
      logMessage("Opened VICaR database..");
  
      db.transaction(function(tx) {
++<<<<<<< HEAD
 +               var rs = tx.executeSql('INSERT INTO profiles(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, ?, ?, ?, ?, ?);', [ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]);
++=======
+                var rs = tx.executeSql('INSERT INTO rules(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, ?, ?, ?, ?, ?);', [ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                 logMessage("Inserted "+rs.rowsAffected+" rows");
                 if (rs.rowsAffected > 0) {
                   res = "OK";
@@@ -97,7 -97,7 +109,11 @@@
  }
  
  function updateRule(id,ruleObj){
++<<<<<<< HEAD
 +    logMessage('SQL> UPDATE profiles set numberpattern = '+[ruleObj.numberpattern]+
++=======
+     logMessage('SQL> UPDATE rules set numberpattern = '+[ruleObj.numberpattern]+
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                 ', gatewaynumber = '+[ruleObj.gatewaynumber]+
                 ', dtmfformat = '+[ruleObj.dtmfformat]+
                 ', dtmfprefix = '+[ruleObj.dtmfprefix]+
@@@ -106,7 -106,7 +122,11 @@@
      var db = getDatabase();
      var res = "";
      db.transaction(function(tx) {
++<<<<<<< HEAD
 +           var rs = tx.executeSql('UPDATE profiles set numberpattern = ?, gatewaynumber = ?, dtmfformat = ?, dtmfprefix = ?, dtmfsuffix = ? WHERE id = ?;',
++=======
+            var rs = tx.executeSql('UPDATE rules set numberpattern = ?, gatewaynumber = ?, dtmfformat = ?, dtmfprefix = ?, dtmfsuffix = ? WHERE id = ?;',
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                              [ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix, id]);
             logMessage("Updated "+rs.rowsAffected+" rows");
             if (rs.rowsAffected > 0) {
@@@ -123,11 -123,11 +143,19 @@@
  }
  
  function removeRule(id){
++<<<<<<< HEAD
 +    logMessage('SQL> DELETE FROM profiles WHERE id = '+[id]);
 +    var db = getDatabase();
 +    var res = "";
 +    db.transaction(function(tx) {
 +         var rs = tx.executeSql('DELETE FROM profiles WHERE id = ?;', [id]);
++=======
+     logMessage('SQL> DELETE FROM rules WHERE id = '+[id]);
+     var db = getDatabase();
+     var res = "";
+     db.transaction(function(tx) {
+          var rs = tx.executeSql('DELETE FROM rules WHERE id = ?;', [id]);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                 logMessage("Deleted "+rs.rowsAffected+" rows");
                 if (rs.rowsAffected > 0) {
                   res = "OK";
@@@ -147,7 -147,7 +175,11 @@@ function getAllRules()
      var rulesArray = new Array();
      var ruleObj;
      db.transaction(function(tx) {
++<<<<<<< HEAD
 +           var rs = tx.executeSql('SELECT * FROM profiles');
++=======
+            var rs = tx.executeSql('SELECT * FROM rules');
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
             logMessage("Fetched "+rs.rows.length+" rows");
             var i = 0;
             for (i = 0; i < rs.rows.length; i++){
@@@ -179,8 -179,8 +211,13 @@@ function getRuleByID(id)
      var db = getDatabase();
      var ruleObj;
      db.transaction(function(tx) {
++<<<<<<< HEAD
 +           logMessage('SQL> SELECT * FROM profiles WHERE id = '+[id]);
 +           var rs = tx.executeSql('SELECT * FROM profiles WHERE id = '+[id]);
++=======
+            logMessage('SQL> SELECT * FROM rules WHERE id = '+[id]);
+            var rs = tx.executeSql('SELECT * FROM rules WHERE id = '+[id]);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
             logMessage("Fetched "+rs.rows.length+" rows");
             if (rs.rows.length > 0){
                 ruleObj = new Object();
diff --cc src/vicar-daemon/cpp/callrouter.cpp
index 0b95d92,7a5d8ed..0ea72cb
--- a/src/vicar-daemon/cpp/callrouter.cpp
+++ b/src/vicar-daemon/cpp/callrouter.cpp
@@@ -54,8 -56,8 +54,7 @@@ CallRouter::CallRouter(QObject *parent
      d(new CallRouterPrivate(this))
  {
          Q_ASSERT(0 != d);
--        this->registerDBusService();
--        qDebug() << "Vicar-Daemon: Registered DBus Service " << APPLICATION_DBUS_SERVICE;
++        this->registerDBusService();        
  }
  
  CallRouter::~CallRouter(){
@@@ -68,16 -70,16 +67,23 @@@ void CallRouter::registerDBusService()
      if (!connection.interface()->isServiceRegistered(APPLICATION_DBUS_SERVICE)){
  
          if (!connection.registerService(APPLICATION_DBUS_SERVICE)) {
--            qDebug() << "Vicar-Daemon: " << d->dbusUtility->getErrorMessage();
++            qDebug() << "Vicar-Daemon: Error registering D-Bus service " << d->dbusUtility->getErrorMessage();
++            qDebug() << "Vicar-Daemon: Exiting";
              exit(1);
          }
++        else{
++            qDebug() << "Vicar-Daemon: Registered DBus Service " << APPLICATION_DBUS_SERVICE;
++        }
      }
  
      if (!connection.registerObject(APPLICATION_DBUS_PATH, this, QDBusConnection::ExportAdaptors)) {
          qDebug() << "Vicar-Daemon: " << d->dbusUtility->getErrorMessage();
++        qDebug() << "Vicar-Daemon: Exiting";
          exit(2);
      }
--
++    else{
++        qDebug() << "Vicar-Daemon: Registered DBus Object " << APPLICATION_DBUS_PATH;
++    }
  }
  
  
diff --cc src/vicar-daemon/vicar-daemon.pro
index f7134d9,4f89a0a..9ac1d4a
--- a/src/vicar-daemon/vicar-daemon.pro
+++ b/src/vicar-daemon/vicar-daemon.pro
@@@ -16,11 -14,13 +16,21 @@@ QT += dbus sq
  QT -= gui
  TEMPLATE = app
  TARGET = vicar-daemon
++<<<<<<< HEAD
 +
 +VPATH += cpp
 +MOC_DIR = cpp/.mocs
 +OBJECTS_DIR = cpp/.objs
 +
++=======
+ CONFIG += console
+ CONFIG -= app_bundle
+ 
+ VPATH += cpp
+ MOC_DIR = cpp/.mocs
+ OBJECTS_DIR = cpp/.objs
+ 
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  SOURCES += cpp/main.cpp \
      cpp/callrouter.cpp \
      cpp/vicardbusadaptor.cpp
diff --cc src/vicar-lib/cpp/logutility.h
index 5d1c255,ebca69e..6c89c78
--- a/src/vicar-lib/cpp/logutility.h
+++ b/src/vicar-lib/cpp/logutility.h
@@@ -1,71 -1,56 +1,121 @@@
  /*
++<<<<<<< HEAD
 +@version: 0.4
++=======
+ @version: 0.6
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  @author: Sudheer K. <scifi1947 at gmail.com>
  @license: GNU General Public License
  */
  
  #ifndef LOGUTILITY_H
  #define LOGUTILITY_H
++<<<<<<< HEAD
 +#include <QDebug>
 +#include <QFile>
 +#include <QIODevice>
 +#include <QDateTime>
 +#include <QDir>
++=======
+ #include <QFile>
+ #include <QIODevice>
+ #include <QTextStream>
+ #include <QDateTime>
+ #include <QDebug>
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  
  class LogUtility : public QObject
  {
      Q_OBJECT
  
++<<<<<<< HEAD
 +private:
 +    QFile * logFile;
 +
 +public:
 +    LogUtility(QObject *parent = 0) :
 +        QObject(parent){
 +        QString strPath;
 +
 +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
 +        //For maemo fremantle or harmattan use a common path                
 +        QDir logDir = QDir(QDir().homePath() + "/.vicar");
 +        if (!logDir.exists()){
 +            if (QDir().mkpath(logDir.absolutePath())){
 +                qDebug() << "Vicar: Log directory created successfully";
 +            }
 +            else{
 +                qDebug() << "Vicar: Error creating log directory";
 +            }
 +        }
 +        strPath = logDir.absolutePath() + "/vicar.log";
 +#else
 +        strPath = "vicar.log";
 +#endif
 +        logFile = new QFile(strPath,this);
 +
 +        if (!logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
 +            qDebug() << "Vicar: Error opening logfile for writing at path " << strPath;
 +        }
 +    }
 +
 +    ~LogUtility(){
 +        if (logFile->isOpen())
 +            logFile->close();
 +        qDebug() << "Vicar: In LogUtility object destructor..";
 +    }
 +
 +public slots:
 +    void logMessage(QString strMessage) {
 +
 +        QString strTimeNow = QDateTime::currentDateTime().toString("dd-MMM-yyyy HH:mm:ss");
 +
 +        if (logFile->isOpen() && logFile->isWritable()) {
 +            QTextStream logStream(logFile);
 +            logStream <<  QString("[%1] - %2").arg(strTimeNow,strMessage) << endl;
 +            qDebug() << QString("Vicar: [%1] - %2").arg(strTimeNow,strMessage);
 +        }
 +        else{
 +            qDebug() <<  "ERROROPENINGLOGFILE" << QString("Vicar: [%1] - %2").arg(strTimeNow,strMessage);
 +        }
 +    }
++=======
+ public:
+     LogUtility(QString logPath,QObject *parent = 0) :
+         QObject(parent){
+         logFilePath = logPath;
+     }
+ 
+     ~LogUtility(){
+     }
+ 
+ public slots:
+     void logMessage(QString strMessage, bool appendMode = true) {
+ 
+         QFile logFile(logFilePath);
+ 
+         bool success = false;
+ 
+         if (appendMode){
+             success = logFile.open(QIODevice::Append | QIODevice::WriteOnly | QIODevice::Text);
+         }
+         else{
+             success = logFile.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text);
+         }
+ 
+         QString strTimeNow = QDateTime::currentDateTime().toString("dd-MMM-yyyy HH:mm:ss");
+         if (success) {
+             QTextStream logStream(&logFile);
+             logStream <<  strTimeNow << " - " << strMessage << endl;
+         }
+         else{
+             qDebug() <<  "ERROROPENINGLOGFILE" << " - " << strMessage;
+         }
+     }
+ 
+ private:
+     QString logFilePath;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  };
  
  #endif // LOGUTILITY_H
diff --cc src/vicar-lib/cpp/telepathyutility.cpp
index 5290910,068f3fe..216e213
--- a/src/vicar-lib/cpp/telepathyutility.cpp
+++ b/src/vicar-lib/cpp/telepathyutility.cpp
@@@ -151,7 -134,7 +151,11 @@@ bool TelepathyUtility::createAccount()
      accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.Enabled",true);
      accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.ConnectAutomatically",true);
      accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.RequestedPresence",QVariant::fromValue(presence));
++<<<<<<< HEAD
 +    //accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.Service","vicar"); //Required when service can't be determined by the protocol name
++=======
+     accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.Service","vicar"); //Required when service can't be determined by the protocol name
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      accountPropertiesMap.insert("com.nokia.Account.Interface.Compat.Profile","vicar");
  
      QStringList valuesList;
diff --cc src/vicar-lib/vicar-lib.pro
index d799730,725dd40..f473289
--- a/src/vicar-lib/vicar-lib.pro
+++ b/src/vicar-lib/vicar-lib.pro
@@@ -19,6 -19,7 +19,10 @@@ OBJECTS_DIR = cpp/.obj
  DESTDIR = ../lib
  
  SOURCES += cpp/dbusutility.cpp \
++<<<<<<< HEAD
++=======
+     cpp/gconfutility.cpp \
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      cpp/telepathyutility.cpp \
      cpp/accountmanagerproxy.cpp \
      cpp/accountproxy.cpp \
@@@ -28,6 -29,7 +32,10 @@@
      cpp/databaseutility.cpp \
      cpp/harmattanaccountutility.cpp
  HEADERS += cpp/dbusutility.h \
++<<<<<<< HEAD
++=======
+     cpp/gconfutility.h \
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      cpp/telepathyutility.h \
      cpp/accountmanagerproxy.h \
      cpp/accountproxy.h \
diff --cc src/vicar-telepathy/cpp/connection.cpp
index 3f71330,58bbe92..a197955
--- a/src/vicar-telepathy/cpp/connection.cpp
+++ b/src/vicar-telepathy/cpp/connection.cpp
@@@ -66,7 -64,7 +66,11 @@@ public
          connection_status(Connection::Disconnected),
          adaptor(new ConnectionAdaptor(p)),
          connIfaceReqsAdaptor(new ConnectionInterfaceRequestsAdaptor(p)),
++<<<<<<< HEAD
 +        logUtility(new LogUtility(p)),
++=======
+         logUtility(new LogUtility("/var/log/vicar/vicar.log",p)),
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          parent(p)
      {
          Q_ASSERT(0 != adaptor);
@@@ -96,6 -94,7 +100,10 @@@ Connection::Connection(const QString & 
  
      QString strMessage;
      strMessage = "DEBUG: In Connection Constructor";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
      Q_ASSERT(0 != d);
@@@ -118,15 -117,7 +126,19 @@@
      this->setProperty("HasImmortalHandles",true);
  
      this->setProperty("Status",org::freedesktop::Telepathy::CONNECTION_STATUS_CONNECTED);
++<<<<<<< HEAD
 +
 +
 +    //this->setProperty("SelfHandle",org::freedesktop::Telepathy::HANDLE_TYPE_CONTACT);
 +    uint selfHandle(SELF_HANDLE);
 +    this->setProperty("SelfHandle",selfHandle);
 +
 +    strMessage = "VICaR Connection: Emitting SelfHandleChanged.";
 +    d->logUtility->logMessage(strMessage);
 +    emit SelfHandleChanged(selfHandle);
++=======
+     this->setProperty("SelfHandle",org::freedesktop::Telepathy::HANDLE_TYPE_CONTACT);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  
      //Set the property RequestableChannelClasses
      org::freedesktop::Telepathy::RequestableChannelClassList requestableChannelClasses;
@@@ -158,13 -149,14 +170,25 @@@
      //Set the property Channels
      org::freedesktop::Telepathy::ChannelDetailsList channelDetails;
      this->setProperty("Channels",QVariant::fromValue(channelDetails));
++<<<<<<< HEAD
++=======
+ 
+     //Set the connection status to Connected (default for Vicar)
+     d->connection_status = Connection::Connected;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  
 +    //Set the connection status to Connected (default for Vicar)
 +    d->connection_status = Connection::Connected;
 +
 +
 +    strMessage = "VICaR Connection: Connection set up.";
  
++<<<<<<< HEAD
++=======
+     strMessage = "VICaR Connection: Connection set up.";
+ 
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  }
  
@@@ -182,6 -174,7 +206,10 @@@ bool Connection::registerObject(
          if (!QDBusConnection::sessionBus().registerService(serviceName()))
          {
              strMessage = "VICaR Connection: Problem registering connection service:" + serviceName();
++<<<<<<< HEAD
++=======
+             qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
              d->logUtility->logMessage(strMessage);
              return false;
          }
@@@ -190,12 -183,14 +218,20 @@@
                                                            this))
          {
              strMessage = "VICaR Connection: Problem registering object path:" + objectPath().path();
++<<<<<<< HEAD
++=======
+             qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
              d->logUtility->logMessage(strMessage);
              return false;
          }
      }
      else{
          strMessage = "VICaR Connection: " + serviceName()+" is already registered on DBus";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
      }
      return true;
@@@ -204,6 -199,7 +240,10 @@@
  void Connection::unregisterObject()
  {
      QString strMessage = "VICaR Connection: Unregistering Connection object from DBus";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      QDBusConnection::sessionBus().unregisterObject(objectPath().path());
      QDBusConnection::sessionBus().unregisterService(serviceName());
@@@ -230,11 -226,13 +270,19 @@@ void Connection::Connect(
         I am not connecting to anything.
       */
      QString strMessage = "VICaR Connection: Changing status to Connected...";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      d->connection_status = Connection::Connected;
  
      //Let all the Telepathy clients know that connection status has changed
      strMessage = "VICaR Connection: Emitting StatusChanged.";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      emit StatusChanged(d->connection_status, ReasonRequested);
  }
@@@ -242,11 -240,13 +290,19 @@@
  void Connection::Disconnect()
  {
      QString strMessage = "VICaR Connection: Changing status to Disconnected...";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      //We don't have any Handles to release here. So just change the status to Disconnected
      d->connection_status = Connection::Disconnected;
  
      strMessage = "VICaR Connection: Emitting StatusChanged";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      emit StatusChanged(d->connection_status, ReasonRequested);
  
@@@ -289,19 -277,22 +345,33 @@@ uint Connection::GetStatus(
  uint Connection::GetSelfHandle()
  {
      QString strMessage = "VICaR Connection: GetSelfHandle";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      if (d->connection_status != Connected)
      {
          sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
                         "VICaR - Unable to get Self Handle. The connection is no longer available.");
          strMessage = "VICaR Connection: NOT CONNECTED when requesting selfhandle!";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
          return 0;
      }
  
      //WARNING: Incomplete implemenation
++<<<<<<< HEAD
 +    uint handle(SELF_HANDLE);
 +    strMessage = "VICaR Connection: Returning Handle " + QString::number(handle) + "as self handle.";
++=======
+     uint handle = 0;
+     strMessage = "VICaR Connection: Returning Handle " + QString(handle) + "as self handle.";
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      return handle;
  }
@@@ -338,11 -325,13 +408,19 @@@ void Connection::HoldHandles(const uin
  {
      Q_UNUSED(handles);
      QString strMessage = "VICaR Connection: HoldHandles.";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      if (d->connection_status != Connected)
      {
  
          strMessage = "VICaR Connection: HoldHandles - Not Connected.";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
  
          sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
@@@ -353,6 -342,7 +431,10 @@@
      {
  
          strMessage = "VICaR Connection: HoldHandles - Invalid Handle Type.";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
  
          sendErrorReply("org.freedesktop.Telepathy.Error.InvalidArgument",
@@@ -368,11 -358,12 +450,18 @@@ QStringList Connection::InspectHandles(
  {
      Q_UNUSED(handles);
      QStringList handlesList;
++<<<<<<< HEAD
++=======
+ 
+     QString strMessage = "VICaR Connection: InspectHandles.";
+     qDebug() << strMessage;
+     d->logUtility->logMessage(strMessage);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 +
 +    QString strMessage = "VICaR Connection: InspectHandles.";
 +    //d->logUtility->logMessage(strMessage);
  
 -        // check input:
 +     // check input:
      if (d->connection_status != Connected)
      {
          sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
@@@ -384,21 -375,17 +473,33 @@@
          sendErrorReply("org.freedesktop.Telepathy.Error.InvalidArgument",
                         "VICaR - Supports handles of type Contact only.");
          return handlesList;
++<<<<<<< HEAD
++=======
+     }
+ 
+     uint handle = 0;
+     for (int i = 0 ; i < handles.length(); i++) {
+         handle = handles.at(i);
+         strMessage = "VICaR Connection: Inspecting handle "+QString(handle);
+         qDebug() << strMessage;
+         d->logUtility->logMessage(strMessage);
+         handlesList.append(QString(handle));
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 +    }
 +
 +    uint handle;
 +
 +    qDebug() << "VICaR Connction: " << handles.length()<< " handles passed to us";
 +    for (int i = 0 ; i < handles.length(); i++) {
 +        handle = handles.at(i);
 +        strMessage = "VICaR Connection: Inspecting handle "+QString::number(handle);
 +        d->logUtility->logMessage(strMessage);
 +        handlesList.append(QString::number(handle));
      }
  
 +    strMessage = "VICaR Connection: Handle inspection completed";
 +    d->logUtility->logMessage(strMessage);
 +
      //WARNING: Incomplete implementation
      return handlesList;
  }
@@@ -406,14 -393,13 +507,22 @@@
  void Connection::ReleaseHandles(const uint handle_type, const QList<uint> &handles)
  {
      Q_UNUSED(handles);
++<<<<<<< HEAD
 +    QString strMessage = "VICaR Connection: ReleaseHandles.";
 +    d->logUtility->logMessage(strMessage);
 +
++=======
+     QString strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      if (d->connection_status != Connected)
      {
          sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
                         "VICaR - Unable to release handle. The connection is no longer available.");
          strMessage = "VICaR Connection: Releasing Handle while connection is no longer connected.";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
          return;
      }
@@@ -422,6 -408,7 +531,10 @@@
          sendErrorReply("org.freedesktop.Telepathy.Error.InvalidArgument",
                         "VICaR - Supports handles of type Contact only.");
          strMessage =  "VICaR Connection: Trying to release a Handle that is not a contact.";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
          return;
      }
@@@ -497,6 -474,7 +610,10 @@@ QDBusObjectPath Connection::CreateChann
      Q_ASSERT(!request.isEmpty());
      QString strMessage;
      strMessage = "VICaR Connection: CreateChannel";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      qDebug() << " Request details are: "<< request;
  
@@@ -515,6 -493,7 +632,10 @@@ bool Connection::EnsureChannel(const QV
      Q_UNUSED(channel_properties);
      Q_ASSERT(!request.isEmpty());
      QString strMessage = "VICaR Connection: EnsureChannel";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      qDebug() << " Request details are: "<< request;
  
@@@ -527,6 -506,7 +648,10 @@@
  QDBusObjectPath Connection::processChannel(const QVariantMap &request){
  
      QString strMessage = "VICaR Connection: ProcessChannel";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
      QDBusObjectPath channel_path;
@@@ -590,6 -570,7 +715,10 @@@
  
      strMessage = "VICaR Connection: Call is processed.";
  
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
      return channel_path;
@@@ -602,6 -583,7 +731,10 @@@ void Connection::AddClientInterest(cons
      QString strMessage;
  
      strMessage = "VICaR Connection: AddClientInterest";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  }
  
@@@ -611,6 -593,7 +744,10 @@@ void Connection::RemoveClientInterest(c
      QString strMessage;
  
      strMessage = "VICaR Connection: RemoveClientInterest";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  }
  
diff --cc src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
index e463ad9,3742f93..a664283
--- a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
+++ b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
@@@ -51,14 -48,12 +49,22 @@@ org::freedesktop::Telepathy::Requestabl
  QDBusObjectPath ConnectionInterfaceRequestsAdaptor::CreateChannel(const QVariantMap &request, QVariantMap &channel_properties)
  {
      // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.CreateChannel
++<<<<<<< HEAD
 +    //This method should return a Channel object path
 +    return static_cast<Connection *>(parent())->CreateChannel(request, channel_properties);
++=======
+     //return static_cast<YourObjectType *>(parent())->CreateChannel(request, channel_properties);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  }
  
  bool ConnectionInterfaceRequestsAdaptor::EnsureChannel(const QVariantMap &request, QDBusObjectPath &channel_object, QVariantMap &channel_properties)
  {
      // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.EnsureChannel
++<<<<<<< HEAD
 +    //This method should return a Channel object path
 +    return static_cast<Connection *>(parent())->EnsureChannel(request, channel_object, channel_properties);
++=======
+     //return static_cast<YourObjectType *>(parent())->EnsureChannel(request, channel_object, channel_properties);
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  }
  
diff --cc src/vicar-telepathy/cpp/connectionmanager.cpp
index 599856f,b4495f0..055e007
--- a/src/vicar-telepathy/cpp/connectionmanager.cpp
+++ b/src/vicar-telepathy/cpp/connectionmanager.cpp
@@@ -43,7 -43,7 +43,11 @@@ class ConnectionManagerPrivat
  public:
      ConnectionManagerPrivate(ConnectionManager * parent) :
          adaptor(new ConnectionManagerAdaptor(parent)),
++<<<<<<< HEAD
 +        logUtility(new LogUtility(parent))
++=======
+         logUtility(new LogUtility("/var/log/vicar/vicar.log",parent))
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      {
          Q_ASSERT(0 != adaptor);
          activeConnection = 0;
@@@ -73,6 -73,7 +77,10 @@@ ConnectionManager::GetParameters(const 
      Q_ASSERT(!proto.isEmpty());    
      Q_UNUSED(proto);
      strMessage = "VICAR: ConnectionManager::GetParameters(const QString &prot)";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      org::freedesktop::Telepathy::ParameterDefinitionList result;
      org::freedesktop::Telepathy::ParameterDefinition param;
@@@ -122,6 -123,7 +130,10 @@@
  QStringList ConnectionManager::ListProtocols()
  {
      QString strMessage = "VICaR ConnectionManager::ListProtocols()";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      return QStringList(protocol_name);
  }
@@@ -131,6 -133,7 +143,10 @@@ QString ConnectionManager::RequestConne
                                               QDBusObjectPath & object_path)
  {
      QString strMessage =  "VICaR CM: Connection Requested for protocol "+proto;
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
      QString connection_service;    
      //object_path = QDBusObjectPath();
@@@ -142,18 -145,20 +158,35 @@@
                         "VICaR - Unable to create Connection. Requested protocol is not implemented.");
          */
          strMessage =  "VICaR CM::RequestConnection: proto mismatch.";
++<<<<<<< HEAD
 +        d->logUtility->logMessage(strMessage);
 +        return connection_service;
 +    }
 +    if (d->activeConnection != 0){
 +        strMessage =  "VICaR CM::RequestConnection: An active connection already exists at "+d->activeConnection->serviceName();
 +        d->logUtility->logMessage(strMessage);
 +
 +        object_path = d->activeConnection->objectPath();
 +        connection_service = d->activeConnection->serviceName();
 +        //emit NewConnection(connection_service, object_path, "tel"); //Just in case, emit the NewConnection again
 +        return connection_service;
 +    }
++=======
+         qDebug() << strMessage;
+         d->logUtility->logMessage(strMessage);
+         return connection_service;
+     }
+     if (d->activeConnection != 0){
+         strMessage =  "VICaR CM::RequestConnection: An active connection already exists at "+d->activeConnection->serviceName();
+         qDebug() << strMessage;
+         d->logUtility->logMessage(strMessage);
+ 
+         object_path = d->activeConnection->objectPath();
+         connection_service = d->activeConnection->serviceName();
+         //emit NewConnection(connection_service, object_path, "tel"); //Just in case, emit the NewConnection again
+         return connection_service;
+     }
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  
      QString imsi;
      QString privacy;
@@@ -185,29 -190,34 +218,49 @@@
                             "VICaR - Unable to create Connection. Invalid parameters specified.");
              */
              strMessage =  "VICaR CM::RequestConnection: invalid parameter" + param + "found.";
++<<<<<<< HEAD
++=======
+             qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
              d->logUtility->logMessage(strMessage);
              return connection_service;
          }
      }
  
      strMessage =  "DEBUG CM: Trying to create new connection with account "+account;
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
      Connection * new_connection = new Connection(account, this);
      Q_ASSERT(0 != new_connection);
  
      strMessage =  "DEBUG CM: Trying to register new connection";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
      if (!new_connection->registerObject())
      {
          strMessage = "VICaR CM: Error while registering Connection object with DBus.";
++<<<<<<< HEAD
++=======
+         qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
          d->logUtility->logMessage(strMessage);
          new_connection->deleteLater();
          return QString();
      }
  
      strMessage =  "VICaR CM: New Connection Created. Status is " + QString(new_connection->GetStatus());
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
  
@@@ -215,6 -225,7 +268,10 @@@
      connection_service = new_connection->serviceName();
  
      strMessage =  "VICaR CM: Emitting New Connection Signal";
++<<<<<<< HEAD
++=======
+     qDebug() << strMessage;
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
      d->logUtility->logMessage(strMessage);
  
      emit NewConnection(connection_service, object_path, "tel");
diff --cc src/vicar-telepathy/vicar-telepathy.pro
index 87b28d1,08b0fef..aa4de48
--- a/src/vicar-telepathy/vicar-telepathy.pro
+++ b/src/vicar-telepathy/vicar-telepathy.pro
@@@ -1,7 -1,7 +1,11 @@@
  #INCLUDEPATH += /usr/include/telepathy-1.0
  #LIBS += /usr/lib/libtelepathy-qt4.so
  
++<<<<<<< HEAD
 +contains(MEEGO_EDITION,harmattan){
++=======
+ exists($$QMAKE_INCDIR_QT"/../qmsystem2/qmkeys.h"){
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
     DEFINES += Q_WS_MAEMO_6
  }
  
diff --cc src/vicar-utils/cpp/main.cpp
index 545cb03,a5a19da..cd295ff
--- a/src/vicar-utils/cpp/main.cpp
+++ b/src/vicar-utils/cpp/main.cpp
@@@ -10,25 -10,10 +10,32 @@@
  #include "connectioninterfacerequeststypes.h"
  #include "harmattanaccountutility.h"
  #include <QDebug>
++<<<<<<< HEAD
 +#include <QCoreApplication>
 +#include "dbusutility.h"
 +#include <QDBusMetaType>
 +#include <QDBusConnection>
 +#include <QCryptographicHash> //DEBUG
 +
 +
 +#include <QDBusInterface>
 +#include <QDBusObjectPath>
 +#include <QDBusArgument>
 +
 +#define AM_SERVICE          "org.freedesktop.Telepathy.AccountManager"
 +#define AM_OBJ_PATH         "/org/freedesktop/Telepathy/AccountManager"
 +#define AM_INTERFACE        "org.freedesktop.Telepathy.AccountManager"
 +#define RING_CONN_SERVICE   "org.freedesktop.Telepathy.Connection.ring.tel.ring"
 +#define RING_CONN_PATH      "/org/freedesktop/Telepathy/Connection/ring/tel/ring"
 +#define DBUS_SERVICE        "org.freedesktop.DBus.Properties"
 +#define DBUS_OBJ_PATH       "/org/freedesktop/DBus/Properties"
 +#define DBUS_PROPS_IFACE     "org.freedesktop.DBus.Properties"
++=======
+ #include <QCoreApplication> //DEBUG - Delete this
+ #include "dbusutility.h"
+ #include <QDBusMetaType>
+ #include <QDBusConnection>
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
  
  int main(int argc, char *argv[])
  {
@@@ -100,27 -82,67 +107,88 @@@
                          <<databaseUtility->lastError();
                  exit(5);
              }
 -            qDebug() << "VICaR profiles database deleted.";
 +            qDebug() << "VICaR database deleted.";
 +        }    
 +#elif defined(Q_WS_MAEMO_6)
 +        else if (instruction == "--create-account"){
 +            qDebug() << "Creating account";
 +            accountUtility->addAccount();
          }
++<<<<<<< HEAD
 +        else if (instruction == "--delete-account"){
 +            qDebug() << "Deleting account";
 +            accountUtility->removeAccount();
 +        }
 +#endif
 +        else {
 +            qDebug() << "This command is not recognized";
 +        }
 +    }
 +    else{                        
++=======
+         else if (instruction == "TPACCOUNTSTATUS"){
+             QString status = tpUtility->getAccountStatus();
+             qDebug() << "Account Status is "<< status;
+         }
+         else if (instruction == "--create-account"){
+ #if defined(Q_WS_MAEMO_6)
+             qDebug() << "Creating account";
+             accountUtility->addAccount();
+ #else
+             qDebug() << "This command is applicable only in harmattan";
+ #endif
+         }
+         else if (instruction == "--delete-account"){
+ #if defined(Q_WS_MAEMO_6)
+             qDebug() << "Deleting account";
+             accountUtility->removeAccount();
+ #else
+             qDebug() << "This command is applicable only in harmattan";
+ #endif
+         }
+         else if (instruction == "TESTING"){
+             tpUtility->callNumberWithRing(argv[2]);
+         }
+     }
+     else{                        
+ 
+         qDebug() << "Sending Introspect method call";
+ 
+         DbusUtility dbusUtility(&app);
+         QList<QVariant> argsToSend;
+ 
+ 
+         bool success = dbusUtility.sendMethodCall("org.freedesktop.Telepathy.Connection.ring.tel.ring",
+                                    "/org/freedesktop/Telepathy/Connection/ring/tel/ring",
+                                    "org.freedesktop.DBus.Introspectable",
+                                    "Introspect",argsToSend,false);
+ 
+         success = dbusUtility.sendMethodCall("org.freedesktop.Telepathy.ConnectionManager.ring",
+                                    "/org/freedesktop/Telepathy/ConnectionManager/ring",
+                                    "org.freedesktop.DBus.Introspectable",
+                                    "Introspect",argsToSend,false);
+ 
+         /*
+ 
+         bool success = dbusUtility.sendMethodCall("org.freedesktop.Telepathy.AccountManager",
+                                    "/org/freedesktop/Telepathy/Account/ring/tel/ring",
+                                    "org.freedesktop.Telepathy.Account",
+                                    "Reconnect",argsToSend,false);
+         */
+ 
+         if (!success){
+             qDebug() << dbusUtility.getErrorMessage();
+         }
+         else{
+             qDebug() << "Method call executed successfully";
+         }
+         app.exec();
+     }
++>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 +
 +        qDebug() << QCryptographicHash::hash("VICaR",QCryptographicHash::Md5).toHex();
  
 +    }
      delete (tpUtility);
      delete (databaseUtility);
      delete (accountUtility);
diff --cc welcome
index e69de29,e69de29..0000000
deleted file mode 100755,100755
--- a/welcome
+++ /dev/null