libtransport.git Changeset - 5973ee71a50e

Changeset - 5973ee71a50e

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-10-05 21:33:50
hanzz.k@gmail.com

Remove filetransfer from waitingXfer when it's completed

1 file changed with 12 insertions and 1 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -28,48 +28,49 @@ @@
 using namespace log4cxx;
 static LoggerPtr logger_libpurple = Logger::getLogger("backend.libpurple");
 static LoggerPtr logger = Logger::getLogger("backend");
 using namespace Transport;
 class SpectrumNetworkPlugin;
 SpectrumNetworkPlugin *np;
 static gboolean nodaemon = FALSE;
 static gchar *logfile = NULL;
 static gchar *lock_file = NULL;
 static gchar *host = NULL;
 static int port = 10000;
 static gboolean ver = FALSE;
 static gboolean list_purple_settings = FALSE;
 struct FTData {
 	unsigned long id;
 	unsigned long timer;
 	bool paused;
 };
 static GOptionEntry options_entries[] = {
 	{ "nodaemon", 'n', 0, G_OPTION_ARG_NONE, &nodaemon, "Disable background daemon mode", NULL },
 	{ "logfile", 'l', 0, G_OPTION_ARG_STRING, &logfile, "Set file to log", NULL },
 	{ "pidfile", 'p', 0, G_OPTION_ARG_STRING, &lock_file, "File where to write transport PID", NULL },
 	{ "version", 'v', 0, G_OPTION_ARG_NONE, &ver, "Shows Spectrum version", NULL },
 	{ "list-purple-settings", 's', 0, G_OPTION_ARG_NONE, &list_purple_settings, "Lists purple settings which can be used in config file", NULL },
 	{ "host", 'h', 0, G_OPTION_ARG_STRING, &host, "Host to connect to", NULL },
 	{ "port", 'p', 0, G_OPTION_ARG_INT, &port, "Port to connect to", NULL },
 	{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, "", NULL }
 };
 static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotifyUserInfo *user_info);
 static GHashTable *ui_info = NULL;
 static GHashTable *spectrum_ui_get_info(void)
+{
 	if(NULL == ui_info) {
 		ui_info = g_hash_table_new(g_str_hash, g_str_equal);
 		g_hash_table_insert(ui_info, g_strdup("name"), g_strdup("Spectrum"));
 		g_hash_table_insert(ui_info, g_strdup("version"), g_strdup("0.5"));
@@ @@ -149,48 +150,51 @@ 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) {
 	PurpleXfer *xfer = (PurpleXfer *) data;
 	FTData *ftdata = (FTData *) xfer->ui_data;
 	ftdata->timer = 0;
 	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++;
@@ @@ -847,49 +851,52 @@ 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_timeout_add(1, ft_ui_ready, xfer);
 				FTData *ftData = (FTData *) xfer->ui_data;
 				if (ftData->timer == 0) {
 					ftData->timer = 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) {
@@ @@ -1342,91 +1349,95 @@ static PurpleAccountUiOps accountUiOps = @@
 static void XferCreated(PurpleXfer *xfer) {
 	if (!xfer) {
 		return;
+	}
 // 	PurpleAccount *account = purple_xfer_get_account(xfer);
 // 	np->handleFTStart(np->m_accounts[account], xfer->who, xfer, "", xhtml_);
+}
 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);
 	std::remove(np->m_waitingXfers.begin(), np->m_waitingXfers.end(), xfer);
 	purple_xfer_unref(xfer);
+}
 static void fileSendStart(PurpleXfer *xfer) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	repeater->fileSendStart();
+}
 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);
 	FTData *ftdata = new FTData;
 	ftdata->paused = false;
 	ftdata->id = 0;
 	ftdata->timer = 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);
 	std::remove(np->m_waitingXfers.begin(), np->m_waitingXfers.end(), xfer);
 	purple_xfer_unref(xfer);
+}
 static void XferSendComplete(PurpleXfer *xfer) {
 // 	FiletransferRepeater *repeater = (FiletransferRepeater *) xfer->ui_data;
 // 	repeater->_tryToDeleteMe();
 	std::remove(np->m_waitingXfers.begin(), np->m_waitingXfers.end(), xfer);
 	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);
 // 	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)

0 comments (0 inline, 0 general)