[libgd/wip/taggedentry] Do not take into account close button width

[Ignacio Casal Quinteiro <icq src gnome org>]

commit e3f882a412167f71817ad08972b9c83c90433baa
Author: Ignacio Casal Quinteiro <ignacio casal nice-software com>
Date:   Sat Jul 13 12:22:58 2013 +0200

    Do not take into account close button width

 libgd/gd-tagged-entry.c |    2 +-
 test-tagged-entry.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgd/gd-tagged-entry.c b/libgd/gd-tagged-entry.c
index f679fa3..6507291 100644
--- a/libgd/gd-tagged-entry.c
+++ b/libgd/gd-tagged-entry.c
@@ -266,7 +266,7 @@ gd_tagged_entry_tag_get_width (GdTaggedEntryTag *tag,
   g_object_unref (context);
 
   button_width = 0;
-  if (entry->priv->button_visible)
+  if (entry->priv->button_visible && tag->has_close_button)
     button_width = gdk_pixbuf_get_width (tag->close_pixbuf) + BUTTON_INTERNAL_SPACING;
 
   return layout_width + button_padding.left + button_padding.right +
diff --git a/test-tagged-entry.c b/test-tagged-entry.c
index c3bf134..61e3780 100644
--- a/test-tagged-entry.c
+++ b/test-tagged-entry.c
@@ -19,7 +19,7 @@ main (gint argc,
   gtk_container_add (GTK_CONTAINER (box), entry);
 
   gd_tagged_entry_add_tag_styled (GD_TAGGED_ENTRY (entry),
-                                  "tag1", "Blah", "search-tip", FALSE);
+                                  "tag1", "Blah", "documents-entry-tag", FALSE);
   gd_tagged_entry_add_tag (GD_TAGGED_ENTRY (entry),
                            "tag2", "Blah2");