[daemon-fix] Fixed sending daemon match rules for kdbus broadcasts

[platform/upstream/dbus.git] / dbus / dbus-message-factory.h

diff --git a/dbus/dbus-message-factory.h b/dbus/dbus-message-factory.h
index 28a169b..fd7a476 100644 (file)
--- a/dbus/dbus-message-factory.h
+++ b/dbus/dbus-message-factory.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-message-factory.h Generator of valid and invalid message data for test suite
  *
  * Copyright (C) 2005 Red Hat Inc.
@@ -17,14 +17,14 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #ifndef DBUS_MESSAGE_FACTORY_H
 #define DBUS_MESSAGE_FACTORY_H
 
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
 
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-marshal-basic.h>
@@ -34,17 +34,18 @@ DBUS_BEGIN_DECLS
 
 typedef struct
 {
-  dbus_bool_t  validity_known;
   DBusValidity expected_validity;
   
   DBusString data;
 
 } DBusMessageData;
 
+#define _DBUS_MESSAGE_DATA_MAX_NESTING 10
 typedef struct
 {
-  int generator;
-  int sequence;
+  int sequence_nos[_DBUS_MESSAGE_DATA_MAX_NESTING];
+  int depth;
+  int count;
 } DBusMessageDataIter;
 
 void        _dbus_message_data_free              (DBusMessageData     *data);
@@ -55,6 +56,6 @@ dbus_bool_t _dbus_message_data_iter_get_and_next (DBusMessageDataIter *iter,
 
 DBUS_END_DECLS
 
-#endif /* DBUS_BUILD_TESTS */
+#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
 
 #endif /* DBUS_MESSAGE_FACTORY_H */