Vers 0.1.3, extra qDebug printouts commented out
authorKate Alhola <kate.alhola@nokia.com>
Wed, 12 May 2010 09:23:45 +0000 (12:23 +0300)
committerKate Alhola <kate.alhola@nokia.com>
Wed, 12 May 2010 09:23:45 +0000 (12:23 +0300)
42 files changed:
tpsession-0.1/Makefile
tpsession-0.1/debian/changelog
tpsession-0.1/debian/control
tpsession-0.1/debian/files
tpsession-0.1/debian/libtpsession-dbg/DEBIAN/control
tpsession-0.1/debian/libtpsession-dbg/DEBIAN/md5sums
tpsession-0.1/debian/libtpsession-dbg/usr/lib/debug/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 [deleted file]
tpsession-0.1/debian/libtpsession-dbg/usr/share/doc/libtpsession-dbg/changelog.Debian.gz
tpsession-0.1/debian/libtpsession-dev/DEBIAN/control
tpsession-0.1/debian/libtpsession-dev/DEBIAN/md5sums
tpsession-0.1/debian/libtpsession-dev/usr/include/telepathy-1.0/tpsession/tpsessionaccount.h
tpsession-0.1/debian/libtpsession-dev/usr/include/telepathy-1.0/tpsession/tpsessionchannel.h
tpsession-0.1/debian/libtpsession-dev/usr/share/doc/libtpsession-dev/changelog.Debian.gz
tpsession-0.1/debian/libtpsession.install
tpsession-0.1/debian/libtpsession.substvars
tpsession-0.1/debian/libtpsession/DEBIAN/control
tpsession-0.1/debian/libtpsession/DEBIAN/md5sums
tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so [deleted symlink]
tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0 [deleted symlink]
tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1 [deleted symlink]
tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 [deleted file]
tpsession-0.1/debian/libtpsession/usr/share/doc/libtpsession/changelog.Debian.gz
tpsession-0.1/debian/rules
tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so [deleted symlink]
tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0 [deleted symlink]
tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1 [deleted symlink]
tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 [deleted file]
tpsession-0.1/debian/tmp/usr/include/telepathy-1.0/tpsession/tpsessionaccount.h
tpsession-0.1/debian/tmp/usr/include/telepathy-1.0/tpsession/tpsessionchannel.h
tpsession-0.1/tests/Makefile
tpsession-0.1/tests/showaccounts/Makefile
tpsession-0.1/tests/showaccounts/showaccounts
tpsession-0.1/tests/smstest/Makefile
tpsession-0.1/tests/smstest/smstest
tpsession-0.1/tests/syncsms/Makefile
tpsession-0.1/tests/syncsms/syncsms
tpsession-0.1/tpsession/Makefile
tpsession-0.1/tpsession/libtpsession.so.0.1.0
tpsession-0.1/tpsession/tpsession.cpp
tpsession-0.1/tpsession/tpsession.pro.user
tpsession-0.1/tpsession/tpsessionaccount.cpp
tpsession-0.1/tpsession/tpsessionchannel.cpp

index 299887c..e2becfb 100644 (file)
@@ -1,14 +1,14 @@
 #############################################################################
 # Makefile for building: tpsession
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue Feb 9 00:59:17 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 10 14:27:46 2010
 # Project:  tpsession.pro
 # Template: subdirs
-# Command: /opt/qt4-maemo5/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
+# Command: /usr/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
 #############################################################################
 
 first: make_default
 MAKEFILE      = Makefile
-QMAKE         = /opt/qt4-maemo5/bin/qmake
+QMAKE         = /usr/bin/qmake
 DEL_FILE      = rm -f
 CHK_DIR_EXISTS= test -d
 MKDIR         = mkdir -p
@@ -73,43 +73,43 @@ sub-tests-install_subtargets: tests/$(MAKEFILE) FORCE
 sub-tests-uninstall_subtargets: tests/$(MAKEFILE) FORCE
        cd tests/ && $(MAKE) -f $(MAKEFILE) uninstall
 
