- GList *item;
- item = modest_tny_send_queue_lookup_info (self, msg_id);
- if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNOWN;
- return ((SendInfo*)item->data)->status;
+ GList *item;
+
+ g_return_val_if_fail (MODEST_IS_TNY_SEND_QUEUE(self), MODEST_TNY_SEND_QUEUE_UNKNOWN);
+ g_return_val_if_fail (msg_id, MODEST_TNY_SEND_QUEUE_UNKNOWN);
+
+ item = modest_tny_send_queue_lookup_info (self, msg_id);
+ if (!item)
+ return MODEST_TNY_SEND_QUEUE_UNKNOWN;
+ else
+ return ((SendInfo*)item->data)->status;