Fixed a ValaPrecompile bug

3 files changed, 310 insertions, 3 deletions

diff --git a/cmake/erlang/ErlangTarget.cmake b/cmake/erlang/ErlangTarget.cmake
index 3a21800..2afbc7a 100644
--- a/cmake/erlang/ErlangTarget.cmake
+++ b/cmake/erlang/ErlangTarget.cmake
@@ -18,7 +18,6 @@ macro(erl_target name)
             ${out_file} 
         COMMAND 
             ${ERLC_EXECUTABLE} 
-        ARGS 
             "-o" ${CMAKE_CURRENT_BINARY_DIR}
             ${ARGS_OPTIONS} 
             ${in_file} 
diff --git a/cmake/vala/ValaPrecompile.cmake b/cmake/vala/ValaPrecompile.cmake
index f69a096..e7c43b2 100644
--- a/cmake/vala/ValaPrecompile.cmake
+++ b/cmake/vala/ValaPrecompile.cmake
@@ -136,10 +136,14 @@ macro(vala_precompile output)
         list(APPEND header_arguments "--internal-header=${ARGS_GENERATE_HEADER}_internal.h")
     endif(ARGS_GENERATE_HEADER)
 
-    add_custom_command(OUTPUT ${out_files} 
+    add_custom_command(OUTPUT ${out_files}
+    COMMAND
+	${CMAKE_COMMAND}
+	-E
+        remove
+	${out_files}
     COMMAND 
         ${VALA_EXECUTABLE} 
-    ARGS 
         "-C" 
         ${header_arguments} 
         ${vapi_arguments}
diff --git a/doc/Gajim_Login.xml b/doc/Gajim_Login.xml
new file mode 100644
index 0000000..db1f5e0
--- /dev/null
+++ b/doc/Gajim_Login.xml
@@ -0,0 +1,304 @@
+<!-- Out -->
+<?xml version='1.0'?>
+<stream:stream xmlns="jabber:client" to="jabber.ccc.de" version="1.0" xmlns:stream="http://etherx.jabber.org/streams" xml:lang="de" >
+
+<!-- In -->
+<?xml version='1.0'?>
+<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='2119586243' from='jabber.ccc.de' version='1.0' xml:lang='en'>
+
+<!-- In -->
+<stream:features>
+<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>
+<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
+<mechanism>DIGEST-MD5</mechanism>
+<mechanism>PLAIN</mechanism>
+</mechanisms>
+<register xmlns='http://jabber.org/features/iq-register'/>
+</stream:features>
+
+<!-- Out -->
+<starttls xmlns="urn:ietf:params:xml:ns:xmpp-tls"/>
+
+<!-- In -->
+<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>
+
+<!-- Out -->
+<?xml version='1.0'?>
+<stream:stream xmlns="jabber:client" to="jabber.ccc.de" version="1.0" xmlns:stream="http://etherx.jabber.org/streams" xml:lang="de" >
+
+<!-- In -->
+<?xml version='1.0'?>
+<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='1754636232' from='jabber.ccc.de' version='1.0' xml:lang='en'>
+
+<!-- In -->
+<stream:features>
+<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
+<mechanism>DIGEST-MD5</mechanism>
+<mechanism>PLAIN</mechanism>
+</mechanisms>
+<register xmlns='http://jabber.org/features/iq-register'/>
+</stream:features>
+
+<!-- Out -->
+<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="DIGEST-MD5" />
+
+<!-- In -->
+<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>bm9uY2U9IjQyODkxNzYzNDQiLHFvcD0iYXV0aCIsY2hhcnNldD11dGYtOCxhbGdvcml0aG09bWQ1LXNlc3M=</challenge>
+
+<!-- Out -->
+<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl">Y2hhcnNldD11dGYtOCx1c2VybmFtZT0iZXBocmFpbS10ZXN0IixyZWFsbT0iamFiYmVyLmNjYy5kZSIsbm9uY2U9IjQyODkxNzYzNDQiLG5jPTAwMDAwMDAxLGNub25jZT0iNjAyNGJhOTI4N2ZiMTY5NmNkZTk2MWMxNmM1NWYxYTU5M2NkMGVlZDIyYjBmNDEiLGRpZ2VzdC11cmk9InhtcHAvamFiYmVyLmNjYy5kZSIscmVzcG9uc2U9Y2MwOGYzYzFkNWU3MTE5NjkxZWFiMWFmNGY1MThhZDQscW9wPWF1dGg=</response>
+
+<!-- In -->
+<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cnNwYXV0aD01MDMxYjNlY2NlOWQ1NDA0NTk0Zjk1M2I2MzRjMjAzNw==</challenge>
+
+<!-- Out -->
+<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />
+
+<!-- In -->
+<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>
+
+<!-- Out -->
+<?xml version='1.0'?>
+<stream:stream xmlns="jabber:client" to="jabber.ccc.de" version="1.0" xmlns:stream="http://etherx.jabber.org/streams" xml:lang="de" >
+
+<!-- In -->
+<?xml version='1.0'?>
+<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='4166003942' from='jabber.ccc.de' version='1.0' xml:lang='en'>
+
+<!-- In -->
+<stream:features>
+<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/>
+<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>
+</stream:features>
+
+<!-- Out -->
+<iq type="set" id="78">
+<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind">
+<resource>Gajim</resource>
+</bind>
+</iq>
+
+<!-- In -->
+<iq id='78' type='result'>
+<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
+<jid>ephraim-test@jabber.ccc.de/Gajim</jid>
+</bind>
+</iq>
+
+<!-- Out -->
+<iq type="set" id="79">
+<session xmlns="urn:ietf:params:xml:ns:xmpp-session" />
+</iq>
+
+<!-- In -->
+<iq type='result' id='79'>
+<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" to="jabber.ccc.de" type="get" id="Gajim_80">
+<query xmlns="http://jabber.org/protocol/disco#info" />
+</iq>
+
+<!-- In -->
+<iq from='jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='Gajim_80' type='result'>
+<query xmlns='http://jabber.org/protocol/disco#info'>
+<identity category='server' type='im' name='ejabberd'/>
+<feature var='http://jabber.org/protocol/commands'/>
+<feature var='http://jabber.org/protocol/disco#info'/>
+<feature var='http://jabber.org/protocol/disco#items'/>
+<feature var='http://jabber.org/protocol/disco#publish'/>
+<feature var='iq'/>
+<feature var='jabber:iq:last'/>
+<feature var='jabber:iq:register'/>
+<feature var='jabber:iq:time'/>
+<feature var='jabber:iq:version'/>
+<feature var='presence'/>
+<feature var='presence-invisible'/>
+<feature var='vcard-temp'/>
+<feature var='http://jabber.org/protocol/commands'/>
+</query>
+</iq>
+
+<!-- Out -->
+<iq type="get" id="81">
+<query xmlns="jabber:iq:privacy" />
+</iq>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='81' type='result'>
+<query xmlns='jabber:iq:privacy'/>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" type="get" id="82">
+<query xmlns="jabber:iq:privacy">
+<list name="block" />
+</query>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" type="get" id="83">
+<query xmlns="jabber:iq:private">
+<storage xmlns="storage:metacontacts" />
+</query>
+</iq>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='82' type='error'>
+<query xmlns='jabber:iq:privacy'>
+<list name='block'/>
+</query>
+<error code='404' type='cancel'>
+<item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+</error>
+</iq>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='83' type='result'>
+<query xmlns='jabber:iq:private'>
+<storage xmlns='storage:metacontacts'/>
+</query>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" type="get" id="84">
+<query xmlns="jabber:iq:roster" />
+</iq>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de/Gajim' to='ephraim-test@jabber.ccc.de/Gajim' id='84' type='result'>
+<query xmlns='jabber:iq:roster'>
+<item subscription='both' jid='clusidc@jabber.ccc.de'>
+<group>Foobar</group>
+</item>
+<item subscription='both' jid='jix@method-missing.org'/>
+<item subscription='both' name='matze' jid='neoraider@cyb0rg.org'>
+<group>Foobar</group>
+<group>Allgemein</group>
+</item>
+</query>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" to="jabber.ccc.de" type="get" id="Gajim_85">
+<query xmlns="http://jabber.org/protocol/disco#items" />
+</iq>
+
+<!-- In -->
+<iq from='jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='Gajim_85' type='result'>
+<query xmlns='http://jabber.org/protocol/disco#items'>
+<item jid='aspsms.swissjabber.ch'/>
+<item jid='conference.jabber.ccc.de'/>
+<item jid='vjud.jabber.ccc.de'/>
+</query>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" to="aspsms.swissjabber.ch" type="get" id="Gajim_86">
+<query xmlns="http://jabber.org/protocol/disco#info" />
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" to="conference.jabber.ccc.de" type="get" id="Gajim_87">
+<query xmlns="http://jabber.org/protocol/disco#info" />
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" to="vjud.jabber.ccc.de" type="get" id="Gajim_88">
+<query xmlns="http://jabber.org/protocol/disco#info" />
+</iq>
+
+<!-- Out -->
+<presence xmlns="jabber:client" id="89">
+<priority>50</priority>
+<x xmlns="vcard-temp:x:update">
+<photo />
+</x>
+<c xmlns="http://jabber.org/protocol/caps" node="http://gajim.org" ver="" hash="sha-1" />
+<status>http://blog.universe-factory.net/ ‒ Lübeck kämpft für seine Uni! ‒ @home</status>
+</presence>
+
+<!-- Out -->
+<iq xmlns="jabber:client" type="get" id="90">
+<vCard xmlns="vcard-temp" />
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" type="get" id="91">
+<query xmlns="jabber:iq:private">
+<storage xmlns="storage:bookmarks" />
+</query>
+</iq>
+
+<!-- Out -->
+<iq xmlns="jabber:client" type="get" id="92">
+<query xmlns="jabber:iq:private">
+<storage xmlns="storage:rosternotes" />
+</query>
+</iq>
+
+<!-- In -->
+<iq from='aspsms.swissjabber.ch' to='ephraim-test@jabber.ccc.de/Gajim' id='Gajim_86' type='result' xml:lang='de'>
+<query xmlns='http://jabber.org/protocol/disco#info'>
+<identity category='gateway' name='SMS - Transport' type='sms'/>
+<feature var='http://jabber.org/protocol/disco'/>
+<feature var='http://www.aspsms.com/xml/doc/xmlsvr18.pdf'/>
+<feature var='jabber:iq:register'/>
+<feature var='jabber:iq:gateway'/>
+<feature var='jabber:iq:version'/>
+</query>
+</iq>
+
+<!-- In -->
+<iq from='conference.jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='Gajim_87' type='result'>
+<query xmlns='http://jabber.org/protocol/disco#info'>
+<identity category='conference' type='text' name='Chaträume'/>
+<feature var='http://jabber.org/protocol/disco#info'/>
+<feature var='http://jabber.org/protocol/disco#items'/>
+<feature var='http://jabber.org/protocol/muc'/>
+<feature var='jabber:iq:register'/>
+<feature var='vcard-temp'/>
+</query>
+</iq>
+
+<!-- In -->
+<iq from='vjud.jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='Gajim_88' type='result'>
+<query xmlns='http://jabber.org/protocol/disco#info'>
+<identity category='directory' type='user' name='vCard Benutzer Suche'/>
+<feature var='jabber:iq:search'/>
+<feature var='vcard-temp'/>
+</query>
+</iq>
+
+<!-- In -->
+<presence from='ephraim-test@jabber.ccc.de/Gajim' to='ephraim-test@jabber.ccc.de/Gajim' xml:lang='de' id='89'>
+<priority>50</priority>
+<x xmlns='vcard-temp:x:update'>
+<photo/>
+</x>
+<c xmlns='http://jabber.org/protocol/caps' node='http://gajim.org' ver='' hash='sha-1'/>
+<status>http://blog.universe-factory.net/ ‒ Lübeck kämpft für seine Uni! ‒ @home</status>
+</presence>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='91' type='result'>
+<query xmlns='jabber:iq:private'>
+<storage xmlns='storage:bookmarks'/>
+</query>
+</iq>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='92' type='result'>
+<query xmlns='jabber:iq:private'>
+<storage xmlns='storage:rosternotes'/>
+</query>
+</iq>
+
+<!-- In -->
+<iq from='ephraim-test@jabber.ccc.de' to='ephraim-test@jabber.ccc.de/Gajim' id='90' type='result'>
+<vCard xmlns='vcard-temp'>
+<NICKNAME>test</NICKNAME>
+</vCard>
+</iq>
+