-Makefile: tpsession.pro  /opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf
+Makefile: tpsession.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf
        $(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
-/opt/qt4-maemo5/mkspecs/common/unix.conf:
-/opt/qt4-maemo5/mkspecs/common/linux.conf:
-/opt/qt4-maemo5/mkspecs/qconfig.pri:
-/opt/qt4-maemo5/mkspecs/features/qt_functions.prf:
-/opt/qt4-maemo5/mkspecs/features/qt_config.prf:
-/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf:
-/opt/qt4-maemo5/mkspecs/features/default_pre.prf:
-/opt/qt4-maemo5/mkspecs/features/release.prf:
-/opt/qt4-maemo5/mkspecs/features/default_post.prf:
-/opt/qt4-maemo5/mkspecs/features/warn_on.prf:
-/opt/qt4-maemo5/mkspecs/features/qt.prf:
-/opt/qt4-maemo5/mkspecs/features/unix/thread.prf:
-/opt/qt4-maemo5/mkspecs/features/moc.prf:
-/opt/qt4-maemo5/mkspecs/features/resources.prf:
-/opt/qt4-maemo5/mkspecs/features/uic.prf:
-/opt/qt4-maemo5/mkspecs/features/yacc.prf:
-/opt/qt4-maemo5/mkspecs/features/lex.prf:
-/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 qmake: qmake_all FORCE
        @$(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
 
index c9655e0..56b9b28 100644 (file)
@@ -1,3 +1,15 @@
+tpsession (0.1-3) unstable; urgency=low
+
+  * Extra debug printouts removed
+
+ -- Kate Alhola <kate.alhola@nokia.com>  Mon,  10 May 2010 13:20:00 +0300
+       
+tpsession (0.1-2) unstable; urgency=low
+
+  * Some bug fixes in sync constructor, getAccoint now accepts also uniqueIdentifier, PR1.2 compatible
+
+ -- Kate Alhola <kate.alhola@nokia.com>  Thu,  25 Mar 2010 11:20:48 +0200
+
 tpsession (0.1-1) unstable; urgency=low
 
   * Initial release 
index d2f0cb7..ea675f7 100644 (file)
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Kate Alhola <kate.alhola@nokia.com>
 Build-Depends: cdbs, cdbs, debhelper (>= 5)
 Build-Depends: cdbs,
-               libqt4-maemo5-dev (>= 4.5.0),
+               libqt4-dev (>= 4.5.0),
                pkg-config (>= 0.21),
               libgconf2-dev ,
               libtelepathy-qt4-dev (>=0.2.0)
@@ -20,14 +20,14 @@ Description: Easy to use API to Telepathy-Qt4
 Package: libtpsession-dev
 Architecture: any
 Section: libdevel
-Depends: libtpsession (=0.1-1)
+Depends: libtpsession
 Description: Easy to use API to Telepathy-Qt4 dev files
  Easy to use API to Telepathy-Qt4 dev files
 
 Package: libtpsession-dbg
 Architecture: any
 Section: libdevel
-Depends: tpsession (=0.1)
+Depends: tpsession 
 Description: Easy to use API to Telepathy-Qt4 debug symbols
  Easy to use API to Telepathy-Qt4 debug symbols
 
index 4e3517b..ece1021 100644 (file)
@@ -1,3 +1,3 @@
-libtpsession_0.1-1_armel.deb libs extra
-libtpsession-dev_0.1-1_armel.deb libdevel extra
-libtpsession-dbg_0.1-1_armel.deb libdevel extra
+libtpsession_0.1-3_armel.deb libs extra
+libtpsession-dev_0.1-3_armel.deb libdevel extra
+libtpsession-dbg_0.1-3_armel.deb libdevel extra
index d22a95b..4bb5b62 100644 (file)
@@ -1,10 +1,10 @@
 Package: libtpsession-dbg
-Version: 0.1-1
+Version: 0.1-3
 Section: libdevel
 Priority: extra
 Architecture: armel
-Depends: tpsession (= 0.1)
-Installed-Size: 921
+Depends: tpsession
+Installed-Size: 894
 Maintainer: Kate Alhola <kate.alhola@nokia.com>
 Source: tpsession
 Description: Easy to use API to Telepathy-Qt4 debug symbols
index 7a39051..b367845 100644 (file)
@@ -1,3 +1,3 @@
-f80399553a5a3921352ba1a326b63dd9  usr/lib/debug/opt/qt4-maemo5/lib/libtpsession.so.0.1.0
-e0b05504d9f0f83bb9b3149eaa1d0455  usr/share/doc/libtpsession-dbg/changelog.Debian.gz
+abf7dc098c9ab93af0b7cf66c8a57927  usr/lib/debug/usr/lib/libtpsession.so.0.1.0
+76fabb1b886f434c90b04f1229c84b75  usr/share/doc/libtpsession-dbg/changelog.Debian.gz
 707f20563222a064607acf41d3e5c7b2  usr/share/doc/libtpsession-dbg/copyright
diff --git a/tpsession-0.1/debian/libtpsession-dbg/usr/lib/debug/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 b/tpsession-0.1/debian/libtpsession-dbg/usr/lib/debug/opt/qt4-maemo5/lib/libtpsession.so.0.1.0
deleted file mode 100644 (file)
index e7f770b..0000000
Binary files a/tpsession-0.1/debian/libtpsession-dbg/usr/lib/debug/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 and /dev/null differ
index 8dce42c..93c3317 100644 (file)
Binary files a/tpsession-0.1/debian/libtpsession-dbg/usr/share/doc/libtpsession-dbg/changelog.Debian.gz and b/tpsession-0.1/debian/libtpsession-dbg/usr/share/doc/libtpsession-dbg/changelog.Debian.gz differ
index e7b1e54..3933fc5 100644 (file)
@@ -1,9 +1,9 @@
 Package: libtpsession-dev
-Version: 0.1-1
+Version: 0.1-3
 Section: libdevel
 Priority: extra
 Architecture: armel
-Depends: libtpsession (= 0.1-1)
+Depends: libtpsession
 Installed-Size: 13
 Maintainer: Kate Alhola <kate.alhola@nokia.com>
 Source: tpsession
index 286d285..f2b1626 100644 (file)
@@ -1,7 +1,7 @@
 f5dc0a769f2e6fb59be9c66b55b738ad  usr/include/telepathy-1.0/tpsession/tpsession.h
-698278bf13455b61bc558410d9a946db  usr/include/telepathy-1.0/tpsession/tpsessionaccount.h
-ac135bff6b7c2388dea6a8c7d3b5f2f3  usr/include/telepathy-1.0/tpsession/tpsessionchannel.h
+500e045bff6fe974334a1e6ede7df235  usr/include/telepathy-1.0/tpsession/tpsessionaccount.h
+c71b18e6d08b33ab9bfdd9fd98816704  usr/include/telepathy-1.0/tpsession/tpsessionchannel.h
 da668240e6a6465d26576272ecb52b48  usr/include/telepathy-1.0/tpsession/tpsessionobserver.h
 4987dc18c04e1e486b0c518dcd0ef913  usr/lib/pkgconfig/TpSession.pc
-e0b05504d9f0f83bb9b3149eaa1d0455  usr/share/doc/libtpsession-dev/changelog.Debian.gz
+76fabb1b886f434c90b04f1229c84b75  usr/share/doc/libtpsession-dev/changelog.Debian.gz
 707f20563222a064607acf41d3e5c7b2  usr/share/doc/libtpsession-dev/copyright
index ccb84fa..b6b258b 100644 (file)
@@ -55,6 +55,8 @@ signals:
   void accountReady(TpSessionAccount *);
   void channelReady(TpSessionAccount *);
   void messageReceived(const Tp::ReceivedMessage &,TpSessionAccount *);
+  void messageSent(const Tp::Message &,TpSessionAccount *);
+  void newChannel(TpSessionAccount *,QString,QString,const Tp::ChannelDetails &);
 
 private slots:
   void onReady(Tp::PendingOperation *op);
index e520522..cf71af0 100644 (file)
@@ -43,11 +43,13 @@ public:
     QString peerId();
 signals:
   void channelReady(TpSessionChannel *);
+  void channelDestroyed(TpSessionChannel *);
   void messageReceived(const Tp::ReceivedMessage &,TpSessionChannel *);
   void messageSent(const Tp::Message &,Tp::MessageSendingFlags, const QString &,TpSessionChannel *);
 public slots:
     void onChannelCreated(Tp::PendingOperation *op);
     void onChannelReady(Tp::PendingOperation *op);
+    void onChannelDestroyed(QObject *);
     void onMessageReceived(const Tp::ReceivedMessage &);
     void onMessageSent(const Tp::Message &,Tp::MessageSendingFlags, const QString &);
 public:
index 8dce42c..93c3317 100644 (file)
Binary files a/tpsession-0.1/debian/libtpsession-dev/usr/share/doc/libtpsession-dev/changelog.Debian.gz and b/tpsession-0.1/debian/libtpsession-dev/usr/share/doc/libtpsession-dev/changelog.Debian.gz differ
index 844d318..21edf5b 100644 (file)
@@ -1 +1 @@
-debian/tmp/opt/qt4-maemo5/lib/libtpsession.so*
+debian/tmp/usr/lib/libtpsession.so*
index 48796a0..ea4be90 100644 (file)
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.5.0-1), libdbus-1-3 (>= 1.1.4), libdbus-glib-1-2 (>= 0.76), libgcc1 (>= 1:4.2.1), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.20.0), libqt4-maemo5-core (>= 4.6.1~git20100122), libqt4-maemo5-dbus (>= 4.6.1~git20100122), libqt4-maemo5-network (>= 4.6.1~git20100122), libqt4-maemo5-xml (>= 4.6.1~git20100122), libstdc++6 (>= 4.2.1)
+shlibs:Depends=libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libqt4-core (>= 4.6.2~git20100310), libqt4-dbus (>= 4.6.2~git20100310), libqt4-network (>= 4.6.2~git20100310), libqt4-xml (>= 4.6.2~git20100310), libstdc++6 (>= 4.2.1)
index 4c17fa1..2e08bd6 100644 (file)
@@ -1,10 +1,10 @@
 Package: libtpsession
-Version: 0.1-1
+Version: 0.1-3
 Section: libs
 Priority: extra
 Architecture: armel
-Depends: libc6 (>= 2.5.0-1), libdbus-1-3 (>= 1.1.4), libdbus-glib-1-2 (>= 0.76), libgcc1 (>= 1:4.2.1), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.20.0), libqt4-maemo5-core (>= 4.6.1~git20100122), libqt4-maemo5-dbus (>= 4.6.1~git20100122), libqt4-maemo5-network (>= 4.6.1~git20100122), libqt4-maemo5-xml (>= 4.6.1~git20100122), libstdc++6 (>= 4.2.1)
-Installed-Size: 73
+Depends: libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libqt4-core (>= 4.6.2~git20100310), libqt4-dbus (>= 4.6.2~git20100310), libqt4-network (>= 4.6.2~git20100310), libqt4-xml (>= 4.6.2~git20100310), libstdc++6 (>= 4.2.1)
+Installed-Size: 62
 Maintainer: Kate Alhola <kate.alhola@nokia.com>
 Source: tpsession
 Description: Easy to use API to Telepathy-Qt4
