[totem] grilo: Use libgd submodule instead of copy/paste

[Bastien Nocera <hadess src gnome org>]

commit fa174c9efe26d89c764cbfbf7c81037de7074372
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Dec 12 14:59:12 2012 +0100

    grilo: Use libgd submodule instead of copy/paste

 libgd                                  |    2 +-
 src/plugins/grilo/Makefile.am          |   10 +-
 src/plugins/grilo/gd-tagged-entry.c    | 1004 --------------------------------
 src/plugins/grilo/gd-tagged-entry.h    |   89 ---
 src/plugins/grilo/totem-search-entry.c |    4 +-
 5 files changed, 8 insertions(+), 1101 deletions(-)
---
diff --git a/libgd b/libgd
index aee0c36..fc72580 160000
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit aee0c3673117e39e0da6f56f4146b7a1d6fb1685
+Subproject commit fc725807f57063fce6b65bb9642ed7d5ad292f3a
diff --git a/src/plugins/grilo/Makefile.am b/src/plugins/grilo/Makefile.am
index 5a1f44c..c8678ff 100644
--- a/src/plugins/grilo/Makefile.am
+++ b/src/plugins/grilo/Makefile.am
@@ -15,19 +15,19 @@ EXTRA_DIST += $(conf_DATA)
 
 libgrilo_la_SOURCES =				\
 	totem-grilo.c				\
-	gd-tagged-entry.h			\
-	gd-tagged-entry.c			\
 	totem-search-entry.c			\
 	totem-search-entry.h
 
 libgrilo_la_LDFLAGS = $(plugin_ldflags)
 libgrilo_la_LIBADD =			\
-        $(plugin_libadd)	\
-        $(LIBGRILO_LIBS)
+        $(plugin_libadd)		\
+        $(LIBGRILO_LIBS)		\
+        $(top_builddir)/libgd/libgd.la
 libgrilo_la_CFLAGS =			\
         $(plugin_cflags)		\
         $(LIBGRILO_CFLAGS)		\
-	-I $(top_srcdir)/src/gst/
+	-I $(top_srcdir)/src/gst/	\
+	-I $(top_srcdir)/libgd/
 
 -include $(top_srcdir)/git.mk
 
diff --git a/src/plugins/grilo/totem-search-entry.c b/src/plugins/grilo/totem-search-entry.c
index 485ab14..faa83e3 100644
--- a/src/plugins/grilo/totem-search-entry.c
+++ b/src/plugins/grilo/totem-search-entry.c
@@ -20,7 +20,7 @@
  */
 
 #include "totem-search-entry.h"
-#include "gd-tagged-entry.h"
+#include "libgd/gd-tagged-entry.h"
 
 G_DEFINE_TYPE (TotemSearchEntry, totem_search_entry, GTK_TYPE_BOX)
 
@@ -78,7 +78,7 @@ totem_search_entry_init (TotemSearchEntry *self)
 
 	/* Entry */
 	entry = GTK_WIDGET (gd_tagged_entry_new ());
-	gd_tagged_entry_set_button_visible (GD_TAGGED_ENTRY (entry), FALSE);
+	gd_tagged_entry_set_tag_button_visible (GD_TAGGED_ENTRY (entry), FALSE);
 	gtk_box_pack_start (GTK_BOX (self),
 			    entry,
 			    TRUE, TRUE, 0);