* [PATCH 0/3] mmsd: bug fix
@ 2012-04-20 16:39 =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 1/3] mmsutil: add mms_message_status_get_string API =?unknown-8bit?q?S=C3=A9bastien?= Bianti
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: =?unknown-8bit?q?S=C3=A9bastien?= Bianti @ 2012-04-20 16:39 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
This set concerns mmsd for ofono mailing list.
Sébastien Bianti (3):
mmsutil: add mms_message_status_get_string API
service: use proper status value string
service: fix for message_delete bug
src/mmsutil.c | 25 +++++++++++++++++++++++++
src/mmsutil.h | 1 +
src/service.c | 9 +++++++--
3 files changed, 33 insertions(+), 2 deletions(-)
--
1.7.4.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] mmsutil: add mms_message_status_get_string API
2012-04-20 16:39 [PATCH 0/3] mmsd: bug fix =?unknown-8bit?q?S=C3=A9bastien?= Bianti
@ 2012-04-20 16:39 ` =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:44 ` Marcel Holtmann
2012-04-20 16:39 ` [PATCH 2/3] service: use proper status value string =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 3/3] service: fix for message_delete bug =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2 siblings, 1 reply; 6+ messages in thread
From: =?unknown-8bit?q?S=C3=A9bastien?= Bianti @ 2012-04-20 16:39 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
---
src/mmsutil.c | 25 +++++++++++++++++++++++++
src/mmsutil.h | 1 +
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/mmsutil.c b/src/mmsutil.c
index c507d6f..725849b 100644
--- a/src/mmsutil.c
+++ b/src/mmsutil.c
@@ -1661,3 +1661,28 @@ gboolean mms_message_encode(struct mms_message *msg, int fd)
return FALSE;
}
+
+char *mms_message_status_get_string(enum mms_message_status status)
+{
+ char *status_str;
+
+ switch (status) {
+ case MMS_MESSAGE_STATUS_DOWNLOADED:
+ status_str = "downloaded";
+ break;
+ case MMS_MESSAGE_STATUS_RECEIVED:
+ status_str = "received";
+ break;
+ case MMS_MESSAGE_STATUS_READ:
+ status_str = "read";
+ break;
+ case MMS_MESSAGE_STATUS_SENT:
+ status_str = "sent";
+ break;
+ case MMS_MESSAGE_STATUS_DRAFT:
+ status_str = "draft";
+ break;
+ }
+
+ return status_str;
+}
diff --git a/src/mmsutil.h b/src/mmsutil.h
index b2a0418..d3b507f 100644
--- a/src/mmsutil.h
+++ b/src/mmsutil.h
@@ -146,3 +146,4 @@ gboolean mms_message_decode(const unsigned char *pdu,
unsigned int len, struct mms_message *out);
gboolean mms_message_encode(struct mms_message *msg, int fd);
void mms_message_free(struct mms_message *msg);
+char *mms_message_status_get_string(enum mms_message_status status);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] service: use proper status value string
2012-04-20 16:39 [PATCH 0/3] mmsd: bug fix =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 1/3] mmsutil: add mms_message_status_get_string API =?unknown-8bit?q?S=C3=A9bastien?= Bianti
@ 2012-04-20 16:39 ` =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 3/3] service: fix for message_delete bug =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2 siblings, 0 replies; 6+ messages in thread
From: =?unknown-8bit?q?S=C3=A9bastien?= Bianti @ 2012-04-20 16:39 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
---
src/service.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/service.c b/src/service.c
index 907b581..5520012 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1497,7 +1497,7 @@ static void append_sr_msg_properties(DBusMessageIter *dict,
struct mms_message *msg)
{
const char *date = time_to_str(&msg->rc.date);
- const char *status = "draft";
+ const char *status = mms_message_status_get_string(msg->sr.status);
mms_dbus_dict_append_basic(dict, "Status",
DBUS_TYPE_STRING, &status);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] service: fix for message_delete bug
2012-04-20 16:39 [PATCH 0/3] mmsd: bug fix =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 1/3] mmsutil: add mms_message_status_get_string API =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 2/3] service: use proper status value string =?unknown-8bit?q?S=C3=A9bastien?= Bianti
@ 2012-04-20 16:39 ` =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:45 ` Marcel Holtmann
2 siblings, 1 reply; 6+ messages in thread
From: =?unknown-8bit?q?S=C3=A9bastien?= Bianti @ 2012-04-20 16:39 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
mms_message_unregister destroyes the message
---
src/service.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/service.c b/src/service.c
index 5520012..f89fd3f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -134,6 +134,7 @@ static DBusMessage *msg_delete(DBusConnection *conn,
struct mms_service *service = user_data;
struct mms_message *mms;
const char *path;
+ char *uuid;
path = dbus_message_get_path(msg);
@@ -143,10 +144,14 @@ static DBusMessage *msg_delete(DBusConnection *conn,
if (mms == NULL)
return __mms_error_invalid_args(msg);
+ uuid = g_strdup(mms->uuid);
+
if (mms_message_unregister(service, path) < 0)
return __mms_error_invalid_args(msg);
- mms_store_remove(service->identity, mms->uuid);
+ mms_store_remove(service->identity, uuid);
+
+ g_free(uuid);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] mmsutil: add mms_message_status_get_string API
2012-04-20 16:39 ` [PATCH 1/3] mmsutil: add mms_message_status_get_string API =?unknown-8bit?q?S=C3=A9bastien?= Bianti
@ 2012-04-20 16:44 ` Marcel Holtmann
0 siblings, 0 replies; 6+ messages in thread
From: Marcel Holtmann @ 2012-04-20 16:44 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1545 bytes --]
Hi Sebastien,
> src/mmsutil.c | 25 +++++++++++++++++++++++++
> src/mmsutil.h | 1 +
> 2 files changed, 26 insertions(+), 0 deletions(-)
>
> diff --git a/src/mmsutil.c b/src/mmsutil.c
> index c507d6f..725849b 100644
> --- a/src/mmsutil.c
> +++ b/src/mmsutil.c
> @@ -1661,3 +1661,28 @@ gboolean mms_message_encode(struct mms_message *msg, int fd)
>
> return FALSE;
> }
> +
> +char *mms_message_status_get_string(enum mms_message_status status)
> +{
> + char *status_str;
> +
> + switch (status) {
> + case MMS_MESSAGE_STATUS_DOWNLOADED:
> + status_str = "downloaded";
> + break;
> + case MMS_MESSAGE_STATUS_RECEIVED:
> + status_str = "received";
> + break;
> + case MMS_MESSAGE_STATUS_READ:
> + status_str = "read";
> + break;
> + case MMS_MESSAGE_STATUS_SENT:
> + status_str = "sent";
> + break;
> + case MMS_MESSAGE_STATUS_DRAFT:
> + status_str = "draft";
> + break;
> + }
> +
> + return status_str;
> +}
why bother with status_str here. Just call return right away. Also the
return value is const char *.
> diff --git a/src/mmsutil.h b/src/mmsutil.h
> index b2a0418..d3b507f 100644
> --- a/src/mmsutil.h
> +++ b/src/mmsutil.h
> @@ -146,3 +146,4 @@ gboolean mms_message_decode(const unsigned char *pdu,
> unsigned int len, struct mms_message *out);
> gboolean mms_message_encode(struct mms_message *msg, int fd);
> void mms_message_free(struct mms_message *msg);
> +char *mms_message_status_get_string(enum mms_message_status status);
Regards
Marcel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] service: fix for message_delete bug
2012-04-20 16:39 ` [PATCH 3/3] service: fix for message_delete bug =?unknown-8bit?q?S=C3=A9bastien?= Bianti
@ 2012-04-20 16:45 ` Marcel Holtmann
0 siblings, 0 replies; 6+ messages in thread
From: Marcel Holtmann @ 2012-04-20 16:45 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
Hi Sebastien,
> mms_message_unregister destroyes the message
> ---
> src/service.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
patch has been applied.
Regards
Marcel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-20 16:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-20 16:39 [PATCH 0/3] mmsd: bug fix =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 1/3] mmsutil: add mms_message_status_get_string API =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:44 ` Marcel Holtmann
2012-04-20 16:39 ` [PATCH 2/3] service: use proper status value string =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:39 ` [PATCH 3/3] service: fix for message_delete bug =?unknown-8bit?q?S=C3=A9bastien?= Bianti
2012-04-20 16:45 ` Marcel Holtmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.