index b266a94..45bbf53 100644 (file)
@@ -1,4 +1,4 @@
-c2beb747be306cb736ce6716ceafb946  opt/qt4-maemo5/lib/libtpsession.so.0.1.0
-e0b05504d9f0f83bb9b3149eaa1d0455  usr/share/doc/libtpsession/changelog.Debian.gz
+771a90e449537f4fd4f9ccacc0ea2492  usr/lib/libtpsession.so.0.1.0
+76fabb1b886f434c90b04f1229c84b75  usr/share/doc/libtpsession/changelog.Debian.gz
 707f20563222a064607acf41d3e5c7b2  usr/share/doc/libtpsession/copyright
 566711be92c93313ec96c77fe9477c68  usr/share/doc/libtpsession/README.Debian
diff --git a/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so b/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so
deleted file mode 120000 (symlink)
index c6fcfbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libtpsession.so.0.1.0
\ No newline at end of file
diff --git a/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0 b/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0
deleted file mode 120000 (symlink)
index c6fcfbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libtpsession.so.0.1.0
\ No newline at end of file
diff --git a/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1 b/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1
deleted file mode 120000 (symlink)
index c6fcfbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libtpsession.so.0.1.0
\ No newline at end of file
diff --git a/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 b/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1.0
deleted file mode 100644 (file)
index 902f194..0000000
Binary files a/tpsession-0.1/debian/libtpsession/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 and /dev/null differ
index 8dce42c..93c3317 100644 (file)
Binary files a/tpsession-0.1/debian/libtpsession/usr/share/doc/libtpsession/changelog.Debian.gz and b/tpsession-0.1/debian/libtpsession/usr/share/doc/libtpsession/changelog.Debian.gz differ
index a3e8a6f..763b9be 100755 (executable)
@@ -4,5 +4,5 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/qmake.mk
 
 # Add here any variable or target overrides you need.
-QMAKE=/opt/qt4-maemo5/bin/qmake
-PKG_CONFIG_PATH=/opt/qt4-maemo5/lib/pkgconfig/
+#QMAKE=/opt/qt4-maemo5/bin/qmake
+#PKG_CONFIG_PATH=/opt/qt4-maemo5/lib/pkgconfig/
diff --git a/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so b/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so
deleted file mode 120000 (symlink)
index c6fcfbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libtpsession.so.0.1.0
\ No newline at end of file
diff --git a/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0 b/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0
deleted file mode 120000 (symlink)
index c6fcfbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libtpsession.so.0.1.0
\ No newline at end of file
diff --git a/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1 b/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1
deleted file mode 120000 (symlink)
index c6fcfbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libtpsession.so.0.1.0
\ No newline at end of file
diff --git a/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 b/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1.0
deleted file mode 100755 (executable)
index 59914b0..0000000
Binary files a/tpsession-0.1/debian/tmp/opt/qt4-maemo5/lib/libtpsession.so.0.1.0 and /dev/null differ
index ccb84fa..b6b258b 100644 (file)
@@ -55,6 +55,8 @@ signals:
   void accountReady(TpSessionAccount *);
   void channelReady(TpSessionAccount *);
   void messageReceived(const Tp::ReceivedMessage &,TpSessionAccount *);
+  void messageSent(const Tp::Message &,TpSessionAccount *);
+  void newChannel(TpSessionAccount *,QString,QString,const Tp::ChannelDetails &);
 
 private slots:
   void onReady(Tp::PendingOperation *op);
index e520522..cf71af0 100644 (file)
@@ -43,11 +43,13 @@ public:
     QString peerId();
 signals:
   void channelReady(TpSessionChannel *);
+  void channelDestroyed(TpSessionChannel *);
   void messageReceived(const Tp::ReceivedMessage &,TpSessionChannel *);
   void messageSent(const Tp::Message &,Tp::MessageSendingFlags, const QString &,TpSessionChannel *);
 public slots:
     void onChannelCreated(Tp::PendingOperation *op);
     void onChannelReady(Tp::PendingOperation *op);
+    void onChannelDestroyed(QObject *);
     void onMessageReceived(const Tp::ReceivedMessage &);
     void onMessageSent(const Tp::Message &,Tp::MessageSendingFlags, const QString &);
 public:
index 065a2f4..f51f3f1 100644 (file)
@@ -1,14 +1,14 @@
 #############################################################################
 # Makefile for building: tests
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue Feb 9 00:59:22 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 10 14:28:10 2010
 # Project:  tests.pro
 # Template: subdirs
-# Command: /opt/qt4-maemo5/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tests.pro
+# Command: /usr/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tests.pro
 #############################################################################
 
 first: make_default
 MAKEFILE      = Makefile
-QMAKE         = /opt/qt4-maemo5/bin/qmake
+QMAKE         = /usr/bin/qmake
 DEL_FILE      = rm -f
 CHK_DIR_EXISTS= test -d
 MKDIR         = mkdir -p
@@ -96,43 +96,43 @@ sub-showaccounts-install_subtargets: showaccounts/$(MAKEFILE) FORCE
 sub-showaccounts-uninstall_subtargets: showaccounts/$(MAKEFILE) FORCE
        cd showaccounts/ && $(MAKE) -f $(MAKEFILE) uninstall
 
