← Back to branch summary

~phablet-team/ofono/midori-support

« back to all changes in this revision

Viewing changes to gdbus/object.c

  • Committer: Alfonso Sanchez-Beato
  • Date: 2015-09-28 08:10:59 UTC
  • mfrom: (6830.1.168)
  • mto: This revision was merged to the branch mainline in revision 6904.
  • Revision ID: alfonso.sanchez-beato@canonical.com-20150928081059-1o08e2a9pkit6ar6
* Update to upstream release 1.17
* Do not assert when the radio is unavailable (LP: #1490991)
* Fix crash when importing phonebook (LP: #1486004)
* Check only destination port when receiving push (LP: #1490673)
* Fix crash when retrying to close context (LP: #1492483)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdbus/object.c
1412
1412
{
1413
1413
        char str[1024];
1414
1414
 
1415
 
        vsnprintf(str, sizeof(str), format, args);
 
1415
        if (format)
 
1416
                vsnprintf(str, sizeof(str), format, args);
 
1417
        else
 
1418
                str[0] = '\0';
1416
1419
 
1417
1420
        return dbus_message_new_error(message, name, str);
1418
1421
}
1530
1533
                                        const char *format, va_list args)
1531
1534
{
1532
1535
        DBusMessage *error;
1533
 
        char str[1024];
1534
 
 
1535
 
        vsnprintf(str, sizeof(str), format, args);
1536
 
 
1537
 
        error = dbus_message_new_error(message, name, str);
 
1536
 
 
1537
        error = g_dbus_create_error_valist(message, name, format, args);
1538
1538
        if (error == NULL)
1539
1539
                return FALSE;
1540
1540
 
1816
1816
{
1817
1817
        global_flags = flags;
1818
1818
}
 
1819
 
 
1820
int g_dbus_get_flags(void)
 
1821
{
 
1822
        return global_flags;
 
1823
}