Merge new-ui-branch into the trunk.

svn path=/trunk/; revision=22966

1 files changed, 30 insertions, 17 deletions

diff --git a/calendar/pcs/query.h b/calendar/pcs/query.h
index 752c29eb40..9c03aa2661 100644
--- a/calendar/pcs/query.h
+++ b/calendar/pcs/query.h
@@ -24,6 +24,7 @@
 #include <bonobo/bonobo-object.h>
 #include "pcs/cal-common.h"
 #include "pcs/evolution-calendar.h"
+#include "cal-backend-object-sexp.h"
 
 G_BEGIN_DECLS
 
@@ -37,31 +38,43 @@ G_BEGIN_DECLS
 
 typedef struct _QueryPrivate QueryPrivate;
 
-typedef struct {
+struct _Query {
 	BonoboObject xobject;
 
 	/* Private data */
 	QueryPrivate *priv;
-} Query;
+};
 
-typedef struct {
+struct _QueryClass {
 	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_Calendar_Query__epv epv;
-} QueryClass;
-
-GType query_get_type (void);
-
-Query *query_construct (Query *query,
-			CalBackend *backend,
-			GNOME_Evolution_Calendar_QueryListener ql,
-			const char *sexp);
-
-Query *query_new (CalBackend *backend,
-		  GNOME_Evolution_Calendar_QueryListener ql,
-		  const char *sexp);
-
-
+};
+
+GType                 query_get_type (void);
+Query                *query_new (CalBackend                             *backend,
+				 GNOME_Evolution_Calendar_QueryListener  ql,
+				 CalBackendObjectSExp                   *sexp);
+const char           *query_get_text (Query *query);
+CalBackendObjectSExp *query_get_object_sexp (Query *query);
+gboolean query_object_matches (Query *query, const char *object);
+void                  query_notify_objects_added (Query       *query,
+						  const GList *objects);
+void                  query_notify_objects_added_1 (Query       *query,
+						    const char *object);
+void                  query_notify_objects_modified (Query       *query,
+						     const GList *objects);
+void                  query_notify_objects_modified_1 (Query       *query,
+						     const char *object);
+void                  query_notify_objects_removed (Query       *query,
+						    const GList *uids);
+void                  query_notify_objects_removed_1 (Query       *query,
+						    const char *uid);
+void                  query_notify_query_progress (Query      *query,
+						   const char *message,
+						   int         percent);
+void                  query_notify_query_done (Query                               *query,
+					       GNOME_Evolution_Calendar_CallStatus status);
 
 G_END_DECLS