-Makefile: tests.pro  /opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf
+Makefile: tests.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf
        $(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tests.pro
-/opt/qt4-maemo5/mkspecs/common/unix.conf:
-/opt/qt4-maemo5/mkspecs/common/linux.conf:
-/opt/qt4-maemo5/mkspecs/qconfig.pri:
-/opt/qt4-maemo5/mkspecs/features/qt_functions.prf:
-/opt/qt4-maemo5/mkspecs/features/qt_config.prf:
-/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf:
-/opt/qt4-maemo5/mkspecs/features/default_pre.prf:
-/opt/qt4-maemo5/mkspecs/features/release.prf:
-/opt/qt4-maemo5/mkspecs/features/default_post.prf:
-/opt/qt4-maemo5/mkspecs/features/warn_on.prf:
-/opt/qt4-maemo5/mkspecs/features/qt.prf:
-/opt/qt4-maemo5/mkspecs/features/unix/thread.prf:
-/opt/qt4-maemo5/mkspecs/features/moc.prf:
-/opt/qt4-maemo5/mkspecs/features/resources.prf:
-/opt/qt4-maemo5/mkspecs/features/uic.prf:
-/opt/qt4-maemo5/mkspecs/features/yacc.prf:
-/opt/qt4-maemo5/mkspecs/features/lex.prf:
-/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 qmake: qmake_all FORCE
        @$(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tests.pro
 
index 7d5c877..888a299 100644 (file)
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: showaccounts
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue Feb 9 00:59:26 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 10 14:28:31 2010
 # Project:  showaccounts.pro
 # Template: app
-# Command: /opt/qt4-maemo5/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile showaccounts.pro
+# Command: /usr/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile showaccounts.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -13,13 +13,13 @@ CXX           = g++
 DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_DBUS_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/opt/qt4-maemo5/mkspecs/linux-g++-maemo5 -I. -I/opt/qt4-maemo5/include/QtCore -I/opt/qt4-maemo5/include/QtNetwork -I/opt/qt4-maemo5/include/QtDBus -I/opt/qt4-maemo5/include -I/usr/include/telepathy-1.0 -I../../tpsession -I.
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I/targets/FREMANTLE_ARMEL/usr/include -I/usr/include/telepathy-1.0 -I../../tpsession -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/opt/qt4-maemo5/lib
-LIBS          = $(SUBLIBS)  -L/opt/qt4-maemo5/lib -ltelepathy-qt4 -L../../tpsession -ltpsession -L/opt/qt4-maemo5/lib -lQtNetwork -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtDBus -lQtXml -lQtCore -lpthread 
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
+LIBS          = $(SUBLIBS)  -L/usr/lib -ltelepathy-qt4 -L../../tpsession -ltpsession -L/usr/lib -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /opt/qt4-maemo5/bin/qmake
+QMAKE         = /usr/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -48,26 +48,26 @@ SOURCES       = main.cpp \
 OBJECTS       = main.o \
                testprog.o \
                moc_testprog.o
-DIST          = /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                showaccounts.pro
 QMAKE_TARGET  = showaccounts
 DESTDIR       = 
@@ -100,55 +100,55 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: showaccounts.pro  /opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
-               /opt/qt4-maemo5/lib/libQtDBus.prl \
-               /opt/qt4-maemo5/lib/libQtXml.prl \
-               /opt/qt4-maemo5/lib/libQtCore.prl \
-               /opt/qt4-maemo5/lib/libQtNetwork.prl
+Makefile: showaccounts.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib/libQtDBus.prl \
+               /usr/lib/libQtXml.prl \
+               /usr/lib/libQtCore.prl \
+               /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile showaccounts.pro
-/opt/qt4-maemo5/mkspecs/common/unix.conf:
-/opt/qt4-maemo5/mkspecs/common/linux.conf:
-/opt/qt4-maemo5/mkspecs/qconfig.pri:
-/opt/qt4-maemo5/mkspecs/features/qt_functions.prf:
-/opt/qt4-maemo5/mkspecs/features/qt_config.prf:
-/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf:
-/opt/qt4-maemo5/mkspecs/features/default_pre.prf:
-/opt/qt4-maemo5/mkspecs/features/release.prf:
-/opt/qt4-maemo5/mkspecs/features/default_post.prf:
-/opt/qt4-maemo5/mkspecs/features/warn_on.prf:
-/opt/qt4-maemo5/mkspecs/features/qt.prf:
-/opt/qt4-maemo5/mkspecs/features/moc.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf:
-/opt/qt4-maemo5/mkspecs/features/unix/thread.prf:
-/opt/qt4-maemo5/mkspecs/features/resources.prf:
-/opt/qt4-maemo5/mkspecs/features/uic.prf:
-/opt/qt4-maemo5/mkspecs/features/yacc.prf:
-/opt/qt4-maemo5/mkspecs/features/lex.prf:
-/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
-/opt/qt4-maemo5/lib/libQtDBus.prl:
-/opt/qt4-maemo5/lib/libQtXml.prl:
-/opt/qt4-maemo5/lib/libQtCore.prl:
-/opt/qt4-maemo5/lib/libQtNetwork.prl:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtDBus.prl:
+/usr/lib/libQtXml.prl:
+/usr/lib/libQtCore.prl:
+/usr/lib/libQtNetwork.prl:
 qmake:  FORCE
        @$(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile showaccounts.pro
 
@@ -177,7 +177,7 @@ compiler_moc_header_make_all: moc_testprog.cpp
 compiler_moc_header_clean:
        -$(DEL_FILE) moc_testprog.cpp
 moc_testprog.cpp: testprog.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) testprog.h -o moc_testprog.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) testprog.h -o moc_testprog.cpp
 
 compiler_dbus_interface_source_make_all:
 compiler_dbus_interface_source_clean:
index 7e88e9f..c9e02c5 100755 (executable)
Binary files a/tpsession-0.1/tests/showaccounts/showaccounts and b/tpsession-0.1/tests/showaccounts/showaccounts differ
index 8df5dc0..3b77770 100644 (file)
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: smstest
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue Feb 9 00:59:22 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 10 14:28:10 2010
 # Project:  smstest.pro
 # Template: app
-# Command: /opt/qt4-maemo5/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile smstest.pro
+# Command: /usr/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile smstest.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -13,13 +13,13 @@ CXX           = g++
 DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_DBUS_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/opt/qt4-maemo5/mkspecs/linux-g++-maemo5 -I. -I/opt/qt4-maemo5/include/QtCore -I/opt/qt4-maemo5/include/QtNetwork -I/opt/qt4-maemo5/include/QtDBus -I/opt/qt4-maemo5/include -I/usr/include/telepathy-1.0 -I../../tpsession -I.
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I/targets/FREMANTLE_ARMEL/usr/include -I/usr/include/telepathy-1.0 -I../../tpsession -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/opt/qt4-maemo5/lib
-LIBS          = $(SUBLIBS)  -L/opt/qt4-maemo5/lib -ltelepathy-qt4 -L../../tpsession -ltpsession -L/opt/qt4-maemo5/lib -lQtNetwork -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtDBus -lQtXml -lQtCore -lpthread 
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
+LIBS          = $(SUBLIBS)  -L/usr/lib -ltelepathy-qt4 -L../../tpsession -ltpsession -L/usr/lib -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /opt/qt4-maemo5/bin/qmake
+QMAKE         = /usr/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -48,26 +48,26 @@ SOURCES       = main.cpp \
 OBJECTS       = main.o \
                testprog.o \
                moc_testprog.o
-DIST          = /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                smstest.pro
 QMAKE_TARGET  = smstest
 DESTDIR       = 
@@ -100,55 +100,55 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: smstest.pro  /opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
-               /opt/qt4-maemo5/lib/libQtDBus.prl \
-               /opt/qt4-maemo5/lib/libQtXml.prl \
-               /opt/qt4-maemo5/lib/libQtCore.prl \
-               /opt/qt4-maemo5/lib/libQtNetwork.prl
+Makefile: smstest.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib/libQtDBus.prl \
+               /usr/lib/libQtXml.prl \
+               /usr/lib/libQtCore.prl \
+               /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile smstest.pro
-/opt/qt4-maemo5/mkspecs/common/unix.conf:
-/opt/qt4-maemo5/mkspecs/common/linux.conf:
-/opt/qt4-maemo5/mkspecs/qconfig.pri:
-/opt/qt4-maemo5/mkspecs/features/qt_functions.prf:
-/opt/qt4-maemo5/mkspecs/features/qt_config.prf:
-/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf:
-/opt/qt4-maemo5/mkspecs/features/default_pre.prf:
-/opt/qt4-maemo5/mkspecs/features/release.prf:
-/opt/qt4-maemo5/mkspecs/features/default_post.prf:
-/opt/qt4-maemo5/mkspecs/features/warn_on.prf:
-/opt/qt4-maemo5/mkspecs/features/qt.prf:
-/opt/qt4-maemo5/mkspecs/features/moc.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf:
-/opt/qt4-maemo5/mkspecs/features/unix/thread.prf:
-/opt/qt4-maemo5/mkspecs/features/resources.prf:
-/opt/qt4-maemo5/mkspecs/features/uic.prf:
-/opt/qt4-maemo5/mkspecs/features/yacc.prf:
-/opt/qt4-maemo5/mkspecs/features/lex.prf:
-/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
-/opt/qt4-maemo5/lib/libQtDBus.prl:
-/opt/qt4-maemo5/lib/libQtXml.prl:
-/opt/qt4-maemo5/lib/libQtCore.prl:
-/opt/qt4-maemo5/lib/libQtNetwork.prl:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtDBus.prl:
+/usr/lib/libQtXml.prl:
+/usr/lib/libQtCore.prl:
+/usr/lib/libQtNetwork.prl:
 qmake:  FORCE
        @$(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile smstest.pro
 
@@ -177,7 +177,7 @@ compiler_moc_header_make_all: moc_testprog.cpp
 compiler_moc_header_clean:
        -$(DEL_FILE) moc_testprog.cpp
 moc_testprog.cpp: testprog.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) testprog.h -o moc_testprog.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) testprog.h -o moc_testprog.cpp
 
 compiler_dbus_interface_source_make_all:
 compiler_dbus_interface_source_clean:
