Merge "tizen: Add additional unit for "unified" user session" into tizen

[platform/upstream/at-spi2-core.git] / atspi / atspi-matchrule.h

diff --git a/atspi/atspi-matchrule.h b/atspi/atspi-matchrule.h
index ff3a685..0a006d0 100644 (file)
--- a/atspi/atspi-matchrule.h
+++ b/atspi/atspi-matchrule.h
@@ -4,6 +4,7 @@
  *
  * Copyright 2002 Ximian, Inc.
  *           2002 Sun Microsystems Inc.
+ * Copyright 2010, 2011 Novell, Inc.
  *           
  *
  * This library is free software; you can redistribute it and/or
@@ -31,6 +32,8 @@
 #include "atspi-constants.h"
 #include "atspi-types.h"
 
+G_BEGIN_DECLS
+
 #define ATSPI_TYPE_MATCH_RULE                        (atspi_match_rule_get_type ())
 #define ATSPI_MATCH_RULE(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_MATCH_RULE, AtspiMatchRule))
 #define ATSPI_MATCH_RULE_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_MATCH_RULE, AtspiMatchRuleClass))
@@ -41,14 +44,15 @@
 typedef struct _AtspiMatchRule AtspiMatchRule;
 struct _AtspiMatchRule
 {
+  GObject parent;
   AtspiStateSet *states;
   AtspiCollectionMatchType statematchtype;
   GHashTable *attributes;
   AtspiCollectionMatchType attributematchtype;
-  GArray *roles;
-  AtspiCollectionMatchType rolematchtype;
   GArray *interfaces;
   AtspiCollectionMatchType interfacematchtype;
+  gint roles [4];
+  AtspiCollectionMatchType rolematchtype;
   gboolean invert;
 };
 
@@ -58,6 +62,8 @@ struct _AtspiMatchRuleClass
   GObjectClass parent_class;
 };
 
+GType atspi_match_rule_get_type ();
+
 AtspiMatchRule *
 atspi_match_rule_new (AtspiStateSet *states,
                       AtspiCollectionMatchType statematchtype,
@@ -65,9 +71,10 @@ atspi_match_rule_new (AtspiStateSet *states,
                       AtspiCollectionMatchType attributematchtype,
                       GArray *roles,
                       AtspiCollectionMatchType rolematchtype,
+                      GArray *interfaces,
+                      AtspiCollectionMatchType interfacematchtype,
                       gboolean invert);
 
-gboolean
-_atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter);
+G_END_DECLS
 
 #endif /* _ATSPI_MATCH_RULE_H_ */