← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick-proposed

« back to all changes in this revision

Viewing changes to dbus/dbus-marshal-header.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-27 13:06:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100927130632-bqs145trvchd2lmf
Tags: 1.4.0-0ubuntu1
* New upstream release
 - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=17754 Race condition in protected_change_timeout
 - Requested by various upstream KDE developers http://lists.kde.org/?t=128514970000004&r=1&w=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
dbus/dbus-marshal-header.c
21
21
 *
22
22
 */
23
23
 
 
24
#include <config.h>
24
25
#include "dbus/dbus-shared.h"
25
26
#include "dbus-marshal-header.h"
26
27
#include "dbus-marshal-recursive.h"
81
82
  { DBUS_HEADER_FIELD_REPLY_SERIAL, DBUS_TYPE_UINT32 },
82
83
  { DBUS_HEADER_FIELD_DESTINATION, DBUS_TYPE_STRING },
83
84
  { DBUS_HEADER_FIELD_SENDER, DBUS_TYPE_STRING },
84
 
  { DBUS_HEADER_FIELD_SIGNATURE, DBUS_TYPE_SIGNATURE }
 
85
  { DBUS_HEADER_FIELD_SIGNATURE, DBUS_TYPE_SIGNATURE },
 
86
  { DBUS_HEADER_FIELD_UNIX_FDS, DBUS_TYPE_UINT32 }
85
87
};
86
88
 
87
89
/** Macro to look up the correct type for a field */
888
890
        }
889
891
      break;
890
892
 
 
893
    case DBUS_HEADER_FIELD_UNIX_FDS:
 
894
      /* Every value makes sense */
 
895
      break;
 
896
 
891
897
    case DBUS_HEADER_FIELD_SIGNATURE:
892
898
      /* SIGNATURE validated generically due to its type */
893
899
      string_validation_func = NULL;