[Galago-commits] r2817 - in branches/libgalago/push-presence: .
libgalago
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Fri May 26 00:21:38 PDT 2006
Author: chipx86
Date: 2006-05-26 00:21:33 -0700 (Fri, 26 May 2006)
New Revision: 2817
Modified:
branches/libgalago/push-presence/ChangeLog
branches/libgalago/push-presence/libgalago/Makefile.am
branches/libgalago/push-presence/libgalago/galago-dbus.c
branches/libgalago/push-presence/libgalago/galago-presence.h
branches/libgalago/push-presence/libgalago/galago-service.h
branches/libgalago/push-presence/libgalago/galago-status-type.c
branches/libgalago/push-presence/libgalago/galago-status-type.h
branches/libgalago/push-presence/libgalago/galago.h
Log:
- Rename GalagoStatusType to GalagoStatusPrimitive.
- Rename GalagoStatus to GalagoStatusType.
- Remove some galago_status_type_* functions, and add some new ones.
- Reference GalagoStatusAttr for attributes. This isn't defined yet. Yes, everything is broken. Yay branches.
Modified: branches/libgalago/push-presence/ChangeLog
===================================================================
--- branches/libgalago/push-presence/ChangeLog 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/ChangeLog 2006-05-26 07:21:33 UTC (rev 2817)
@@ -1,3 +1,18 @@
+Fri May 26 00:20:38 PDT 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * libgalago/galago-dbus.c:
+ * libgalago/galago.h:
+ * libgalago/galago-presence.h:
+ * libgalago/galago-service.h:
+ * libgalago/galago-status-type.c:
+ * libgalago/galago-status-type.h:
+ * libgalago/Makefile.am:
+ - Rename GalagoStatusType to GalagoStatusPrimitive.
+ - Rename GalagoStatus to GalagoStatusType.
+ - Remove some galago_status_type_* functions, and add some new ones.
+ - Reference GalagoStatusAttr for attributes. This isn't defined yet.
+ Yes, everything is broken. Yay branches.
+
Fri May 26 00:09:21 PDT 2006 Christian Hammond <chipx86 at chipx86.com>
A libgalago/galago-status-type.c:
Modified: branches/libgalago/push-presence/libgalago/Makefile.am
===================================================================
--- branches/libgalago/push-presence/libgalago/Makefile.am 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/Makefile.am 2006-05-26 07:21:33 UTC (rev 2817)
@@ -20,7 +20,7 @@
galago-person.h \
galago-presence.h \
galago-service.h \
- galago-status.h \
+ galago-status-type.h \
galago-value.h
galagoinc_HEADERS = \
@@ -51,7 +51,7 @@
galago-presence.c \
galago-private.h \
galago-service.c \
- galago-status.c \
+ galago-status-type.c \
galago-value.c
libgalago_la_LIBADD = \
Modified: branches/libgalago/push-presence/libgalago/galago-dbus.c
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-dbus.c 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/galago-dbus.c 2006-05-26 07:21:33 UTC (rev 2817)
@@ -21,7 +21,6 @@
#include <libgalago/galago-dbus.h>
#include <libgalago/galago-assert.h>
#include <libgalago/galago-core.h>
-#include <libgalago/galago-status.h>
#include <string.h>
#include <stdio.h>
Modified: branches/libgalago/push-presence/libgalago/galago-presence.h
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-presence.h 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/galago-presence.h 2006-05-26 07:21:33 UTC (rev 2817)
@@ -31,7 +31,6 @@
#include <libgalago/galago-account.h>
#include <libgalago/galago-object.h>
#include <libgalago/galago-person.h>
-#include <libgalago/galago-status.h>
/**
* A presence.
@@ -105,7 +104,19 @@
gboolean galago_presence_is_discarded(const GalagoPresence *presence);
gboolean galago_presence_is_available(const GalagoPresence *presence);
+void galago_presence_enable_status(GalagoPresence *presence,
+ const GalagoStatus *status, ...);
+void galago_presence_disable_status(GalagoPresence *presence);
+GList *galago_presence_get_enabled_statuses(const GalagoPresence *presence);
+gboolean galago_presence_get_status_enabled(const GalagoPresence *presence);
+void galago_presence_set_status_attrs(GalagoPresence *presence,
+ const GalagoStatus *status,
+ GValue *value, ...);
+const GValue *galago_presence_get_status_attr(GalagoPresence *presence,
+ const GalagoStatus *status,
+ const char *attr_name);
+/* XXX */
void galago_presence_set_statuses(GalagoPresence *presence, GList *statuses);
void galago_presence_add_status(GalagoPresence *presence,
GalagoStatus *status);
Modified: branches/libgalago/push-presence/libgalago/galago-service.h
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-service.h 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/galago-service.h 2006-05-26 07:21:33 UTC (rev 2817)
@@ -39,7 +39,7 @@
#include <libgalago/galago-account.h>
#include <libgalago/galago-object.h>
-#include <libgalago/galago-status.h>
+#include <libgalago/galago-status-type.h>
struct _GalagoService
{
Modified: branches/libgalago/push-presence/libgalago/galago-status-type.c
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-status-type.c 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/galago-status-type.c 2006-05-26 07:21:33 UTC (rev 2817)
@@ -22,7 +22,7 @@
#include <libgalago/galago-core.h>
#include <libgalago/galago-enum-types.h>
#include <libgalago/galago-key-value.h>
-#include <libgalago/galago-status.h>
+#include <libgalago/galago-status-type.h>
#include <stdio.h>
#include <string.h>
Modified: branches/libgalago/push-presence/libgalago/galago-status-type.h
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-status-type.h 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/galago-status-type.h 2006-05-26 07:21:33 UTC (rev 2817)
@@ -1,5 +1,5 @@
/*
- * Galago Status API
+ * Galago Status Type API
*
* Copyright (C) 2004-2006 Christian Hammond
*
@@ -18,12 +18,12 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-#ifndef _GALAGO_STATUS_H_
-#define _GALAGO_STATUS_H_
+#ifndef _GALAGO_STATUS_TYPE_H_
+#define _GALAGO_STATUS_TYPE_H_
-typedef struct _GalagoStatus GalagoStatus;
-typedef struct _GalagoStatusClass GalagoStatusClass;
-typedef struct _GalagoStatusPrivate GalagoStatusPrivate;
+typedef struct _GalagoStatusType GalagoStatusType;
+typedef struct _GalagoStatusTypeClass GalagoStatusTypeClass;
+typedef struct _GalagoStatusTypePrivate GalagoStatusTypePrivate;
typedef enum
{
@@ -34,7 +34,7 @@
GALAGO_STATUS_EXTENDED_AWAY,
GALAGO_STATUS_HIDDEN
-} GalagoStatusType;
+} GalagoStatusPrimitive;
#include <libgalago/galago-presence.h>
#include <libgalago/galago-object.h>
@@ -65,66 +65,52 @@
/** Status API */
/**************************************************************************/
-struct _GalagoStatus
+struct _GalagoStatusType
{
GalagoObject parent_object;
-
GalagoStatusPrivate *priv;
-
- void (*reserved_1)(void);
- void (*reserved_2)(void);
- void (*reserved_3)(void);
- void (*reserved_4)(void);
};
-struct _GalagoStatusClass
+struct _GalagoStatusTypeClass
{
GalagoObjectClass parent_class;
-
- void (*reserved_1)(void);
- void (*reserved_2)(void);
- void (*reserved_3)(void);
- void (*reserved_4)(void);
};
-#define GALAGO_TYPE_STATUS (galago_status_get_type())
-#define GALAGO_STATUS(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GALAGO_TYPE_STATUS, \
- GalagoStatus))
-#define GALAGO_STATUS_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GALAGO_TYPE_STATUS, \
- GalagoStatusClass))
-#define GALAGO_IS_STATUS(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GALAGO_TYPE_STATUS))
-#define GALAGO_IS_STATUS_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GALAGO_TYPE_STATUS))
-#define GALAGO_STATUS_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS((obj), GALAGO_TYPE_STATUS, \
- GalagoStatusClass))
+#define GALAGO_TYPE_STATUS_TYPE (galago_status_type_get_type())
+#define GALAGO_STATUS_TYPE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GALAGO_TYPE_STATUS_TYPE, \
+ GalagoStatusType))
+#define GALAGO_STATUS_TYPE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GALAGO_TYPE_STATUS_TYPE, \
+ GalagoStatusTypeClass))
+#define GALAGO_IS_STATUS_TYPE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GALAGO_TYPE_STATUS_TYPE))
+#define GALAGO_IS_STATUS_TYPE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GALAGO_TYPE_STATUS_TYPE))
+#define GALAGO_STATUS_TYPE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS((obj), GALAGO_TYPE_STATUS_TYPE, \
+ GalagoStatusTypeClass))
G_BEGIN_DECLS
-GType galago_status_get_type(void);
+GType galago_status_type_get_type(void);
-GalagoStatus *galago_status_new(GalagoStatusType type, const char *id,
- const char *name, gboolean exclusive);
-GalagoStatus *galago_status_new_with_attrs(GalagoStatusType type,
- const char *id,
- const char *name,
- gboolean exclusive,
- const char *attr_id,
- const char *attr_name,
- GType attr_type, ...);
-void galago_status_add_attribute(GalagoStatus *status, const char *attr_id,
- const char *attr_name, GType attr_type);
+GalagoStatusType *galago_status_type_new(GalagoStatusPrimitive primitive,
+ const char *id,
+ const char *name,
+ gboolean exclusive);
-GalagoStatusType galago_status_get_primitive(const GalagoStatus *status);
-const char *galago_status_get_id(const GalagoStatus *status);
-const char *galago_status_get_name(const GalagoStatus *status);
+void galago_status_type_add_attribute(GalagoStatusType *status_type,
+ GalagoStatusAttr *attr);
-gboolean galago_status_is_exclusive(const GalagoStatus *status);
-gboolean galago_status_is_available(const GalagoStatus *status);
+GalagoStatusPrimitive galago_status_type_get_primitive(
+ const GalagoStatusType *status_type);
+const char *galago_status_type_get_id(const GalagoStatusType *status_type);
+const char *galago_status_type_get_name(const GalagoStatusType *status_type);
+GList *galago_status_type_get_attributes(const GalagoStatusType *status_type);
+gboolean galago_status_type_is_exclusive(const GalagoStatusType *status_type);
+gboolean galago_status_type_is_available(const GalagoStatusType *status_type);
G_END_DECLS
-#endif /* _GALAGO_STATUS_H_ */
+#endif /* _GALAGO_STATUS_TYPE_H_ */
Modified: branches/libgalago/push-presence/libgalago/galago.h
===================================================================
--- branches/libgalago/push-presence/libgalago/galago.h 2006-05-26 07:09:59 UTC (rev 2816)
+++ branches/libgalago/push-presence/libgalago/galago.h 2006-05-26 07:21:33 UTC (rev 2817)
@@ -48,6 +48,6 @@
#include <libgalago/galago-person.h>
#include <libgalago/galago-presence.h>
#include <libgalago/galago-service.h>
-#include <libgalago/galago-status.h>
+#include <libgalago/galago-status-type.h>
#endif /* _GALAGO_H_ */
More information about the galago-commits
mailing list