index 1719c10..cd322fb 100755 (executable)
Binary files a/tpsession-0.1/tests/smstest/smstest and b/tpsession-0.1/tests/smstest/smstest differ
index 531bcb5..72079f7 100644 (file)
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: syncsms
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue Feb 9 00:59:24 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 10 14:28:20 2010
 # Project:  syncsms.pro
 # Template: app
-# Command: /opt/qt4-maemo5/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile syncsms.pro
+# Command: /usr/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile syncsms.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -13,13 +13,13 @@ CXX           = g++
 DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_DBUS_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/opt/qt4-maemo5/mkspecs/linux-g++-maemo5 -I. -I/opt/qt4-maemo5/include/QtCore -I/opt/qt4-maemo5/include/QtNetwork -I/opt/qt4-maemo5/include/QtDBus -I/opt/qt4-maemo5/include -I/usr/include/telepathy-1.0 -I../../tpsession -I.
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I/targets/FREMANTLE_ARMEL/usr/include -I/usr/include/telepathy-1.0 -I../../tpsession -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/opt/qt4-maemo5/lib
-LIBS          = $(SUBLIBS)  -L/opt/qt4-maemo5/lib -ltelepathy-qt4 -L../../tpsession -ltpsession -L/opt/qt4-maemo5/lib -lQtNetwork -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtDBus -lQtXml -lQtCore -lpthread 
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
+LIBS          = $(SUBLIBS)  -L/usr/lib -ltelepathy-qt4 -L../../tpsession -ltpsession -L/usr/lib -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /opt/qt4-maemo5/bin/qmake
+QMAKE         = /usr/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -48,26 +48,26 @@ SOURCES       = main.cpp \
 OBJECTS       = main.o \
                testprog.o \
                moc_testprog.o
-DIST          = /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                syncsms.pro
 QMAKE_TARGET  = syncsms
 DESTDIR       = 
@@ -100,55 +100,55 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: syncsms.pro  /opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
-               /opt/qt4-maemo5/lib/libQtDBus.prl \
-               /opt/qt4-maemo5/lib/libQtXml.prl \
-               /opt/qt4-maemo5/lib/libQtCore.prl \
-               /opt/qt4-maemo5/lib/libQtNetwork.prl
+Makefile: syncsms.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib/libQtDBus.prl \
+               /usr/lib/libQtXml.prl \
+               /usr/lib/libQtCore.prl \
+               /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile syncsms.pro
-/opt/qt4-maemo5/mkspecs/common/unix.conf:
-/opt/qt4-maemo5/mkspecs/common/linux.conf:
-/opt/qt4-maemo5/mkspecs/qconfig.pri:
-/opt/qt4-maemo5/mkspecs/features/qt_functions.prf:
-/opt/qt4-maemo5/mkspecs/features/qt_config.prf:
-/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf:
-/opt/qt4-maemo5/mkspecs/features/default_pre.prf:
-/opt/qt4-maemo5/mkspecs/features/release.prf:
-/opt/qt4-maemo5/mkspecs/features/default_post.prf:
-/opt/qt4-maemo5/mkspecs/features/warn_on.prf:
-/opt/qt4-maemo5/mkspecs/features/qt.prf:
-/opt/qt4-maemo5/mkspecs/features/moc.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf:
-/opt/qt4-maemo5/mkspecs/features/unix/thread.prf:
-/opt/qt4-maemo5/mkspecs/features/resources.prf:
-/opt/qt4-maemo5/mkspecs/features/uic.prf:
-/opt/qt4-maemo5/mkspecs/features/yacc.prf:
-/opt/qt4-maemo5/mkspecs/features/lex.prf:
-/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
-/opt/qt4-maemo5/lib/libQtDBus.prl:
-/opt/qt4-maemo5/lib/libQtXml.prl:
-/opt/qt4-maemo5/lib/libQtCore.prl:
-/opt/qt4-maemo5/lib/libQtNetwork.prl:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtDBus.prl:
+/usr/lib/libQtXml.prl:
+/usr/lib/libQtCore.prl:
+/usr/lib/libQtNetwork.prl:
 qmake:  FORCE
        @$(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile syncsms.pro
 
@@ -177,7 +177,7 @@ compiler_moc_header_make_all: moc_testprog.cpp
 compiler_moc_header_clean:
        -$(DEL_FILE) moc_testprog.cpp
 moc_testprog.cpp: testprog.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) testprog.h -o moc_testprog.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) testprog.h -o moc_testprog.cpp
 
 compiler_dbus_interface_source_make_all:
 compiler_dbus_interface_source_clean:
index ab0a259..09c347d 100755 (executable)
Binary files a/tpsession-0.1/tests/syncsms/syncsms and b/tpsession-0.1/tests/syncsms/syncsms differ
index 281737f..264d3e4 100644 (file)
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: libtpsession.so.0.1.0
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue Feb 9 00:59:18 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 10 14:27:47 2010
 # Project:  tpsession.pro
 # Template: lib
-# Command: /opt/qt4-maemo5/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
+# Command: /usr/bin/qmake -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -13,13 +13,13 @@ CXX           = g++
 DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_DBUS_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
 CXXFLAGS      = -pipe -g -Wall -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-INCPATH       = -I/opt/qt4-maemo5/mkspecs/linux-g++-maemo5 -I. -I/opt/qt4-maemo5/include/QtCore -I/opt/qt4-maemo5/include/QtNetwork -I/opt/qt4-maemo5/include/QtDBus -I/opt/qt4-maemo5/include -I/usr/include/telepathy-1.0 -I.
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I/targets/FREMANTLE_ARMEL/usr/include -I/usr/include/telepathy-1.0 -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/opt/qt4-maemo5/lib -shared -Wl,-soname,libtpsession.so.0
-LIBS          = $(SUBLIBS)  -L/opt/qt4-maemo5/lib -L/opt/qt4-maemo5/lib -lQtNetwork -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtDBus -lQtXml -lQtCore -lpthread 
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib -shared -Wl,-soname,libtpsession.so.0
+LIBS          = $(SUBLIBS)  -L/usr/lib -L/usr/lib -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /opt/qt4-maemo5/bin/qmake
+QMAKE         = /usr/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -58,26 +58,26 @@ OBJECTS       = tpsession.o \
                moc_tpsessionaccount.o \
                moc_tpsessionchannel.o \
                moc_tpsessionobserver.o
-DIST          = /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                tpsession.pro
 QMAKE_TARGET  = tpsession
 DESTDIR       = 
@@ -127,55 +127,55 @@ $(TARGETA):  $(OBJECTS) $(OBJCOMP)
        -$(DEL_FILE) $(TARGETA) 
        $(AR) $(TARGETA) $(OBJECTS)
 
