[Libreoffice-commits] .: Branch 'feature/tubes2' - tubes/qa tubes/source

Will Thompson wjt at kemper.freedesktop.org
Fri Mar 23 04:31:34 PDT 2012


 tubes/qa/test_manager.cxx |    2 +-
 tubes/source/manager.cxx  |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a0b9d1595f9cbabe29d63b85590cc66313eba203
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Fri Mar 23 11:31:26 2012 +0000

    Use a slightly nicer filename

diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 8ca3b9f..a7e690f 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -331,7 +331,7 @@ void TestTeleTubes::testSendFile()
     CPPUNIT_ASSERT( maFileSentSuccess);
     CPPUNIT_ASSERT_MESSAGE(
         OUStringToOString( maFileReceivedUri, RTL_TEXTENCODING_UTF8).getStr(),
-        maFileReceivedUri == "file:///tmp/fixme.ods");
+        maFileReceivedUri == "file:///tmp/LibreOffice-collab-test-config.ini");
 }
 
 void TestTeleTubes::testFlushLoops()
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index cccd62c..25f879d 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -212,7 +212,13 @@ TeleManager_IncomingHandlerReady (
         return;
     }
 
-    GFile *pDestination = g_file_new_for_uri( "file:///tmp/fixme.ods");
+    /* The filename suggested by the sender, which in our case is the last bit
+     * of whatever URI got passed to ::sendFile()
+     */
+    const char* pFileName = empathy_ft_handler_get_filename( pHandler);
+    char* pLocalUri = g_strdup_printf( "file:///tmp/LibreOffice-collab-%s", pFileName);
+    GFile *pDestination = g_file_new_for_uri( pLocalUri);
+    g_free( pLocalUri);
 
     empathy_ft_handler_incoming_set_destination( pHandler, pDestination);
     g_object_unref( pDestination);


More information about the Libreoffice-commits mailing list