Diff between 84c4c3bedcfb65c27f54ffac452b66608498ba36 and 2d07cea3b3f3d3d902a72b8ecc08b29721f30a08

Changed Files

File Additions Deletions Status
obexd/plugins/irmc.c +1 -1 modified
obexd/plugins/messages.h +1 -1 modified
obexd/src/manager.c +2 -2 modified
obexd/src/obex.c +1 -1 modified

Full Patch

diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c
index 8344a47..87f3b6c 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -172,7 +172,7 @@ static void query_result(const char *buffer, size_t bufsize, int vcards,
 	/* loop around buffer and add X-IRMC-LUID attribs */
 	s = buffer;
 	while ((t = strstr(s, "UID:")) != NULL) {
-		/* add upto UID: into buffer */
+		/* add up to UID: into buffer */
 		irmc->buffer = g_string_append_len(irmc->buffer, s, t-s);
 		/*
 		 * add UID: line into buffer
diff --git a/obexd/plugins/messages.h b/obexd/plugins/messages.h
index 2cdd92f..83e087a 100644
--- a/obexd/plugins/messages.h
+++ b/obexd/plugins/messages.h
@@ -269,7 +269,7 @@ int messages_get_message(void *session, const char *handle,
  *
  * session: Backend session.
  * user_data: User data if any to be sent.
- * Callback shall be called for every update inbox request recieved from MCE.
+ * Callback shall be called for every update inbox request received from MCE.
  */
 typedef void (*messages_update_inbox_cb)(void *session, int err,
 							void *user_data);
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index bd19288..1d48224 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -411,14 +411,14 @@ static void emit_transfer_completed(struct obex_session *os, gboolean success)
 }
 
 static void emit_transfer_progress(struct obex_session *os, uint32_t total,
-							uint32_t transfered)
+							uint32_t transferred)
 {
 	char *path = g_strdup_printf("/transfer%u", os->id);
 
 	g_dbus_emit_signal(connection, path,
 			TRANSFER_INTERFACE, "Progress",
 			DBUS_TYPE_INT32, &total,
-			DBUS_TYPE_INT32, &transfered,
+			DBUS_TYPE_INT32, &transferred,
 			DBUS_TYPE_INVALID);
 
 	g_free(path);
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index dfcbab0..9044961 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -656,7 +656,7 @@ static gboolean recv_data(const void *buf, gsize size, gpointer user_data)
 	if (os->aborted)
 		return FALSE;
 
-	/* workaround: client didn't send the object lenght */
+	/* workaround: client didn't send the object length */
 	if (os->size == OBJECT_SIZE_DELETE)
 		os->size = OBJECT_SIZE_UNKNOWN;