-Makefile: tpsession.pro  /opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /opt/qt4-maemo5/mkspecs/features/release.prf \
-               /opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf \
-               /opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf \
-               /opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
-               /opt/qt4-maemo5/lib/libQtDBus.prl \
-               /opt/qt4-maemo5/lib/libQtXml.prl \
-               /opt/qt4-maemo5/lib/libQtCore.prl \
-               /opt/qt4-maemo5/lib/libQtNetwork.prl
+Makefile: tpsession.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib/libQtDBus.prl \
+               /usr/lib/libQtXml.prl \
+               /usr/lib/libQtCore.prl \
+               /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
-/opt/qt4-maemo5/mkspecs/common/unix.conf:
-/opt/qt4-maemo5/mkspecs/common/linux.conf:
-/opt/qt4-maemo5/mkspecs/qconfig.pri:
-/opt/qt4-maemo5/mkspecs/features/qt_functions.prf:
-/opt/qt4-maemo5/mkspecs/features/qt_config.prf:
-/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf:
-/opt/qt4-maemo5/mkspecs/features/default_pre.prf:
-/opt/qt4-maemo5/mkspecs/features/release.prf:
-/opt/qt4-maemo5/mkspecs/features/default_post.prf:
-/opt/qt4-maemo5/mkspecs/features/warn_on.prf:
-/opt/qt4-maemo5/mkspecs/features/qt.prf:
-/opt/qt4-maemo5/mkspecs/features/moc.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusinterfaces.prf:
-/opt/qt4-maemo5/mkspecs/features/dbusadaptors.prf:
-/opt/qt4-maemo5/mkspecs/features/unix/thread.prf:
-/opt/qt4-maemo5/mkspecs/features/resources.prf:
-/opt/qt4-maemo5/mkspecs/features/uic.prf:
-/opt/qt4-maemo5/mkspecs/features/yacc.prf:
-/opt/qt4-maemo5/mkspecs/features/lex.prf:
-/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
-/opt/qt4-maemo5/lib/libQtDBus.prl:
-/opt/qt4-maemo5/lib/libQtXml.prl:
-/opt/qt4-maemo5/lib/libQtCore.prl:
-/opt/qt4-maemo5/lib/libQtNetwork.prl:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtDBus.prl:
+/usr/lib/libQtXml.prl:
+/usr/lib/libQtCore.prl:
+/usr/lib/libQtNetwork.prl:
 qmake:  FORCE
        @$(QMAKE) -unix QMAKE_CC\ =\ cc QMAKE_CXX\ =\ g++ QMAKE_CFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 QMAKE_CXXFLAGS_RELEASE\ =\ \ -g\ -Wall\ -O2 -o Makefile tpsession.pro
 
@@ -208,17 +208,17 @@ moc_tpsession.cpp: tpsessionaccount.h \
                tpsessionchannel.h \
                tpsessionobserver.h \
                tpsession.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) tpsession.h -o moc_tpsession.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) tpsession.h -o moc_tpsession.cpp
 
 moc_tpsessionaccount.cpp: tpsessionchannel.h \
                tpsessionaccount.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) tpsessionaccount.h -o moc_tpsessionaccount.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) tpsessionaccount.h -o moc_tpsessionaccount.cpp
 
 moc_tpsessionchannel.cpp: tpsessionchannel.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) tpsessionchannel.h -o moc_tpsessionchannel.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) tpsessionchannel.h -o moc_tpsessionchannel.cpp
 
 moc_tpsessionobserver.cpp: tpsessionobserver.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) tpsessionobserver.h -o moc_tpsessionobserver.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) tpsessionobserver.h -o moc_tpsessionobserver.cpp
 
 compiler_dbus_interface_source_make_all:
 compiler_dbus_interface_source_clean:
@@ -285,19 +285,19 @@ moc_tpsessionobserver.o: moc_tpsessionobserver.cpp
 ####### Install
 
 install_target: first FORCE
-       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/qt4-maemo5/lib/ || $(MKDIR) $(INSTALL_ROOT)/opt/qt4-maemo5/lib/ 
-       -$(INSTALL_PROGRAM) "$(TARGET)" "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET)"
-       -$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET)"
-       -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET0)"
-       -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET1)"
-       -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET2)"
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib/ || $(MKDIR) $(INSTALL_ROOT)/usr/lib/ 
+       -$(INSTALL_PROGRAM) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET)"
+       -$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/usr/lib/$(TARGET)"
+       -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET0)"
+       -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET1)"
+       -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET2)"
 
 uninstall_target:  FORCE
-       -$(DEL_FILE) "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET)" 
-        -$(DEL_FILE) "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET0)" 
-        -$(DEL_FILE) "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET1)" 
-        -$(DEL_FILE) "$(INSTALL_ROOT)/opt/qt4-maemo5/lib/$(TARGET2)"
-       -$(DEL_DIR) $(INSTALL_ROOT)/opt/qt4-maemo5/lib/ 
+       -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET)" 
+        -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET0)" 
+        -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET1)" 
+        -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET2)"
+       -$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/ 
 
 
 install_dev: first FORCE
index 6edca45..1aad68c 100755 (executable)
Binary files a/tpsession-0.1/tpsession/libtpsession.so.0.1.0 and b/tpsession-0.1/tpsession/libtpsession.so.0.1.0 differ
index 903e92b..1e46b7b 100644 (file)
@@ -73,6 +73,7 @@ TpSession::TpSession(QString cmname,bool synchronous)
 
     mAM = Tp::AccountManager::create();
     reqCm=cmname;
+    sync=synchronous;
     connect(mAM->becomeReady(),
             SIGNAL(finished(Tp::PendingOperation *)),
             SLOT(onAMReady(Tp::PendingOperation *)));
