[totem] properties: Fix loading when built with some linkers

[Bastien Nocera <hadess src gnome org>]

commit bcafeb0c795fcb7c272e6825326a33933e32caf7
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Dec 5 20:30:20 2012 +0100

    properties: Fix loading when built with some linkers
    
    Some unused symbols, brought in through the libtotem-player.la internal
    library are still getting resolved by some linkers causing the properties
    module to fail loading.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689688

 src/Makefile.am                                |    1 -
 src/properties/Makefile.am                     |    5 +++--
 src/properties/bacon-video-widget-properties.c |    7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 1cc0b68..8f166c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -220,7 +220,6 @@ libtotem_properties_page_la_LDFLAGS = \
 
 libtotem_properties_page_la_LIBADD =				\
 	properties/libbaconvideowidgetproperties.la		\
-	libtotem_player.la					\
 	$(NAUTILUS_LIBS)
 
 noinst_PROGRAMS = test-properties-page
diff --git a/src/properties/Makefile.am b/src/properties/Makefile.am
index e95e71b..566f5f6 100644
--- a/src/properties/Makefile.am
+++ b/src/properties/Makefile.am
@@ -5,8 +5,9 @@ libbaconvideowidgetproperties_la_SOURCES = \
 	bacon-video-widget-properties.h \
 	$(NULL)
 
-libbaconvideowidgetproperties_la_CPPFLAGS = \
-	-I$(top_srcdir)/src/ \
+libbaconvideowidgetproperties_la_CPPFLAGS =	\
+	-I$(top_srcdir)/src/			\
+	-DDATADIR=\""$(datadir)/totem/"\"	\
 	$(AM_CPPFLAGS)
 
 libbaconvideowidgetproperties_la_CFLAGS = \
diff --git a/src/properties/bacon-video-widget-properties.c b/src/properties/bacon-video-widget-properties.c
index 6080390..3f10eac 100644
--- a/src/properties/bacon-video-widget-properties.c
+++ b/src/properties/bacon-video-widget-properties.c
@@ -257,10 +257,11 @@ bacon_video_widget_properties_new (void)
 			"samplerate_label", "channels_label" };
 	guint i;
 
-	xml = totem_interface_load ("properties.ui", TRUE, NULL, NULL);
-
-	if (xml == NULL)
+	xml = gtk_builder_new ();
+	if (gtk_builder_add_from_file (xml, DATADIR"/properties.ui", NULL) == 0) {
+		g_object_unref (xml);
 		return NULL;
+	}
 
 	props = BACON_VIDEO_WIDGET_PROPERTIES (g_object_new
 			(BACON_TYPE_VIDEO_WIDGET_PROPERTIES, NULL));