diff options
| author | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-08-01 00:50:05 +0000 |
|---|---|---|
| committer | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-08-01 00:50:05 +0000 |
| commit | 02902d1dfb65d2c5b1816eae33d26b1c5b8c9f1a (patch) | |
| tree | 7c20a73e0ccfff41e340f8a1f27947c20ab4ab08 | |
| parent | f2ada31c1a4fa379c1b89a3f8a0c80a8f659b2e5 (diff) | |
| download | libgpod-02902d1dfb65d2c5b1816eae33d26b1c5b8c9f1a.tar.gz libgpod-02902d1dfb65d2c5b1816eae33d26b1c5b8c9f1a.tar.xz libgpod-02902d1dfb65d2c5b1816eae33d26b1c5b8c9f1a.zip | |
Move ITDB_DEVICE_ERROR from itdb_plist.h to itdb_device.h
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2074 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/itdb_device.h | 4 | ||||
| -rw-r--r-- | src/itdb_plist.c | 4 | ||||
| -rw-r--r-- | src/itdb_plist.h | 6 |
4 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2008-07-31 Christophe Fergeau <teuf@gnome.org> + + * src/itdb_device.h: + * src/itdb_plist.h: move itdb_device_error_quark from itdb_plist.h + to itdb_device.h + 2008-07-30 Todd Zullinger <tmzullinger at users.sourceforge.net> * docs/reference/tmpl/track.sgml diff --git a/src/itdb_device.h b/src/itdb_device.h index c67585f..26226eb 100644 --- a/src/itdb_device.h +++ b/src/itdb_device.h @@ -113,6 +113,10 @@ struct _Itdb_ArtworkFormat { gint associated_format; }; +/* Error domain */ +#define ITDB_DEVICE_ERROR itdb_device_error_quark () +GQuark itdb_device_error_quark (void); + G_GNUC_INTERNAL GList *itdb_device_get_photo_formats (const Itdb_Device *device); G_GNUC_INTERNAL GList *itdb_device_get_cover_art_formats (const Itdb_Device *device); G_GNUC_INTERNAL gint itdb_device_musicdirs_number (Itdb_Device *device); diff --git a/src/itdb_plist.c b/src/itdb_plist.c index 41d21b9..f6f1dfd 100644 --- a/src/itdb_plist.c +++ b/src/itdb_plist.c @@ -66,6 +66,10 @@ #define DEBUG(...) #endif +/* Error domain */ +#define ITDB_DEVICE_ERROR itdb_device_error_quark () +extern GQuark itdb_device_error_quark (void); + static GValue *parse_node (xmlNode *a_node, GError **error); static void diff --git a/src/itdb_plist.h b/src/itdb_plist.h index 976c2ba..6b02d4c 100644 --- a/src/itdb_plist.h +++ b/src/itdb_plist.h @@ -37,12 +37,6 @@ typedef enum { ITDB_DEVICE_ERROR_XML_PARSING } ItdbDeviceError; -/* Error domain */ -#define ITDB_DEVICE_ERROR itdb_device_error_quark () -GQuark itdb_device_error_quark (void); - - - G_GNUC_INTERNAL GValue *itdb_plist_parse_from_file (const char *filename, GError **error); G_GNUC_INTERNAL GValue *itdb_plist_parse_from_memory (const char *data, |