@@ -100,7 +101,7 @@ TpSession* TpSession::instance(bool synchronous)
 
 void TpSession::onAMReady(Tp::PendingOperation *op)
 {
- qDebug() << "TpSession::onAMReady";
+  // qDebug() << "TpSession::onAMReady";
  TpSessionAccount *tpacc;
 
    foreach (const QString &path, mAM->allAccountPaths()) {
@@ -123,22 +124,23 @@ void TpSession::onAccountCreated(const QString &path)
 
 void TpSession::onAccountReady(TpSessionAccount *tpacc)
 {
-    qDebug() << "TpSession::onAccountReady:Account " << tpacc->acc->cmName() << "is Ready";
-    connect(tpacc,SIGNAL(messageReceived(const Tp::ReceivedMessage &,TpSessionAccount *)),
+  qDebug() << "TpSession::onAccountReady:Account " << tpacc->acc->cmName() << "is Ready sync=" << sync << "waiting:" << reqCm;
+  connect(tpacc,SIGNAL(messageReceived(const Tp::ReceivedMessage &,TpSessionAccount *)),
                   SLOT(onMessageReceived(const Tp::ReceivedMessage &,TpSessionAccount *)));
-    if(!reqCm.isEmpty() && tpacc->acc->cmName()==reqCm) {
+  if(!reqCm.isEmpty() && tpacc->acc->cmName()==reqCm) {
     if(sync) {
         sync=false;
         loop.quit();
-        emit accountReady(tpacc);
-     if(!reqMsg.isEmpty()) tpacc->sendMessageToAddress(reqAddress,reqMsg);
+       qDebug() << "sync eventloop exit";
     }
+     emit accountReady(tpacc);
+     if(!reqMsg.isEmpty()) tpacc->sendMessageToAddress(reqAddress,reqMsg);
   }
 }
 
 void TpSession::onMessageReceived(const Tp::ReceivedMessage &msg,TpSessionAccount *acc)
 {
-    qDebug() << "TestProg::onMessageReceived " << msg.text() << "from " << msg.sender()->id();
+  //    qDebug() << "TestProg::onMessageReceived " << msg.text() << "from " << msg.sender()->id();
     emit messageReceived(msg,acc);
 }
 
@@ -157,15 +159,15 @@ void TpSession::sendMessageToAddress(QString connectionMgr,QString address,QStri
 /**
  * Returns pointer to TpSessionAccout object with specified connection manager or protocol, returns NULL if no match found
  *
- * \param cm  Name of the connection manager, if left empty matches every entry
+ * \param cm  Name of the connection manager, or iniqueIdentifier (dbus path  to cm) if left empty matches every entry
  * \param protocol Name of the protocol manager, if left empty matches every entry
  */
 TpSessionAccount* TpSession::getAccount(const  QString cm,QString protocol)
 {
- qDebug() << "TpSession::getAccount" << cm << " " << protocol;
+  // qDebug() << "TpSession::getAccount" << cm << " " << protocol;
  foreach (TpSessionAccount *tpacc, accounts) {
-     if((!cm.isEmpty()  && tpacc->acc->cmName()==cm) || (!protocol.isEmpty() && tpacc->acc->protocol()==protocol)) {
-     qDebug() << "TpSession::getAccount found" << tpacc->acc->cmName() << " " << tpacc->acc->protocol();
+   if((!cm.isEmpty()  && ((tpacc->acc->cmName()==cm) || (tpacc->acc->uniqueIdentifier()==cm))) || (!protocol.isEmpty() && tpacc->acc->protocol()==protocol)) {
+     //     qDebug() << "TpSession::getAccount found" << tpacc->acc->cmName() << " " << tpacc->acc->protocol() << " " << tpacc->acc->uniqueIdentifier();
      return tpacc;
      }
  }
@@ -175,7 +177,7 @@ TpSessionAccount* TpSession::getAccount(const  QString cm,QString protocol)
 void TpSession::createObserver()
 {
 
-    qDebug() << __PRETTY_FUNCTION__ ;
+      qDebug() << __PRETTY_FUNCTION__ ;
 
     registrar = Tp::ClientRegistrar::create();
 
@@ -200,7 +202,7 @@ void TpSession::createObserver()
       Tp::AbstractClientPtr::dynamicCast(Tp::SharedPtr<TpSessionObserver>(observer)),
       "TpSessionChannelObserver");
 
-        qDebug() << "TpSession::createObserver" << (registered ? "started" : "failed");
+    //        qDebug() << "TpSession::createObserver" << (registered ? "started" : "failed");
 
 }
 
@@ -210,7 +212,7 @@ void TpSession::createChannelListener(const QString &channelType,
                                    const Tp::AccountPtr &account,
                                    const Tp::ChannelPtr &channel)
 {
-    qDebug() << "TpSession::createChannelListener";
+      qDebug() << "TpSession::createChannelListener";
 
     QString channelObjectPath = channel->objectPath();
 
index 7a5cbf0..bb5e982 100644 (file)
@@ -34,7 +34,7 @@
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >Debug</value>
    <value key="QtVersionId" type="int" >0</value>
    <value key="addQDumper" type="" ></value>
-   <value key="buildDirectory" type="QString" >/Users/kate/scratchbox/fremantle/tpsession/tpsession</value>
+   <value key="buildDirectory" type="QString" >/Users/kate/scratchbox/fremantle/tpsession/tpsession-0.1/tpsession</value>
   </valuemap>
  </data>
  <data>
index a44be5d..5050921 100644 (file)
@@ -60,6 +60,7 @@
  * \param  peedId PeerId, as example caller telephone number
  * \param channeDetails needed if you would like to create a channel. For text chanels TpSession creates channel automatically. For calls, Maemo Call UI handles callcreation
  */
+
 /**
  * Construct a new TpSessionAccount object. This constructor is called by TpSession class when new account is created or fetched from account manager. It is not inended to be used stand alone
  *
@@ -72,7 +73,7 @@ TpSessionAccount::TpSessionAccount(Tp::AccountManagerPtr am,const QString &objec
 {
   connect(mAcc->becomeReady(),SIGNAL(finished(Tp::PendingOperation *)),SLOT(onReady(Tp::PendingOperation *)));
   ready=false;
-  qDebug() << "TpSessionAccount::TpSessionAccount objectPath=" << objectPath;
+  //  qDebug() << "TpSessionAccount::TpSessionAccount objectPath=" << objectPath;
 };
 
 
@@ -80,8 +81,8 @@ void TpSessionAccount::onReady(Tp::PendingOperation *op)
 {
 
     acc = mAcc.data();
-    qDebug() << "TpSessionAccount::onReady cmName=" << acc->cmName() << "haveConnection=" <<
-        (acc->haveConnection()? ( acc->connection()->isReady() ? "Ready":"notReady"):"no");
+    //    qDebug() << "TpSessionAccount::onReady cmName=" << acc->cmName() << "haveConnection=" <<
+    //    (acc->haveConnection()? ( acc->connection()->isReady() ? "Ready":"notReady"):"no");
 
     if(acc->haveConnection()) {
 
@@ -89,7 +90,7 @@ void TpSessionAccount::onReady(Tp::PendingOperation *op)
                 SIGNAL(finished(Tp::PendingOperation *)),
                 SLOT(onContactsConnectionReady(Tp::PendingOperation *)));
          if (acc->connection()->isReady() && acc->connection()->interfaces().contains(TELEPATHY_INTERFACE_CONNECTION_INTERFACE_REQUESTS)) {
-            qDebug() << "TpSessionAccount::onReady: connecting to Connection.Interface.NewChannels";
+          //            qDebug() << "TpSessionAccount::onReady: connecting to Connection.Interface.NewChannels";
             connect(acc->connection()->requestsInterface(),
                 SIGNAL(NewChannels(const Tp::ChannelDetailsList&)),
                 SLOT(onNewChannels(const Tp::ChannelDetailsList&)));
@@ -109,7 +110,7 @@ void TpSessionAccount::onContactsConnectionReady(Tp::PendingOperation *op)
     }
 
     if (acc->connection()->interfaces().contains(TELEPATHY_INTERFACE_CONNECTION_INTERFACE_REQUESTS)) {
-            qDebug() << "TpSessionAccount::onContactsConectionReady: connecting to Connection.Interface.NewChannels";
+      //      //            qDebug() << "TpSessionAccount::onContactsConectionReady: connecting to Connection.Interface.NewChannels";
             connect(acc->connection()->requestsInterface(),
                 SIGNAL(NewChannels(const Tp::ChannelDetailsList&)),
                 SLOT(onNewChannels(const Tp::ChannelDetailsList&)));
@@ -121,12 +122,12 @@ void TpSessionAccount::onContactsConnectionReady(Tp::PendingOperation *op)
             SIGNAL(presencePublicationRequested(const Tp::Contacts &)),
             SLOT(onPresencePublicationRequested(const Tp::Contacts &)));
 #endif
-    qDebug() << "TpSessionAccount::onContactsConnectionReady "<< acc->cmName() ;
+    //    qDebug() << "TpSessionAccount::onContactsConnectionReady "<< acc->cmName() ;
     //    RosterItem *item;
     bool exists;
     myContacts=contactsConn->contactManager()->allKnownContacts();
     foreach (const Tp::ContactPtr &contact, myContacts) {
-        qDebug() << "id=" <<contact->id() << " alias=" << contact->alias() << " presence=" << contact->presenceStatus()  ;
+      //        qDebug() << "id=" <<contact->id() << " alias=" << contact->alias() << " presence=" << contact->presenceStatus()  ;
         if(contact->id()==reqContact) {
             addOutgoingChannel(contact);
             reqContact="";
@@ -195,7 +196,7 @@ void TpSessionAccount::onNewContactRetrieved(Tp::PendingOperation *op)
     }
 
     Tp::ContactPtr contact = contacts.first();
-    qDebug() << "TpSessionAccount::onContactRetrieved" << reqContact;
+    //    qDebug() << "TpSessionAccount::onContactRetrieved" << reqContact;
     if(!reqContact.isEmpty()) addOutgoingChannel(contacts.first());
 }
 /**
@@ -231,7 +232,7 @@ void TpSessionAccount::addOutgoingChannel(const Tp::ContactPtr &contact)
 {
 
 
-    qDebug() << "TpSessionAccount::addOutgoingChannel";
+  //    qDebug() << "TpSessionAccount::addOutgoingChannel";
 
      TpSessionChannel* newChannel=new TpSessionChannel(contact->manager()->connection(),contact);
      connect(newChannel,SIGNAL(messageReceived(const Tp::ReceivedMessage &,TpSessionChannel *)),
@@ -244,7 +245,7 @@ void TpSessionAccount::addOutgoingChannel(const Tp::ContactPtr &contact)
 
 void TpSessionAccount::onOutgoingChannelReady(TpSessionChannel *ch)
 {
- qDebug() << "TpSessionAccoiunt::onOutgoingChannelReady";
+  // qDebug() << "TpSessionAccoiunt::onOutgoingChannelReady";
  emit channelReady(this);
  if(!reqMessage.isEmpty()) ch->sendMessage(reqMessage);
  reqMessage.clear();
@@ -253,13 +254,13 @@ void TpSessionAccount::onOutgoingChannelReady(TpSessionChannel *ch)
 
 void TpSessionAccount::onMessageSent(const Tp::Message &msg,Tp::MessageSendingFlags, const QString &flags)
 {
-    qDebug() << "TpSessionAccount::onMessageSent";
+  //    qDebug() << "TpSessionAccount::onMessageSent";
     emit messageSent(msg,this);
 };
 
 void TpSessionAccount::onMessageReceived(const Tp::ReceivedMessage &msg,TpSessionChannel *ch)
 {
-    qDebug() << "TpSessionAccount::onMessageReceived " << msg.text();
+  //    qDebug() << "TpSessionAccount::onMessageReceived " << msg.text();
     emit messageReceived(msg,this);
 };
 
@@ -267,18 +268,18 @@ void TpSessionAccount::onNewChannels(const Tp::ChannelDetailsList &channels)
 {
 
     Tp::TextChannelPtr myIngoingTextChannel;
-    qDebug() << "TpSessionAccount::onNewChannels";
+    //    qDebug() << "TpSessionAccount::onNewChannels";
     foreach (const Tp::ChannelDetails &details, channels) {
         QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
         QString targetId = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID")).toString();
         bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
-        qDebug() << " channelType:" << channelType <<" requested  :" << requested << " targetId" << targetId;
+       //        qDebug() << " channelType:" << channelType <<" requested  :" << requested << " targetId" << targetId;
 
         emit newChannel(this,channelType,targetId,details);
         if (channelType == TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT && !requested) {
 
             myIngoingTextChannel = Tp::TextChannel::create(acc->connection(),details.channel.path(),details.properties);
-            qDebug() << "TpSessionAccount::onNewChannels path=" <<"path " << myIngoingTextChannel->objectPath();
+           //            qDebug() << "TpSessionAccount::onNewChannels path=" <<"path " << myIngoingTextChannel->objectPath();
 
             TpSessionChannel* newChannel=new TpSessionChannel( myIngoingTextChannel);
             connect(newChannel,SIGNAL(messageReceived(const Tp::ReceivedMessage &,TpSessionChannel *)),
@@ -286,7 +287,7 @@ void TpSessionAccount::onNewChannels(const Tp::ChannelDetailsList &channels)
             myChannels+=newChannel;
         }
         if (channelType == TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA && !requested) {
-            qDebug() << "Incoming call" ;
+         //            qDebug() << "Incoming call" ;
         }
     }
 }
index 36e1b85..759289c 100644 (file)
@@ -74,7 +74,7 @@
 TpSessionChannel::TpSessionChannel(Tp::ConnectionPtr conn,const Tp::ContactPtr &contact)
 {
     QVariantMap request;
-    qDebug() << "TpSessionChannel::TpSessionChannel" <<"contact.id() " << contact->id();
+    //    qDebug() << "TpSessionChannel::TpSessionChannel" <<"contact.id() " << contact->id();
     request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
                    TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
     request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
@@ -100,7 +100,7 @@ TpSessionChannel::TpSessionChannel(Tp::ConnectionPtr conn,const Tp::ContactPtr &
 
 TpSessionChannel::TpSessionChannel(Tp::TextChannelPtr ch)
 {
-     qDebug() << "TpSessionChannel::TpSessionChannel" <<"path " << ch->objectPath();
+  //     qDebug() << "TpSessionChannel::TpSessionChannel" <<"path " << ch->objectPath();
      channel=ch;
      connect(channel->becomeReady(Tp::TextChannel::FeatureMessageQueue|Tp::TextChannel::FeatureMessageSentSignal),
                     SIGNAL(finished(Tp::PendingOperation *)),
@@ -110,7 +110,7 @@ TpSessionChannel::TpSessionChannel(Tp::TextChannelPtr ch)
 
 void TpSessionChannel::onChannelCreated(Tp::PendingOperation *op)
 {
-   qDebug() << "TpSessionChannel::onOutgoingChannelCreated" ;
+  //   qDebug() << "TpSessionChannel::onOutgoingChannelCreated" ;
    if (op->isError()) {
      qWarning() << "Connection cannot become connected" ;
      return;
@@ -126,8 +126,8 @@ void TpSessionChannel::onChannelCreated(Tp::PendingOperation *op)
 
 void TpSessionChannel::onChannelReady(Tp::PendingOperation *op)
 {
- qDebug() << "TpSessionChannel::onChannelReady type=" << channel->channelType() <<"path " << channel->objectPath() <<
-            "initiatorContact=" << (channel->initiatorContact() ? channel->initiatorContact()->id():"NULL") ;
+  // qDebug() << "TpSessionChannel::onChannelReady type=" << channel->channelType() <<"path " << channel->objectPath() <<
+  //            "initiatorContact=" << (channel->initiatorContact() ? channel->initiatorContact()->id():"NULL") ;
          ;
  connect(channel.data(),
          SIGNAL(messageReceived(const Tp::ReceivedMessage &)),
@@ -140,7 +140,7 @@ void TpSessionChannel::onChannelReady(Tp::PendingOperation *op)
  peerContact=channel->initiatorContact();
  QList<Tp::ReceivedMessage> queuedMessages = channel->messageQueue();
  foreach(Tp::ReceivedMessage message, queuedMessages) {
-      qDebug()  << "received " << message.text();
+   //      qDebug()  << "received " << message.text();
            emit messageReceived(message,this);
     }
 }
@@ -157,12 +157,12 @@ void TpSessionChannel::sendMessage(QString message)
 }
 void TpSessionChannel::onMessageReceived(const Tp::ReceivedMessage &msg)
 {
-    qDebug() << "TpSessionChannel::onMessageReceived " << msg.text();
+  //    qDebug() << "TpSessionChannel::onMessageReceived " << msg.text();
     emit messageReceived(msg,this);
 };
 void TpSessionChannel::onMessageSent(const Tp::Message &msg,Tp::MessageSendingFlags sflags, const QString &flags)
 {
-    qDebug() << "TpSessionChannel::onMessageSent";
+  //    qDebug() << "TpSessionChannel::onMessageSent";
     emit messageSent(msg,sflags,flags,this);
 };
 /**
@@ -178,7 +178,7 @@ QString TpSessionChannel::peerId()
 
 void TpSessionChannel::onChannelDestroyed(QObject *obj)
 {
-    qDebug() << "TpSessionChannel::onChannelDestroyed";
+  //    qDebug() << "TpSessionChannel::onChannelDestroyed";
     //TpSessionChannel *call = (TpSessionChannel *) obj;
      emit channelDestroyed(this);
 }