[libdmapsharing] Use -D instead of dmap-priv.h to define G_LOG_DOMAIN. Signed-off-by: W. Michael Petullo <mike flyn o

[W. Michael Petullo <wmpetullo src gnome org>]

commit 208c2e1753f768a2f1cdf2b81c63af2ec33f1027
Author: W. Michael Petullo <mike flyn org>
Date:   Mon Mar 15 19:53:16 2010 -0400

    Use -D instead of dmap-priv.h to define G_LOG_DOMAIN.
    Signed-off-by: W. Michael Petullo <mike flyn org>

 ChangeLog                                |    6 ++++++
 libdmapsharing/Makefile.am               |   14 +++++++-------
 libdmapsharing/daap-share.c              |    2 --
 libdmapsharing/dmap-mdns-browser-avahi.c |    2 --
 libdmapsharing/dmap-mdns-browser-howl.c  |    2 --
 libdmapsharing/dmap-priv.h               |    6 ------
 libdmapsharing/dmap-share.c              |    2 --
 libdmapsharing/dpap-share.c              |    2 --
 8 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6ea53f6..58e05ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+15 March 2010 W. Michael Petullo <mike flyn org>
+
+	* Set def. and min. value of track, year and disc to 0 (not 1) in
+	DAAPRecord.
+
+
 11 March 2010 W. Michael Petullo <mike flyn org>
 
 	* Add user agent header to requests (Rhythmbox bug #610440).
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index a0fdeea..aaf2fe7 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -42,6 +42,13 @@ libdmapsharing_la_SOURCES += \
 	gst-util.c
 endif
 
+libdmapsharing_la_CFLAGS = \
+	-DG_LOG_DOMAIN=\"libdmapsharing\" \
+	-I$(top_srcdir) \
+	$(SOUP_CFLAGS) \
+	$(GSTREAMERAPP_CFLAGS) \
+	$(MDNS_CFLAGS)
+
 libdmapsharing_la_LDFLAGS = \
 	-version-info @SO_VERSION@ \
 	$(GLIB_LIBS) \
@@ -72,7 +79,6 @@ libdmapsharinginclude_HEADERS = \
 
 noinst_HEADERS = \
 	dmap-marshal.h \
-	dmap-priv.h \
 	dmap-config.h \
 	dmap-md5.h \
 	dmap-mdns-avahi.h \
@@ -83,12 +89,6 @@ noinst_HEADERS = \
 	g-gst-wav-input-stream.h \
 	gst-util.h
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	$(SOUP_CFLAGS) \
-	$(GSTREAMERAPP_CFLAGS) \
-	$(MDNS_CFLAGS)
-
 dmap-marshal.c: dmap-marshal.list
 	@glib-genmarshal --prefix=dmap_marshal $(srcdir)/dmap-marshal.list --header --body > dmap-marshal.c
 
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 7bce97d..87a9d65 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -22,8 +22,6 @@
  *
  */
 
-#include <libdmapsharing/dmap-priv.h>
-
 #include "config.h"
 
 #include <time.h>
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index f55efb4..bf67bd8 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -19,8 +19,6 @@
  * 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
diff --git a/libdmapsharing/dmap-mdns-browser-howl.c b/libdmapsharing/dmap-mdns-browser-howl.c
index 5ee1cad..1a4f6c0 100644
--- a/libdmapsharing/dmap-mdns-browser-howl.c
+++ b/libdmapsharing/dmap-mdns-browser-howl.c
@@ -19,8 +19,6 @@
  * 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
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index 381726b..e85c54a 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -22,8 +22,6 @@
  *
  */
 
-#include <libdmapsharing/dmap-priv.h>
-
 #include "config.h"
 
 #include <time.h>
diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c
index 72cb057..5b8ffdb 100644
--- a/libdmapsharing/dpap-share.c
+++ b/libdmapsharing/dpap-share.c
@@ -22,8 +22,6 @@
  *
  */
 
-#include <libdmapsharing/dmap-priv.h>
-
 #include "config.h"
 
 #include <time.h>