[libdmapsharing] Fixes required by Vala API work; migrate Vala API file to 3.0 API Signed-off-by: W. Michael Petullo
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Fixes required by Vala API work; migrate Vala API file to 3.0 API Signed-off-by: W. Michael Petullo
- Date: Wed, 22 Dec 2010 19:42:10 +0000 (UTC)
commit 295dd71fb8043c9877c92ea88bc283b8015fbae1
Author: W. Michael Petullo <mike flyn org>
Date: Wed Dec 22 13:37:51 2010 -0600
Fixes required by Vala API work; migrate Vala API file to 3.0 API
Signed-off-by: W. Michael Petullo <mike flyn org>
libdmapsharing/Makefile.am | 2 +-
libdmapsharing/daap-connection.c | 6 +++---
libdmapsharing/daap-connection.h | 18 +++++++++---------
libdmapsharing/daap-share.c | 6 +++---
libdmapsharing/daap-share.h | 18 +++++++++---------
libdmapsharing/dacp-player.c | 10 +++++-----
libdmapsharing/dacp-player.h | 12 ++++++------
libdmapsharing/dacp-share.c | 6 +++---
libdmapsharing/dacp-share.h | 18 +++++++++---------
libdmapsharing/dmap-connection.c | 4 ++--
libdmapsharing/dmap-connection.h | 18 +++++++++---------
libdmapsharing/dmap-container-record.c | 6 +++---
libdmapsharing/dmap-container-record.h | 18 +++++++++---------
libdmapsharing/dmap-mdns-browser-avahi.c | 4 ++--
libdmapsharing/dmap-mdns-browser-howl.c | 4 ++--
libdmapsharing/dmap-mdns-browser.h | 18 +++++++++---------
libdmapsharing/dmap-mdns-publisher-avahi.c | 4 ++--
libdmapsharing/dmap-mdns-publisher-dnssd.c | 4 ++--
libdmapsharing/dmap-mdns-publisher.h | 12 ++++++------
libdmapsharing/dmap-share.c | 2 +-
libdmapsharing/dmap-share.h | 18 +++++++++---------
libdmapsharing/dpap-connection.c | 6 +++---
libdmapsharing/dpap-connection.h | 18 +++++++++---------
libdmapsharing/dpap-share.c | 6 +++---
libdmapsharing/dpap-share.h | 18 +++++++++---------
tests/Makefile.am | 6 +++---
tests/test-dmap-container-db.c | 6 +++---
tests/test-dmap-container-record.c | 6 +++---
vala/Makefile.am | 4 ++--
.../libdmapsharing-3.0.files | 2 +-
.../libdmapsharing-3.0.files | 2 +-
.../libdmapsharing-3.0.files | 2 +-
.../libdmapsharing-2.2-custom.vala | 1 -
.../libdmapsharing-3.0.files | 2 +-
34 files changed, 143 insertions(+), 144 deletions(-)
---
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index 54e97bf..09d4180 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -111,7 +111,7 @@ dmap-enums.h: $(libdmapsharinginclude_HEADERS) Makefile
@glib-mkenums \
--fhead "/* Automatically generated by glib-mkenums */\n\n#ifndef DMAP_ENUMS_H\n#define DMAP_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n\n" \
--fprod "\n/* enumerations from \"@filename \" */\n" \
- --vhead "GType @enum_name _get_type (void) G_GNUC_CONST;\n#define TYPE_ ENUMNAME@ (@enum_name _get_type())\n" \
+ --vhead "GType @enum_name _get_type (void) G_GNUC_CONST;\n#define DMAP_TYPE_ ENUMNAME@ (@enum_name _get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* !DMAP_ENUMS_H */" $(addprefix $(srcdir)/,$(libdmapsharinginclude_HEADERS)) > $ tmp \
&& sed -e "s/d_map/dmap/" -e "s/D_MAP/DMAP/" -e "s/d_acp/dacp/" -e "s/D_ACP/DACP/" $ tmp > $@ \
&& rm -f $ tmp
diff --git a/libdmapsharing/daap-connection.c b/libdmapsharing/daap-connection.c
index 84d671a..10fa6f2 100644
--- a/libdmapsharing/daap-connection.c
+++ b/libdmapsharing/daap-connection.c
@@ -23,7 +23,7 @@
#include <libdmapsharing/daap-connection.h>
#include <libdmapsharing/dmap-structure.h>
-#define DAAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DAAP_CONNECTION, DAAPConnectionPrivate))
+#define DAAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DAAP_TYPE_CONNECTION, DAAPConnectionPrivate))
/* FIXME:
struct DAAPConnectionPrivate {
@@ -172,7 +172,7 @@ daap_connection_new (const char *name,
{
DAAPConnection *connection;
- connection = g_object_new (TYPE_DAAP_CONNECTION,
+ connection = g_object_new (DAAP_TYPE_CONNECTION,
"name", name,
"password-protected", password_protected,
"db", db,
@@ -192,4 +192,4 @@ daap_connection_init (DAAPConnection *connection)
*/
}
-G_DEFINE_TYPE (DAAPConnection, daap_connection, TYPE_DMAP_CONNECTION)
+G_DEFINE_TYPE (DAAPConnection, daap_connection, DMAP_TYPE_CONNECTION)
diff --git a/libdmapsharing/daap-connection.h b/libdmapsharing/daap-connection.h
index a9825be..a7745f6 100644
--- a/libdmapsharing/daap-connection.h
+++ b/libdmapsharing/daap-connection.h
@@ -25,11 +25,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DAAP_CONNECTION:
+ * DAAP_TYPE_CONNECTION:
*
* The type for #DAAPConnection.
*/
-#define TYPE_DAAP_CONNECTION (daap_connection_get_type ())
+#define DAAP_TYPE_CONNECTION (daap_connection_get_type ())
/**
* DAAP_CONNECTION:
* @o: Object which is subject to casting.
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
-#define DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DAAP_CONNECTION, DAAPConnection))
+#define DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DAAP_TYPE_CONNECTION, DAAPConnection))
/**
* DAAP_CONNECTION_CLASS:
* @k: a valid #DAAPConnectionClass
@@ -46,14 +46,14 @@ G_BEGIN_DECLS
* Casts a derived #DAAPConnectionClass structure into a #DAAPConnectionClass
* structure.
*/
-#define DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DAAP_CONNECTION, DAAPConnectionClass))
+#define DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DAAP_TYPE_CONNECTION, DAAPConnectionClass))
/**
* IS_DAAP_CONNECTION:
- * @o: Instance to check for being a %TYPE_DAAP_CONNECTION.
+ * @o: Instance to check for being a %DAAP_TYPE_CONNECTION.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DAAP_CONNECTION.
+ * Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_CONNECTION.
*/
-#define IS_DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DAAP_CONNECTION))
+#define IS_DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DAAP_TYPE_CONNECTION))
/**
* IS_DAAP_CONNECTION_CLASS:
* @k: a #DAAPConnectionClass
@@ -61,7 +61,7 @@ G_BEGIN_DECLS
* Checks whether @k "is a" valid #DAAPConnectionClass structure of type
* %DAAP_CONNECTION or derived.
*/
-#define IS_DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DAAP_CONNECTION))
+#define IS_DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DAAP_TYPE_CONNECTION))
/**
* DAAP_CONNECTION_GET_CLASS:
* @o: a #DAAPConnection instance.
@@ -70,7 +70,7 @@ G_BEGIN_DECLS
*
* Returns: pointer to object class structure.
*/
-#define DAAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DAAP_CONNECTION, DAAPConnectionClass))
+#define DAAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DAAP_TYPE_CONNECTION, DAAPConnectionClass))
typedef struct DAAPConnectionPrivate DAAPConnectionPrivate;
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 6617491..3077fcc 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -88,13 +88,13 @@ struct DAAPSharePrivate {
gchar unused;
};
-#define DAAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DAAP_SHARE, DAAPSharePrivate))
+#define DAAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DAAP_TYPE_SHARE, DAAPSharePrivate))
enum {
PROP_0,
};
-G_DEFINE_TYPE (DAAPShare, daap_share, TYPE_DMAP_SHARE)
+G_DEFINE_TYPE (DAAPShare, daap_share, DMAP_TYPE_SHARE)
/* FIXME: get rid of this global: */
static gchar *transcode_format = NULL;
@@ -188,7 +188,7 @@ daap_share_new (const char *name,
g_object_ref (db);
g_object_ref (container_db);
- share = DAAP_SHARE (g_object_new (TYPE_DAAP_SHARE,
+ share = DAAP_SHARE (g_object_new (DAAP_TYPE_SHARE,
"name", name,
"password", password,
"db", db,
diff --git a/libdmapsharing/daap-share.h b/libdmapsharing/daap-share.h
index 5396952..7b09d15 100644
--- a/libdmapsharing/daap-share.h
+++ b/libdmapsharing/daap-share.h
@@ -33,11 +33,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DAAP_SHARE:
+ * DAAP_TYPE_SHARE:
*
* The type for #DAAPShare.
*/
-#define TYPE_DAAP_SHARE (daap_share_get_type ())
+#define DAAP_TYPE_SHARE (daap_share_get_type ())
/**
* DAAP_SHARE:
* @o: Object which is subject to casting.
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DAAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
- TYPE_DAAP_SHARE, DAAPShare))
+ DAAP_TYPE_SHARE, DAAPShare))
/**
* DAAP_SHARE_CLASS:
* @k: a valid #DAAPShareClass
@@ -55,15 +55,15 @@ G_BEGIN_DECLS
* Casts a derived #DAAPShareClass structure into a #DAAPShareClass structure.
*/
#define DAAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
- TYPE_DAAP_SHARE, DAAPShareClass))
+ DAAP_TYPE_SHARE, DAAPShareClass))
/**
* IS_DAAP_SHARE:
- * @o: Instance to check for being a %TYPE_DAAP_SHARE.
+ * @o: Instance to check for being a %DAAP_TYPE_SHARE.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DAAP_SHARE.
+ * Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_SHARE.
*/
#define IS_DAAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
- TYPE_DAAP_SHARE))
+ DAAP_TYPE_SHARE))
/**
* IS_DAAP_SHARE_CLASS:
* @k: a #DAAPShareClass
@@ -72,7 +72,7 @@ G_BEGIN_DECLS
* %DAAP_SHARE or derived.
*/
#define IS_DAAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
- TYPE_DAAP_SHARE))
+ DAAP_TYPE_SHARE))
/**
* DAAP_SHARE_GET_CLASS:
* @o: a #DAAPShare instance.
@@ -82,7 +82,7 @@ G_BEGIN_DECLS
* Returns: pointer to object class structure.
*/
#define DAAP_SHARE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
- TYPE_DAAP_SHARE, DAAPShareClass))
+ DAAP_TYPE_SHARE, DAAPShareClass))
typedef struct DAAPSharePrivate DAAPSharePrivate;
diff --git a/libdmapsharing/dacp-player.c b/libdmapsharing/dacp-player.c
index 7d4fe39..e2a4bda 100644
--- a/libdmapsharing/dacp-player.c
+++ b/libdmapsharing/dacp-player.c
@@ -23,7 +23,7 @@
#include <libdmapsharing/daap-record.h>
static void
-dacp_player_init (DACPPlayerInterface *iface)
+dacp_player_init (DACPPlayerIface *iface)
{
static gboolean initialized = FALSE;
@@ -50,7 +50,7 @@ dacp_player_init (DACPPlayerInterface *iface)
g_param_spec_enum ("repeat-state",
"Repeat state",
"Repeat state",
- TYPE_DACP_REPEAT_STATE,
+ DMAP_TYPE_DACP_REPEAT_STATE,
REPEAT_NONE,
G_PARAM_READWRITE));
@@ -58,7 +58,7 @@ dacp_player_init (DACPPlayerInterface *iface)
g_param_spec_enum ("play-state",
"Play state",
"Play state",
- TYPE_DACP_PLAY_STATE,
+ DMAP_TYPE_DACP_PLAY_STATE,
PLAY_STOPPED,
G_PARAM_READWRITE));
@@ -74,7 +74,7 @@ dacp_player_init (DACPPlayerInterface *iface)
}
static void
-dacp_player_finalize (DACPPlayerInterface *iface)
+dacp_player_finalize (DACPPlayerIface *iface)
{
}
@@ -84,7 +84,7 @@ dacp_player_get_type (void)
static GType object_type = 0;
if (!object_type) {
static const GTypeInfo object_info = {
- sizeof(DACPPlayerInterface),
+ sizeof(DACPPlayerIface),
(GBaseInitFunc) dacp_player_init,
(GBaseFinalizeFunc) dacp_player_finalize
};
diff --git a/libdmapsharing/dacp-player.h b/libdmapsharing/dacp-player.h
index ccfc768..90eef01 100644
--- a/libdmapsharing/dacp-player.h
+++ b/libdmapsharing/dacp-player.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define TYPE_DACP_PLAYER (dacp_player_get_type ())
-#define DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DACP_PLAYER, DACPPlayer))
-#define IS_DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DACP_PLAYER))
+#define DACP_TYPE_PLAYER (dacp_player_get_type ())
+#define DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DACP_TYPE_PLAYER, DACPPlayer))
+#define IS_DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DACP_TYPE_PLAYER))
#define DACP_PLAYER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), \
- TYPE_DACP_PLAYER, DACPPlayerInterface))
+ DACP_TYPE_PLAYER, DACPPlayerIface))
-typedef struct _DACPPlayerInterface DACPPlayerInterface;
+typedef struct _DACPPlayerIface DACPPlayerIface;
typedef struct _DACPPlayer DACPPlayer;
/**
@@ -54,7 +54,7 @@ typedef enum {
PLAY_PLAYING = 4
} DACPPlayState;
-struct _DACPPlayerInterface
+struct _DACPPlayerIface
{
GTypeInterface parent_class;
diff --git a/libdmapsharing/dacp-share.c b/libdmapsharing/dacp-share.c
index 05c1b0b..e3fda50 100644
--- a/libdmapsharing/dacp-share.c
+++ b/libdmapsharing/dacp-share.c
@@ -100,7 +100,7 @@ typedef struct {
DMAPConnection *connection;
} DACPRemoteInfo;
-#define DACP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DACP_SHARE, DACPSharePrivate))
+#define DACP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DACP_TYPE_SHARE, DACPSharePrivate))
enum {
PROP_0,
@@ -121,7 +121,7 @@ enum {
static guint signals [LAST_SIGNAL] = { 0, };
-G_DEFINE_TYPE (DACPShare, dacp_share, TYPE_DAAP_SHARE)
+G_DEFINE_TYPE (DACPShare, dacp_share, DAAP_TYPE_SHARE)
static void
dacp_share_class_init (DACPShareClass *klass)
@@ -434,7 +434,7 @@ dacp_share_new (const gchar *library_name,
g_object_ref (db);
g_object_ref (container_db);
- share = DACP_SHARE (g_object_new (TYPE_DACP_SHARE,
+ share = DACP_SHARE (g_object_new (DACP_TYPE_SHARE,
"name", get_dbid (),
"library-name", library_name,
"password", NULL,
diff --git a/libdmapsharing/dacp-share.h b/libdmapsharing/dacp-share.h
index 6099913..d24633c 100644
--- a/libdmapsharing/dacp-share.h
+++ b/libdmapsharing/dacp-share.h
@@ -33,11 +33,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DACP_SHARE:
+ * DACP_TYPE_SHARE:
*
* The type for #DACPShare.
*/
-#define TYPE_DACP_SHARE (dacp_share_get_type ())
+#define DACP_TYPE_SHARE (dacp_share_get_type ())
/**
* DACP_SHARE:
* @o: Object which is subject to casting.
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DACP_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
- TYPE_DACP_SHARE, DACPShare))
+ DACP_TYPE_SHARE, DACPShare))
/**
* DACP_SHARE_CLASS:
* @k: a valid #DACPShareClass
@@ -55,15 +55,15 @@ G_BEGIN_DECLS
* Casts a derived #DACPShareClass structure into a #DACPShareClass structure.
*/
#define DACP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
- TYPE_DACP_SHARE, DACPShareClass))
+ DACP_TYPE_SHARE, DACPShareClass))
/**
* IS_DACP_SHARE:
- * @o: Instance to check for being a %TYPE_DACP_SHARE.
+ * @o: Instance to check for being a %DACP_TYPE_SHARE.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DACP_SHARE.
+ * Checks whether a valid #GTypeInstance pointer is of type %DACP_TYPE_SHARE.
*/
#define IS_DACP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
- TYPE_DACP_SHARE))
+ DACP_TYPE_SHARE))
/**
* IS_DACP_SHARE_CLASS:
* @k: a #DACPShareClass
@@ -72,7 +72,7 @@ G_BEGIN_DECLS
* %DACP_SHARE or derived.
*/
#define IS_DACP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
- TYPE_DACP_SHARE))
+ DACP_TYPE_SHARE))
/**
* DACP_SHARE_GET_CLASS:
* @o: a #DACPShare instance.
@@ -82,7 +82,7 @@ G_BEGIN_DECLS
* Returns: pointer to object class structure.
*/
#define DACP_SHARE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
- TYPE_DACP_SHARE, DACPShareClass))
+ DACP_TYPE_SHARE, DACPShareClass))
typedef struct DACPSharePrivate DACPSharePrivate;
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index 48acf7e..1ed98ca 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -57,7 +57,7 @@ static gboolean emit_progress_idle (DMAPConnection *connection);
G_DEFINE_TYPE (DMAPConnection, dmap_connection, G_TYPE_OBJECT)
-#define DMAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_CONNECTION, DMAPConnectionPrivate))
+#define DMAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_CONNECTION, DMAPConnectionPrivate))
struct DMAPConnectionPrivate {
char *name;
@@ -1135,7 +1135,7 @@ dmap_connection_new (const char *name,
{
DMAPConnection *connection;
- connection = g_object_new (TYPE_DMAP_CONNECTION,
+ connection = g_object_new (DMAP_TYPE_CONNECTION,
"name", name,
"password-protected", password_protected,
"db", db,
diff --git a/libdmapsharing/dmap-connection.h b/libdmapsharing/dmap-connection.h
index 3b9d253..148f7f6 100644
--- a/libdmapsharing/dmap-connection.h
+++ b/libdmapsharing/dmap-connection.h
@@ -38,11 +38,11 @@ typedef struct {
} DMAPPlaylist;
/**
- * TYPE_DMAP_CONNECTION:
+ * DMAP_TYPE_CONNECTION:
*
* The type for #DMAPConnection.
*/
-#define TYPE_DMAP_CONNECTION (dmap_connection_get_type ())
+#define DMAP_TYPE_CONNECTION (dmap_connection_get_type ())
/**
* DMAP_CONNECTION:
* @o: Object which is subject to casting.
@@ -51,7 +51,7 @@ typedef struct {
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
-#define DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DMAP_CONNECTION, DMAPConnection))
+#define DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_CONNECTION, DMAPConnection))
/**
* DMAP_CONNECTION_CLASS:
* @k: a valid #DMAPConnectionClass
@@ -59,14 +59,14 @@ typedef struct {
* Casts a derived #DMAPConnectionClass structure into a #DMAPConnectionClass
* structure.
*/
-#define DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DMAP_CONNECTION, DMAPConnectionClass))
+#define DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_CONNECTION, DMAPConnectionClass))
/**
* IS_DMAP_CONNECTION:
- * @o: Instance to check for being a %TYPE_DMAP_CONNECTION.
+ * @o: Instance to check for being a %DMAP_TYPE_CONNECTION.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DMAP_CONNECTION.
+ * Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_CONNECTION.
*/
-#define IS_DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DMAP_CONNECTION))
+#define IS_DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_CONNECTION))
/**
* IS_DMAP_CONNECTION_CLASS:
* @k: a #DMAPConnectionClass
@@ -74,7 +74,7 @@ typedef struct {
* Checks whether @k "is a" valid #DMAPConnectionClass structure of type
* %DMAP_CONNECTION or derived.
*/
-#define IS_DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DMAP_CONNECTION))
+#define IS_DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_CONNECTION))
/**
* DMAP_CONNECTION_GET_CLASS:
* @o: a #DMAPConnection instance.
@@ -83,7 +83,7 @@ typedef struct {
*
* Returns: pointer to object class structure.
*/
-#define DMAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DMAP_CONNECTION, DMAPConnectionClass))
+#define DMAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_CONNECTION, DMAPConnectionClass))
typedef struct DMAPConnectionPrivate DMAPConnectionPrivate;
diff --git a/libdmapsharing/dmap-container-record.c b/libdmapsharing/dmap-container-record.c
index 09eb4ef..932fedb 100644
--- a/libdmapsharing/dmap-container-record.c
+++ b/libdmapsharing/dmap-container-record.c
@@ -23,7 +23,7 @@
static gint dmap_container_record_init_count = 0;
static void
-dmap_container_record_init (DMAPContainerRecordInterface *iface)
+dmap_container_record_init (DMAPContainerRecordIface *iface)
{
static gboolean is_initialized = FALSE;
@@ -42,7 +42,7 @@ dmap_container_record_init (DMAPContainerRecordInterface *iface)
}
static void
-dmap_container_record_finalize (DMAPContainerRecordInterface *iface)
+dmap_container_record_finalize (DMAPContainerRecordIface *iface)
{
dmap_container_record_init_count--;
}
@@ -54,7 +54,7 @@ dmap_container_record_get_type (void)
static GType object_type = 0;
if (!object_type) {
static const GTypeInfo object_info = {
- sizeof(DMAPContainerRecordInterface),
+ sizeof(DMAPContainerRecordIface),
(GBaseInitFunc) dmap_container_record_init,
(GBaseFinalizeFunc) dmap_container_record_finalize
};
diff --git a/libdmapsharing/dmap-container-record.h b/libdmapsharing/dmap-container-record.h
index 312de70..5567e63 100644
--- a/libdmapsharing/dmap-container-record.h
+++ b/libdmapsharing/dmap-container-record.h
@@ -27,11 +27,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DMAP_CONTAINER_RECORD:
+ * DMAP_TYPE_CONTAINER_RECORD:
*
* The type for #DMAPContainerRecord.
*/
-#define TYPE_DMAP_CONTAINER_RECORD (dmap_container_record_get_type ())
+#define DMAP_TYPE_CONTAINER_RECORD (dmap_container_record_get_type ())
/**
* DMAP_CONTAINER_RECORD:
* @o: Object which is subject to casting.
@@ -41,16 +41,16 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DMAP_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
- TYPE_DMAP_CONTAINER_RECORD, DMAPContainerRecord))
+ DMAP_TYPE_CONTAINER_RECORD, DMAPContainerRecord))
/**
* IS_DMAP_CONTAINER_RECORD:
- * @o: Instance to check for being a %TYPE_DMAP_CONTAINER_RECORD.
+ * @o: Instance to check for being a %DMAP_TYPE_CONTAINER_RECORD.
*
* Checks whether a valid #GTypeInstance pointer is of type
- * %TYPE_DMAP_CONTAINER_RECORD.
+ * %DMAP_TYPE_CONTAINER_RECORD.
*/
#define IS_DMAP_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
- TYPE_DMAP_CONTAINER_RECORD))
+ DMAP_TYPE_CONTAINER_RECORD))
/**
* DMAP_CONTAINER_RECORD_GET_INTERFACE:
* @o: a #DMAPContainerRecord instance.
@@ -60,12 +60,12 @@ G_BEGIN_DECLS
* Returns: pointer to object interface structure.
*/
#define DMAP_CONTAINER_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
- TYPE_DMAP_CONTAINER_RECORD, DMAPContainerRecordInterface))
+ DMAP_TYPE_CONTAINER_RECORD, DMAPContainerRecordIface))
typedef struct _DMAPContainerRecord DMAPContainerRecord;
-typedef struct _DMAPContainerRecordInterface DMAPContainerRecordInterface;
+typedef struct _DMAPContainerRecordIface DMAPContainerRecordIface;
-struct _DMAPContainerRecordInterface {
+struct _DMAPContainerRecordIface {
GTypeInterface parent;
guint (*get_id) (DMAPContainerRecord *record);
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index 3d0f0d6..b19ddc8 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -103,7 +103,7 @@ static void browse_cb (AvahiServiceBrowser *service_browser,
DMAPMdnsBrowser *browser);
static void free_service (DMAPMdnsBrowserService *service);
-#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
+#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
static guint dmap_mdns_browser_signals [LAST_SIGNAL] = { 0, };
@@ -217,7 +217,7 @@ dmap_mdns_browser_new (DMAPMdnsBrowserServiceType type)
g_return_val_if_fail (type >= DMAP_MDNS_BROWSER_SERVICE_TYPE_INVALID &&
type <= DMAP_MDNS_BROWSER_SERVICE_TYPE_LAST, NULL);
- browser_object = DMAP_MDNS_BROWSER (g_object_new (TYPE_DMAP_MDNS_BROWSER, NULL));
+ browser_object = DMAP_MDNS_BROWSER (g_object_new (DMAP_TYPE_MDNS_BROWSER, NULL));
browser_object->priv->service_type = type;
return browser_object;
diff --git a/libdmapsharing/dmap-mdns-browser-howl.c b/libdmapsharing/dmap-mdns-browser-howl.c
index 6c8ec65..2258b9a 100644
--- a/libdmapsharing/dmap-mdns-browser-howl.c
+++ b/libdmapsharing/dmap-mdns-browser-howl.c
@@ -78,7 +78,7 @@ static void dmap_mdns_browser_finalize (GObject *object);
static void free_service (DMAPMdnsBrowserService *service);
-#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
+#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
static guint signals [LAST_SIGNAL] = { 0, };
@@ -343,7 +343,7 @@ dmap_mdns_browser_new (DMAPMdnsBrowserServiceType type)
g_return_val_if_fail (type >= DMAP_MDNS_BROWSER_SERVICE_TYPE_INVALID &&
type <= DMAP_MDNS_BROWSER_SERVICE_TYPE_LAST, NULL);
- browser_object = DMAP_MDNS_BROWSER (g_object_new (TYPE_DMAP_MDNS_BROWSER, NULL));
+ browser_object = DMAP_MDNS_BROWSER (g_object_new (DMAP_TYPE_MDNS_BROWSER, NULL));
browser_object->priv->service_type = type;
return browser_object;
diff --git a/libdmapsharing/dmap-mdns-browser.h b/libdmapsharing/dmap-mdns-browser.h
index a24387a..a0b9c95 100644
--- a/libdmapsharing/dmap-mdns-browser.h
+++ b/libdmapsharing/dmap-mdns-browser.h
@@ -28,11 +28,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DMAP_MDNS_BROWSER:
+ * DMAP_TYPE_MDNS_BROWSER:
*
* The type for #DMAPMdnsBrowser.
*/
-#define TYPE_DMAP_MDNS_BROWSER (dmap_mdns_browser_get_type ())
+#define DMAP_TYPE_MDNS_BROWSER (dmap_mdns_browser_get_type ())
/**
* DMAP_MDNS_BROWSER:
* @o: Object which is subject to casting.
@@ -41,21 +41,21 @@ G_BEGIN_DECLS
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
-#define DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowser))
+#define DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowser))
/**
* DMAP_MDNS_BROWSER_CLASS:
* @k: a valid #DMAPMdnsBrowserClass
*
* Casts a derived #DAAPShareClass structure into a #DAAPShareClass structure.
*/
-#define DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserClass))
+#define DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserClass))
/**
* IS_DMAP_MDNS_BROWSER:
- * @o: Instance to check for being a %TYPE_DMAP_MDNS_BROWSER.
+ * @o: Instance to check for being a %DMAP_TYPE_MDNS_BROWSER.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DAAP_SHARE.
+ * Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_SHARE.
*/
-#define IS_DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DMAP_MDNS_BROWSER))
+#define IS_DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_BROWSER))
/**
* IS_DMAP_MDNS_BROWSER_CLASS:
* @k: a #DMAPMdnsBrowserClass
@@ -63,7 +63,7 @@ G_BEGIN_DECLS
* Checks whether @k "is a" valid #DMAPMdnsBrowserClass structure of type
* %DMAP_MDNS_BROWSER or derived.
*/
-#define IS_DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DMAP_MDNS_BROWSER))
+#define IS_DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_BROWSER))
/**
* DMAP_MDNS_BROWSER_GET_CLASS:
* @o: a #DMAPMdnsBrowser instance.
@@ -72,7 +72,7 @@ G_BEGIN_DECLS
*
* Returns: pointer to object class structure.
*/
-#define DMAP_MDNS_BROWSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserClass))
+#define DMAP_MDNS_BROWSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserClass))
typedef struct _DMAPMdnsBrowser DMAPMdnsBrowser;
typedef struct _DMAPMdnsBrowserClass DMAPMdnsBrowserClass;
diff --git a/libdmapsharing/dmap-mdns-publisher-avahi.c b/libdmapsharing/dmap-mdns-publisher-avahi.c
index e4087af..5f36995 100644
--- a/libdmapsharing/dmap-mdns-publisher-avahi.c
+++ b/libdmapsharing/dmap-mdns-publisher-avahi.c
@@ -44,7 +44,7 @@ static void dmap_mdns_publisher_class_init (DMAPMdnsPublisherClass *klass);
static void dmap_mdns_publisher_init (DMAPMdnsPublisher *publisher);
static void dmap_mdns_publisher_finalize (GObject *object);
-#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
+#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
struct DMAPMdnsPublisherService
{
@@ -474,7 +474,7 @@ dmap_mdns_publisher_new (void)
if (publisher_object) {
g_object_ref (publisher_object);
} else {
- publisher_object = g_object_new (TYPE_DMAP_MDNS_PUBLISHER, NULL);
+ publisher_object = g_object_new (DMAP_TYPE_MDNS_PUBLISHER, NULL);
g_object_add_weak_pointer (publisher_object,
(gpointer *) &publisher_object);
}
diff --git a/libdmapsharing/dmap-mdns-publisher-dnssd.c b/libdmapsharing/dmap-mdns-publisher-dnssd.c
index b63a6be..a820203 100644
--- a/libdmapsharing/dmap-mdns-publisher-dnssd.c
+++ b/libdmapsharing/dmap-mdns-publisher-dnssd.c
@@ -25,7 +25,7 @@
#include "dmap-mdns-publisher.h"
-#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
+#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
struct DMAPMdnsPublisherPrivate
{
@@ -207,7 +207,7 @@ dmap_mdns_publisher_new (void)
if (publisher_object) {
g_object_ref (publisher_object);
} else {
- publisher_object = g_object_new (TYPE_DMAP_MDNS_PUBLISHER, NULL);
+ publisher_object = g_object_new (DMAP_TYPE_MDNS_PUBLISHER, NULL);
g_object_add_weak_pointer (publisher_object,
(gpointer *) &publisher_object);
}
diff --git a/libdmapsharing/dmap-mdns-publisher.h b/libdmapsharing/dmap-mdns-publisher.h
index 2ebb3ee..7db3891 100644
--- a/libdmapsharing/dmap-mdns-publisher.h
+++ b/libdmapsharing/dmap-mdns-publisher.h
@@ -31,12 +31,12 @@
G_BEGIN_DECLS
-#define TYPE_DMAP_MDNS_PUBLISHER (dmap_mdns_publisher_get_type ())
-#define DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisher))
-#define DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherClass))
-#define IS_DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DMAP_MDNS_PUBLISHER))
-#define IS_DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DMAP_MDNS_PUBLISHER))
-#define DMAP_MDNS_PUBLISHER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherClass))
+#define DMAP_TYPE_MDNS_PUBLISHER (dmap_mdns_publisher_get_type ())
+#define DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisher))
+#define DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisherClass))
+#define IS_DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_PUBLISHER))
+#define IS_DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_PUBLISHER))
+#define DMAP_MDNS_PUBLISHER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisherClass))
typedef struct DMAPMdnsPublisherPrivate DMAPMdnsPublisherPrivate;
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index 9dae8dc..998cf0a 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -112,7 +112,7 @@ static void dmap_share_class_init (DMAPShareClass *klass);
G_DEFINE_ABSTRACT_TYPE (DMAPShare, dmap_share, G_TYPE_OBJECT)
#define DMAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- TYPE_DMAP_SHARE, DMAPSharePrivate))
+ DMAP_TYPE_SHARE, DMAPSharePrivate))
static gboolean
_dmap_share_soup_auth_callback (SoupAuthDomain *auth_domain,
diff --git a/libdmapsharing/dmap-share.h b/libdmapsharing/dmap-share.h
index fe9a93a..aafb340 100644
--- a/libdmapsharing/dmap-share.h
+++ b/libdmapsharing/dmap-share.h
@@ -39,11 +39,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DMAP_SHARE:
+ * DMAP_TYPE_SHARE:
*
* The type for #DMAPShare.
*/
-#define TYPE_DMAP_SHARE (dmap_share_get_type ())
+#define DMAP_TYPE_SHARE (dmap_share_get_type ())
/**
* DMAP_SHARE:
* @o: Object which is subject to casting.
@@ -53,7 +53,7 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DMAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
- TYPE_DMAP_SHARE, DMAPShare))
+ DMAP_TYPE_SHARE, DMAPShare))
/**
* DMAP_SHARE_CLASS:
* @k: a valid #DMAPShareClass
@@ -61,16 +61,16 @@ G_BEGIN_DECLS
* Casts a derived #DMAPShareClass structure into a #DMAPShareClass structure.
*/
#define DMAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
- TYPE_DMAP_SHARE, DMAPShareClass))
+ DMAP_TYPE_SHARE, DMAPShareClass))
/**
* IS_DMAP_SHARE:
- * @o: Instance to check for being a %TYPE_DMAP_SHARE.
+ * @o: Instance to check for being a %DMAP_TYPE_SHARE.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DMAP_SHARE.
+ * Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_SHARE.
*/
#define IS_DMAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
- TYPE_DMAP_SHARE))
+ DMAP_TYPE_SHARE))
/**
* IS_DMAP_SHARE_CLASS:
* @k: a #DMAPShareClass
@@ -79,7 +79,7 @@ G_BEGIN_DECLS
* %DMAP_SHARE or derived.
*/
#define IS_DMAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
- TYPE_DMAP_SHARE))
+ DMAP_TYPE_SHARE))
/**
* DMAP_SHARE_GET_CLASS:
* @o: a #DMAPShare instance.
@@ -89,7 +89,7 @@ G_BEGIN_DECLS
* Returns: pointer to object class structure.
*/
#define DMAP_SHARE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
- TYPE_DMAP_SHARE, DMAPShareClass))
+ DMAP_TYPE_SHARE, DMAPShareClass))
#define DMAP_STATUS_OK 200
diff --git a/libdmapsharing/dpap-connection.c b/libdmapsharing/dpap-connection.c
index 5a08768..abefe8a 100644
--- a/libdmapsharing/dpap-connection.c
+++ b/libdmapsharing/dpap-connection.c
@@ -23,7 +23,7 @@
#include <libdmapsharing/dpap-connection.h>
#include <libdmapsharing/dmap-structure.h>
-#define DPAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DPAP_CONNECTION, DPAPConnectionPrivate))
+#define DPAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DPAP_TYPE_CONNECTION, DPAPConnectionPrivate))
/* FIXME:
struct DPAPConnectionPrivate {
@@ -160,7 +160,7 @@ dpap_connection_new (const char *name,
{
DPAPConnection *connection;
- connection = g_object_new (TYPE_DPAP_CONNECTION,
+ connection = g_object_new (DPAP_TYPE_CONNECTION,
"name", name,
"password-protected", password_protected,
"db", db,
@@ -180,4 +180,4 @@ dpap_connection_init (DPAPConnection *connection)
*/
}
-G_DEFINE_TYPE (DPAPConnection, dpap_connection, TYPE_DMAP_CONNECTION)
+G_DEFINE_TYPE (DPAPConnection, dpap_connection, DMAP_TYPE_CONNECTION)
diff --git a/libdmapsharing/dpap-connection.h b/libdmapsharing/dpap-connection.h
index d5b8ae0..8941e4d 100644
--- a/libdmapsharing/dpap-connection.h
+++ b/libdmapsharing/dpap-connection.h
@@ -25,11 +25,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DPAP_CONNECTION:
+ * DPAP_TYPE_CONNECTION:
*
* The type for #DPAPConnection.
*/
-#define TYPE_DPAP_CONNECTION (dpap_connection_get_type ())
+#define DPAP_TYPE_CONNECTION (dpap_connection_get_type ())
/**
* DPAP_CONNECTION:
* @o: Object which is subject to casting.
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
-#define DPAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DPAP_CONNECTION, DPAPConnection))
+#define DPAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DPAP_TYPE_CONNECTION, DPAPConnection))
/**
* DPAP_CONNECTION_CLASS:
* @k: a valid #DPAPConnectionClass
@@ -46,14 +46,14 @@ G_BEGIN_DECLS
* Casts a derived #DPAPConnectionClass structure into a #DPAPConnectionClass
* structure.
*/
-#define DPAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DPAP_CONNECTION, DPAPConnectionClass))
+#define DPAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DPAP_TYPE_CONNECTION, DPAPConnectionClass))
/**
* IS_DPAP_CONNECTION:
- * @o: Instance to check for being a %TYPE_DPAP_CONNECTION.
+ * @o: Instance to check for being a %DPAP_TYPE_CONNECTION.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DPAP_CONNECTION.
+ * Checks whether a valid #GTypeInstance pointer is of type %DPAP_TYPE_CONNECTION.
*/
-#define IS_DPAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DPAP_CONNECTION))
+#define IS_DPAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DPAP_TYPE_CONNECTION))
/**
* IS_DPAP_CONNECTION_CLASS:
* @k: a #DPAPConnectionClass
@@ -61,7 +61,7 @@ G_BEGIN_DECLS
* Checks whether @k "is a" valid #DPAPConnectionClass structure of type
* %DPAP_CONNECTION or derived.
*/
-#define IS_DPAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DPAP_CONNECTION))
+#define IS_DPAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DPAP_TYPE_CONNECTION))
/**
* DPAP_CONNECTION_GET_CLASS:
* @o: a #DPAPConnection instance.
@@ -70,7 +70,7 @@ G_BEGIN_DECLS
*
* Returns: pointer to object class structure.
*/
-#define DPAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DPAP_CONNECTION, DPAPConnectionClass))
+#define DPAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DPAP_TYPE_CONNECTION, DPAPConnectionClass))
typedef struct DPAPConnectionPrivate DPAPConnectionPrivate;
diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c
index 4aaf25d..8835e94 100644
--- a/libdmapsharing/dpap-share.c
+++ b/libdmapsharing/dpap-share.c
@@ -95,13 +95,13 @@ struct DPAPSharePrivate {
*/
static GMappedFile *mapped_file = NULL;
-#define DPAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DPAP_SHARE, DPAPSharePrivate))
+#define DPAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DPAP_TYPE_SHARE, DPAPSharePrivate))
enum {
PROP_0,
};
-G_DEFINE_TYPE (DPAPShare, dpap_share, TYPE_DMAP_SHARE)
+G_DEFINE_TYPE (DPAPShare, dpap_share, DMAP_TYPE_SHARE)
static void
dpap_share_class_init (DPAPShareClass *klass)
@@ -181,7 +181,7 @@ dpap_share_new (const char *name,
{
DPAPShare *share;
- share = DPAP_SHARE (g_object_new (TYPE_DPAP_SHARE,
+ share = DPAP_SHARE (g_object_new (DPAP_TYPE_SHARE,
"name", name,
"password", password,
"db", db,
diff --git a/libdmapsharing/dpap-share.h b/libdmapsharing/dpap-share.h
index 709f93b..5f5ab94 100644
--- a/libdmapsharing/dpap-share.h
+++ b/libdmapsharing/dpap-share.h
@@ -31,11 +31,11 @@
G_BEGIN_DECLS
/**
- * TYPE_DPAP_SHARE:
+ * DPAP_TYPE_SHARE:
*
* The type for #DPAPShare.
*/
-#define TYPE_DPAP_SHARE (dpap_share_get_type ())
+#define DPAP_TYPE_SHARE (dpap_share_get_type ())
/**
* DPAP_SHARE:
* @o: Object which is subject to casting.
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DPAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
- TYPE_DPAP_SHARE, DPAPShare))
+ DPAP_TYPE_SHARE, DPAPShare))
/**
* DPAP_SHARE_CLASS:
* @k: a valid #DPAPShareClass
@@ -53,15 +53,15 @@ G_BEGIN_DECLS
* Casts a derived #DPAPShareClass structure into a #DPAPShareClass structure.
*/
#define DPAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
- TYPE_DPAP_SHARE, DPAPShareClass))
+ DPAP_TYPE_SHARE, DPAPShareClass))
/**
* IS_DPAP_SHARE:
- * @o: Instance to check for being a %TYPE_DPAP_SHARE.
+ * @o: Instance to check for being a %DPAP_TYPE_SHARE.
*
- * Checks whether a valid #GTypeInstance pointer is of type %TYPE_DPAP_SHARE.
+ * Checks whether a valid #GTypeInstance pointer is of type %DPAP_TYPE_SHARE.
*/
#define IS_DPAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
- TYPE_DPAP_SHARE))
+ DPAP_TYPE_SHARE))
/**
* IS_DPAP_SHARE_CLASS:
* @k: a #DPAPShareClass
@@ -69,7 +69,7 @@ G_BEGIN_DECLS
* Checks whether @k "is a" valid #DPAPShareClass structure of type
* %DPAP_SHARE or derived.
*/
-#define IS_DPAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DPAP_SHARE))
+#define IS_DPAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DPAP_TYPE_SHARE))
/**
* DPAP_SHARE_GET_CLASS:
* @o: a #DPAPShare instance.
@@ -79,7 +79,7 @@ G_BEGIN_DECLS
* Returns: pointer to object class structure.
*/
#define DPAP_SHARE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
- TYPE_DPAP_SHARE, DPAPShareClass))
+ DPAP_TYPE_SHARE, DPAPShareClass))
typedef struct DPAPSharePrivate DPAPSharePrivate;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ca057a..c56980e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,15 +46,15 @@ if MAINTAINER_MODE
BUILT_SOURCES = dpapview.stamp dmapcopy.stamp dmapserve.stamp
dpapview.stamp: $(dpapview_VALASOURCES)
- $(VALAC) --vapidir=$(srcdir) --pkg gee-1.0 --pkg gtk+-2.0 --pkg gstreamer-0.10 --pkg libdmapsharing-2.2 --pkg libsoup-2.4 --pkg glib-2.0 $^ -C
+ $(VALAC) --vapidir=../vala --pkg gee-1.0 --pkg gtk+-2.0 --pkg gstreamer-0.10 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 $^ -C
touch $@
dmapcopy.stamp: $(dmapcopy_VALASOURCES)
- $(VALAC) --vapidir=$(srcdir) --pkg gee-1.0 --pkg gstreamer-0.10 --pkg libdmapsharing-2.2 --pkg libsoup-2.4 --pkg glib-2.0 $^ -C
+ $(VALAC) --vapidir=../vala --pkg gee-1.0 --pkg gstreamer-0.10 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 $^ -C
touch $@
dmapserve.stamp: $(dmapserve_VALASOURCES)
- $(VALAC) --vapidir=$(srcdir) --pkg gee-1.0 --pkg gstreamer-0.10 --pkg libdmapsharing-2.2 --pkg libsoup-2.4 --pkg glib-2.0 $^ -C
+ $(VALAC) --vapidir=../vala --pkg gee-1.0 --pkg gstreamer-0.10 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 $^ -C
touch $@
endif
diff --git a/tests/test-dmap-container-db.c b/tests/test-dmap-container-db.c
index 86f9a4a..2977f29 100644
--- a/tests/test-dmap-container-db.c
+++ b/tests/test-dmap-container-db.c
@@ -62,9 +62,9 @@ test_dmap_container_db_class_init (TestDMAPContainerDbClass *klass)
static void
test_dmap_container_db_interface_init (gpointer iface, gpointer data)
{
- DMAPContainerDbInterface *dmap_container_db = iface;
+ DMAPContainerDbIface *dmap_container_db = iface;
- g_assert (G_TYPE_FROM_INTERFACE (dmap_container_db) == TYPE_DMAP_CONTAINER_DB);
+ g_assert (G_TYPE_FROM_INTERFACE (dmap_container_db) == DMAP_TYPE_CONTAINER_DB);
dmap_container_db->lookup_by_id = test_dmap_container_db_lookup_by_id;
dmap_container_db->foreach = test_dmap_container_db_foreach;
@@ -72,7 +72,7 @@ test_dmap_container_db_interface_init (gpointer iface, gpointer data)
}
G_DEFINE_TYPE_WITH_CODE (TestDMAPContainerDb, test_dmap_container_db, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (TYPE_DMAP_CONTAINER_DB,
+ G_IMPLEMENT_INTERFACE (DMAP_TYPE_CONTAINER_DB,
test_dmap_container_db_interface_init))
TestDMAPContainerDb *
diff --git a/tests/test-dmap-container-record.c b/tests/test-dmap-container-record.c
index c13b4f5..ab49422 100644
--- a/tests/test-dmap-container-record.c
+++ b/tests/test-dmap-container-record.c
@@ -105,9 +105,9 @@ test_dmap_container_record_class_init (TestDMAPContainerRecordClass *klass)
static void
test_dmap_container_record_interface_init (gpointer iface, gpointer data)
{
- DMAPContainerRecordInterface *dmap_container_record = iface;
+ DMAPContainerRecordIface *dmap_container_record = iface;
- g_assert (G_TYPE_FROM_INTERFACE (dmap_container_record) == TYPE_DMAP_CONTAINER_RECORD);
+ g_assert (G_TYPE_FROM_INTERFACE (dmap_container_record) == DMAP_TYPE_CONTAINER_RECORD);
dmap_container_record->get_id = test_dmap_container_record_get_id;
dmap_container_record->add_entry = test_dmap_container_record_add_entry;
@@ -116,7 +116,7 @@ test_dmap_container_record_interface_init (gpointer iface, gpointer data)
}
G_DEFINE_TYPE_WITH_CODE (TestDMAPContainerRecord, test_dmap_container_record, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (TYPE_DMAP_CONTAINER_RECORD,
+ G_IMPLEMENT_INTERFACE (DMAP_TYPE_CONTAINER_RECORD,
test_dmap_container_record_interface_init))
TestDMAPContainerRecord *test_dmap_container_record_new (void)
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 93d6f53..ee5c2b3 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -31,10 +31,10 @@ libdmapsharing- API_VERSION@-dpap.vapi: libdmapsharing- API_VERSION@-dpap/libdma
libdmapsharing- API_VERSION@.vapi: libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dacp.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi
cat libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dacp.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi > libdmapsharing- API_VERSION@.vapi
cat libdmapsharing- API_VERSION@.vapi | \
- sed 's/DPAP\.DMAPDb/DMAP.Db/g' | \
sed 's/DAAP\.DMAPDb/DMAP.Db/g' | \
- sed 's/DPAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
+ sed 's/DPAP\.DMAPDb/DMAP.Db/g' | \
sed 's/DAAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
+ sed 's/DPAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
cat > libdmapsharing- API_VERSION@.vapi.tmp
mv libdmapsharing- API_VERSION@.vapi.tmp libdmapsharing- API_VERSION@.vapi
rm -f libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dacp.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi
diff --git a/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.files b/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.files
index db3070c..7c4cb76 100644
--- a/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.files
+++ b/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.files
@@ -1,2 +1,2 @@
-include/libdmapsharing-2.2/libdmapsharing/
+include/libdmapsharing-3.0/libdmapsharing/
lib64/libdmapsharing.so
diff --git a/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.files b/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.files
index db3070c..7c4cb76 100644
--- a/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.files
+++ b/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.files
@@ -1,2 +1,2 @@
-include/libdmapsharing-2.2/libdmapsharing/
+include/libdmapsharing-3.0/libdmapsharing/
lib64/libdmapsharing.so
diff --git a/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.files b/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.files
index db3070c..7c4cb76 100644
--- a/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.files
+++ b/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.files
@@ -1,2 +1,2 @@
-include/libdmapsharing-2.2/libdmapsharing/
+include/libdmapsharing-3.0/libdmapsharing/
lib64/libdmapsharing.so
diff --git a/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.files b/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.files
index db3070c..7c4cb76 100644
--- a/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.files
+++ b/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.files
@@ -1,2 +1,2 @@
-include/libdmapsharing-2.2/libdmapsharing/
+include/libdmapsharing-3.0/libdmapsharing/
lib64/libdmapsharing.so
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
