[libdmapsharing] Use "libdmapsharing" log domain.
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Use "libdmapsharing" log domain.
- Date: Sat, 5 Dec 2009 23:12:12 +0000 (UTC)
commit 4411825c37186fb8378af6ed31c30fd85762bf41
Author: W. Michael Petullo <mike flyn org>
Date: Sat Dec 5 18:16:44 2009 -0500
Use "libdmapsharing" log domain.
Signed-off-by: W. Michael Petullo <mike flyn org>
ChangeLog | 4 ++++
libdmapsharing/daap-connection.c | 7 ++++---
libdmapsharing/daap-share.c | 7 +++----
libdmapsharing/dmap-mdns-browser-avahi.c | 5 +++--
libdmapsharing/dmap-mdns-browser-howl.c | 5 +++--
libdmapsharing/dmap-priv.h | 6 ++++++
libdmapsharing/dmap-share.c | 5 +++--
libdmapsharing/dpap-share.c | 8 +++-----
8 files changed, 29 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index abf03d9..be4b98f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+05 December 2009 W. Michael Petullo <mike flyn org>
+
+ * Use our own log domain.
+
28 November 2009 W. Michael Petullo <mike flyn org>
* Change configure script to require avahi, howl OR DNS_SD.H.
diff --git a/libdmapsharing/daap-connection.c b/libdmapsharing/daap-connection.c
index 993b29a..ec4b796 100644
--- a/libdmapsharing/daap-connection.c
+++ b/libdmapsharing/daap-connection.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <libdmapsharing/dmap-priv.h>
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -26,9 +28,8 @@
#include <string.h>
#include <libsoup/soup.h>
-#include "daap-connection.h"
-#include "dmap-md5.h"
-#include "dmap-structure.h"
+#include <libdmapsharing/dmap.h>
+#include <libdmapsharing/dmap-md5.h>
#define DAAP_USER_AGENT "iTunes/4.6 (Macintosh; PPC)"
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index d3535df..670b404 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -22,6 +22,8 @@
*
*/
+#include <libdmapsharing/dmap-priv.h>
+
#include "config.h"
#include <time.h>
@@ -36,11 +38,8 @@
#include <libsoup/soup-uri.h>
#include <libsoup/soup-server.h>
-#include <libdmapsharing/daap-record.h>
-#include <libdmapsharing/daap-share.h>
+#include <libdmapsharing/dmap.h>
#include <libdmapsharing/dmap-structure.h>
-#include <libdmapsharing/dmap-container-db.h>
-#include <libdmapsharing/dmap-container-record.h>
#ifdef HAVE_GSTREAMERAPP
#include <libdmapsharing/g-gst-mp3-input-stream.h>
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index ebc80b4..0a38880 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -19,12 +19,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*
*/
+#include <libdmapsharing/dmap-priv.h>
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "dmap-mdns-browser.h"
-#include "dmap-marshal.h"
+#include <libdmapsharing/dmap.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libdmapsharing/dmap-mdns-browser-howl.c b/libdmapsharing/dmap-mdns-browser-howl.c
index 20f6860..df78761 100644
--- a/libdmapsharing/dmap-mdns-browser-howl.c
+++ b/libdmapsharing/dmap-mdns-browser-howl.c
@@ -19,12 +19,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*
*/
+#include <libdmapsharing/dmap-priv.h>
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "dmap-mdns-browser.h"
-#include "dmap-marshal.h"
+#include <libdmapsharing/dmap.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libdmapsharing/dmap-priv.h b/libdmapsharing/dmap-priv.h
new file mode 100644
index 0000000..f9ac804
--- /dev/null
+++ b/libdmapsharing/dmap-priv.h
@@ -0,0 +1,6 @@
+#ifndef __DMAP_PRIV_H
+#define __DMAP_PRIV_H
+
+#define G_LOG_DOMAIN "libdmapsharing"
+
+#endif /* __DMAP_PRIV_H */
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index c004abe..381726b 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -22,6 +22,8 @@
*
*/
+#include <libdmapsharing/dmap-priv.h>
+
#include "config.h"
#include <time.h>
@@ -30,9 +32,8 @@
#include <glib/gi18n.h>
-#include <libdmapsharing/dmap-share.h>
+#include <libdmapsharing/dmap.h>
#include <libdmapsharing/dmap-structure.h>
-#include <libdmapsharing/dmap-mdns-publisher.h>
#define TYPE_OF_SERVICE "_daap._tcp"
#define STANDARD_DAAP_PORT 3689
diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c
index 548db2c..72cb057 100644
--- a/libdmapsharing/dpap-share.c
+++ b/libdmapsharing/dpap-share.c
@@ -22,6 +22,8 @@
*
*/
+#include <libdmapsharing/dmap-priv.h>
+
#include "config.h"
#include <time.h>
@@ -43,11 +45,7 @@
#include <libsoup/soup-uri.h>
#include <libsoup/soup-server.h>
-#include <libdmapsharing/dmap-db.h>
-#include <libdmapsharing/dmap-container-db.h>
-#include <libdmapsharing/dmap-container-record.h>
-#include <libdmapsharing/dpap-record.h>
-#include <libdmapsharing/dpap-share.h>
+#include <libdmapsharing/dmap.h>
#include <libdmapsharing/dmap-structure.h>
static void dpap_share_set_property (GObject *object,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]