[rhythmbox] last.fm: remove GeditMessageArea, use GtkInfoBar instead

[Jonathan Matthew <jmatthew src gnome org>]

commit 6d9c501709abd749846c643408d583590ca3ff7b
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Jun 19 11:48:38 2010 +1000

    last.fm: remove GeditMessageArea, use GtkInfoBar instead
    
    This was the only place we used GeditMessageArea, so we can remove
    our copy of it.

 doc/reference/Makefile.am                 |    1 -
 plugins/audioscrobbler/rb-lastfm-source.c |   18 +-
 widgets/Makefile.am                       |    2 -
 widgets/gedit-message-area.c              |  640 -----------------------------
 widgets/gedit-message-area.h              |  137 ------
 5 files changed, 9 insertions(+), 789 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index de8ee9f..a76394d 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -51,7 +51,6 @@ IGNORE_HFILES= \
 	npruntime.h \
 	npupp.h \
 	\
-	gedit-message-area.h \
 	gossip-cell-renderer-expander.h \
 	rb-query-creator-private.h \
 	\
diff --git a/plugins/audioscrobbler/rb-lastfm-source.c b/plugins/audioscrobbler/rb-lastfm-source.c
index 463a4c3..492c7ca 100644
--- a/plugins/audioscrobbler/rb-lastfm-source.c
+++ b/plugins/audioscrobbler/rb-lastfm-source.c
@@ -72,7 +72,6 @@
 #include "rb-dialog.h"
 #include "rb-debug.h"
 #include "eel-gconf-extensions.h"
-#include "gedit-message-area.h"
 #include "rb-shell-player.h"
 #include "rb-play-order.h"
 #include "rb-lastfm-play-order.h"
@@ -746,6 +745,7 @@ set_message_area_text_and_icon (RBLastfmSource *source,
 	char      *secondary_markup;
 	GtkWidget *primary_label;
 	GtkWidget *secondary_label;
+	GtkWidget *content;
 
 	hbox_content = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox_content);
@@ -785,8 +785,8 @@ set_message_area_text_and_icon (RBLastfmSource *source,
 	}
 
 	gtk_widget_show (source->priv->message_area);
-	gedit_message_area_set_contents (GEDIT_MESSAGE_AREA (source->priv->message_area),
-					 hbox_content);
+	content = gtk_info_bar_get_content_area (GTK_INFO_BAR (source->priv->message_area));
+	gtk_container_add (GTK_CONTAINER (content), hbox_content);
 }
 
 static void
@@ -818,9 +818,9 @@ set_message_area (RBLastfmSource *source,
 }
 
 static void
-on_message_area_response (GeditMessageArea *area,
-			  int               response_id,
-			  RBLastfmSource   *source)
+on_message_area_response (GtkInfoBar     *infobar,
+			  int             response_id,
+			  RBLastfmSource *source)
 {
 	RBPlugin  *plugin;
 	GtkWidget *dialog;
@@ -841,9 +841,9 @@ show_error_message (RBLastfmSource *source,
 		return;
 	}
 
-	area = gedit_message_area_new_with_buttons (_("Account Settings"),
-						    GTK_RESPONSE_ACCEPT,
-						    NULL);
+	area = gtk_info_bar_new_with_buttons (_("Account Settings"),
+					      GTK_RESPONSE_ACCEPT,
+					      NULL);
 	set_message_area (source, area);
 	set_message_area_text_and_icon (source,
 					"gtk-dialog-error",
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index a5e2171..be08d21 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -28,8 +28,6 @@ librbwidgets_la_SOURCES =				\
 	rb-cell-renderer-rating.c			\
 	gossip-cell-renderer-expander.c			\
 	gossip-cell-renderer-expander.h			\
-	gedit-message-area.c				\
-	gedit-message-area.h				\
 	rb-song-info.c					\
 	rb-rating.c					\
 	rb-rating-helper.c				\