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

@@ @@ -87,49 +87,49 @@ if (PROTOBUF_FOUND) @@
 		message("IRC plugin        : yes")
 		include_directories(${IRC_INCLUDE_DIR})
 		include(${QT_USE_FILE})
 	else()
 		message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")
 	endif()
 	message("Frotz plugin      : yes")
 else()
 	message("Network plugins   : no (install libprotobuf-dev)")
 	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")
 	message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")
 	message("Frotz plugin      : no (install libprotobuf-dev)")
 endif()
 if (LOG4CXX_FOUND)
 	message("Logging           : yes")
 	include_directories(${LOG4CXX_INCLUDE_DIR})
 else()
 	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-	ADD_DEFINITIONS(-O0)
+	ADD_DEFINITIONS(-O3)
 	ADD_DEFINITIONS(-ggdb)
 	ADD_DEFINITIONS(-DDEBUG)
 	ADD_DEFINITIONS(-Wall)
 	ADD_DEFINITIONS(-W)
 	ADD_DEFINITIONS(-Wcast-align)
 	ADD_DEFINITIONS(-Wextra -Wno-sign-compare -Wno-unused-parameter)
 	ADD_DEFINITIONS(-Winit-self)
 	ADD_DEFINITIONS(-Wmissing-declarations)
 	ADD_DEFINITIONS(-Wpointer-arith)
 	ADD_DEFINITIONS(-Wreorder)
 	ADD_DEFINITIONS(-Woverloaded-virtual)
 	ADD_DEFINITIONS(-Wsign-promo)
 	ADD_DEFINITIONS(-Wundef -Wunused)
 	message("Debug             : yes")
 else(CMAKE_BUILD_TYPE MATCHES Debug)
 	message("Debug             : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")
 endif(CMAKE_BUILD_TYPE MATCHES Debug)
 SET(TRANSPORT_VERSION 2.0)
 SET(PROJECT_VERSION 2.0)
 include_directories(include)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -148,48 +148,53 @@ process_link(GString *ret, @@
 		if (*t == ',' && *(t + 1) != ' ') {
 			continue;
+		}
 		if (t > start && *(t - 1) == '.')
 			t--;
 		if (t > start && *(t - 1) == ')' && inside_paren > 0)
 			t--;
 		url_buf = g_strndup(c, t - c);
 // 		tmpurlbuf = purple_unescape_html(url_buf);
 // 		std::cout << url_buf << "\n";
 		g_string_append_printf(ret, "<A HREF=\"%s%s\">%s</A>",
 				urlprefix,
 				url_buf, url_buf);
 // 		g_free(tmpurlbuf);
 		g_free(url_buf);
 		return t;
+	}
 	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)
