libtransport.git Changeset - b8dc29b0a823

Changeset - b8dc29b0a823

Parent rev.

Child rev.

[Not reviewed]

Merge

2 9 0

HanzZ - 14 years ago 2011-10-04 20:12:17
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

5 files changed with 16 insertions and 54 deletions:

CMakeLists.txt

backends/libpurple/main.cpp

include/Swiften/Network/DummyConnectionFactory.cpp

include/Swiften/Network/DummyConnectionFactory.h

src/memoryreadbytestream.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -108,7 +108,7 @@ else() @@
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-	ADD_DEFINITIONS(-O0)
+	ADD_DEFINITIONS(-O3)
 	ADD_DEFINITIONS(-ggdb)
 	ADD_DEFINITIONS(-DDEBUG)
 	ADD_DEFINITIONS(-Wall)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -169,6 +169,11 @@ process_link(GString *ret, @@
 	return c;
+}
 static gboolean ft_ui_ready(void *data) {
 	purple_xfer_ui_ready((PurpleXfer *) data);
 	return FALSE;
+}
 static char *
 spectrum_markup_linkify(const char *text)
+{
@@ @@ -863,7 +868,8 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 			tmp.swap(m_waitingXfers);
 			BOOST_FOREACH(PurpleXfer *xfer, tmp) {
 				purple_xfer_ui_ready(xfer);
 				purple_timeout_add(1, ft_ui_ready, xfer);
 // 				purple_xfer_ui_ready(xfer);
+			}
+		}
@@ @@ -1365,11 +1371,6 @@ static void fileSendStart(PurpleXfer *xfer) { @@
 // 	repeater->fileSendStart();
+}
 static gboolean ft_ui_ready(void *data) {
 	purple_xfer_ui_ready((PurpleXfer *) data);
 	return FALSE;
+}
 static void fileRecvStart(PurpleXfer *xfer) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	repeater->fileRecvStart();
@@ @@ -1385,7 +1386,10 @@ static void newXfer(PurpleXfer *xfer) { @@
 	if (pos != std::string::npos)
 		w.erase((int) pos, w.length() - (int) pos);
 	xfer->ui_data = (void *) new FTData;
 	FTData *ftdata = new FTData;
 	ftdata->paused = false;
 	ftdata->id = 0;
 	xfer->ui_data = (void *) ftdata;
 	np->m_unhandledXfers[np->m_accounts[account] + filename + w] = xfer;
@@ @@ -1408,7 +1412,9 @@ static void XferSendComplete(PurpleXfer *xfer) { @@
 static gssize XferWrite(PurpleXfer *xfer, const guchar *buffer, gssize size) {
 	FTData *ftData = (FTData *) xfer->ui_data;
 	std::string data((const char *) buffer, (size_t) size);
 	if (ftData->paused) {
 // 	std::cout << "xferwrite\n";
 	if (!ftData->paused) {
 // 		std::cout << "adding xfer to waitingXfers queue\n";
 		np->m_waitingXfers.push_back(xfer);
+	}
 	np->handleFTData(ftData->id, data);

include/Swiften/Network/DummyConnectionFactory.cpp

➞

Show inline comments

deleted file

include/Swiften/Network/DummyConnectionFactory.h

➞

Show inline comments

deleted file

src/memoryreadbytestream.cpp

➞

Show inline comments

+}
 bool MemoryReadBytestream::isFinished() const {
 // 	std::cout << "finished? " << m_finished << "\n";
 	return m_finished;
+}

0 comments (0 inline, 0 general)