+{
 	const char *c, *t, *q = NULL;
 	char *tmpurlbuf, *url_buf;
 	gunichar g;
 	gboolean inside_html = FALSE;
 	int inside_paren = 0;
 	GString *ret;
 	if (text == NULL)
 		return NULL;
 	ret = g_string_new("");
 	c = text;
 	while (*c) {
 		if(*c == '(' && !inside_html) {
 			inside_paren++;
 			ret = g_string_append_c(ret, *c);
 			c++;
+		}
@@ @@ -842,49 +847,50 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 		void handleFTPauseRequest(unsigned long ftID) {
 			PurpleXfer *xfer = m_xfers[ftID];
 			if (!xfer)
 				return;
 			FTData *ftData = (FTData *) xfer->ui_data;
 			ftData->paused = true;
+		}
 		void handleFTContinueRequest(unsigned long ftID) {
 			PurpleXfer *xfer = m_xfers[ftID];
 			if (!xfer)
 				return;
 			FTData *ftData = (FTData *) xfer->ui_data;
 			ftData->paused = false;
 			purple_xfer_ui_ready(xfer);
+		}
 		void readyForData() {
 			if (m_waitingXfers.empty())
 				return;
 			std::vector<PurpleXfer *> tmp;
 			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);
+			}
+		}
 		std::map<std::string, PurpleAccount *> m_sessions;
 		std::map<PurpleAccount *, std::string> m_accounts;
 		std::map<std::string, unsigned int> m_vcards;
 		std::map<std::string, authRequest *> m_authRequests;
 		std::map<unsigned long, PurpleXfer *> m_xfers;
 		std::map<std::string, PurpleXfer *> m_unhandledXfers;
 		std::vector<PurpleXfer *> m_waitingXfers;
 		Config *config;
 };
 static bool getStatus(PurpleBuddy *m_buddy, Swift::StatusShow &status, std::string &statusMessage) {
 	PurplePresence *pres = purple_buddy_get_presence(m_buddy);
 	if (pres == NULL)
 		return false;
 	PurpleStatus *stat = purple_presence_get_active_status(pres);
 	if (stat == NULL)
 		return false;
 	int st = purple_status_type_get_primitive(purple_status_get_type(stat));
 	switch(st) {
 		case PURPLE_STATUS_AVAILABLE: {
@@ @@ -1344,92 +1350,92 @@ static void XferCreated(PurpleXfer *xfer) { @@
 static void XferDestroyed(PurpleXfer *xfer) {
+}
 static void xferCanceled(PurpleXfer *xfer) {
 	PurpleAccount *account = purple_xfer_get_account(xfer);
 	std::string filename(xfer ? purple_xfer_get_filename(xfer) : "");
 	purple_xfer_ref(xfer);
 	std::string w = xfer->who;
 	size_t pos = w.find("/");
 	if (pos != std::string::npos)
 		w.erase((int) pos, w.length() - (int) pos);
 	FTData *ftdata = (FTData *) xfer->ui_data;
 	np->handleFTFinish(np->m_accounts[account], w, filename, purple_xfer_get_size(xfer), ftdata ? ftdata->id : 0);
 	purple_xfer_unref(xfer);
+}
 static void fileSendStart(PurpleXfer *xfer) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	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();
 	purple_timeout_add(1, ft_ui_ready, xfer);
+}
 static void newXfer(PurpleXfer *xfer) {
 	PurpleAccount *account = purple_xfer_get_account(xfer);
 	std::string filename(xfer ? purple_xfer_get_filename(xfer) : "");
 	purple_xfer_ref(xfer);
 	std::string w = xfer->who;
 	size_t pos = w.find("/");
 	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;
 	np->handleFTStart(np->m_accounts[account], w, filename, purple_xfer_get_size(xfer));
+}
 static void XferReceiveComplete(PurpleXfer *xfer) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	repeater->_tryToDeleteMe();
 // 	GlooxMessageHandler::instance()->ftManager->handleXferFileReceiveComplete(xfer);
 	purple_xfer_unref(xfer);
+}
 static void XferSendComplete(PurpleXfer *xfer) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	repeater->_tryToDeleteMe();
 	purple_xfer_unref(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);
 	return size;
+}
 static void XferNotSent(PurpleXfer *xfer, const guchar *buffer, gsize size) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	repeater->handleDataNotSent(buffer, size);
+}
 static gssize XferRead(PurpleXfer *xfer, guchar **buffer, gssize size) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	int data_size = repeater->getDataToSend(buffer, size);
 // 	if (data_size == 0)
 // 		return 0;
 //
 // 	return data_size;
 	return 0;
+}
 static PurpleXferUiOps xferUiOps =
+{
 	XferCreated,

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

+	}
 	if (m_data.size() < size) {
 		boost::shared_ptr<std::vector<unsigned char> > ptr(new std::vector<unsigned char>(m_data.begin(), m_data.end()));
 		m_sent += m_data.size();
 		m_data.clear();
 		if (m_sent == m_size)
 			m_finished = true;
 		onDataNeeded();
 		return ptr;
+	}
 	boost::shared_ptr<std::vector<unsigned char> > ptr(new std::vector<unsigned char>(m_data.begin(), m_data.begin() + size));
 	m_data.erase(m_data.begin(), m_data.begin() + size);
 	m_sent += size;
 	if (m_sent == m_size)
 		m_finished = true;
 	if (m_data.size() < 500000 && !neededData) {
 		neededData = true;
 		onDataNeeded();
+	}
 	return ptr;
+}
 bool MemoryReadBytestream::isFinished() const {
 // 	std::cout << "finished? " << m_finished << "\n";
 	return m_finished;
+}
+}

0 comments (0 inline, 0 general)