[eog] Use GtkInfoBar instead of our custom message area widget

[Felix Riemann <friemann src gnome org>]

commit cdcf54b123c3f2ac9274dfe9cd0559909b42b320
Author: Felix Riemann <friemann gnome org>
Date:   Fri Jan 8 22:06:56 2010 +0100

    Use GtkInfoBar instead of our custom message area widget
    
    GTK+ ships with the GtkInfoBar message area widget since version 2.18.
    Use that instead of our own copy of gedit's widget which was also the
    base for GtkInfoBar.

 src/eog-error-message-area.c |   24 +++++++++++++-----------
 src/eog-window.c             |    4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/src/eog-error-message-area.c b/src/eog-error-message-area.c
index dfaff01..dfdfc21 100644
--- a/src/eog-error-message-area.c
+++ b/src/eog-error-message-area.c
@@ -36,10 +36,10 @@
 #include <gtk/gtk.h>
 
 static void
-set_message_area_text_and_icon (EogMessageArea   *message_area,
-				const gchar      *icon_stock_id,
-				const gchar      *primary_text,
-				const gchar      *secondary_text)
+set_message_area_text_and_icon (GtkInfoBar   *message_area,
+				const gchar  *icon_stock_id,
+				const gchar  *primary_text,
+				const gchar  *secondary_text)
 {
 	GtkWidget *hbox_content;
 	GtkWidget *image;
@@ -94,8 +94,7 @@ set_message_area_text_and_icon (EogMessageArea   *message_area,
 		gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5);
 	}
 
-	eog_message_area_set_contents (EOG_MESSAGE_AREA (message_area),
-				       hbox_content);
+	gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (message_area))), hbox_content, TRUE, TRUE, 0);
 }
 
 static GtkWidget *
@@ -106,13 +105,16 @@ create_error_message_area (const gchar *primary_text,
 	GtkWidget *message_area;
 
 	if (recoverable)
-		message_area = eog_message_area_new_with_buttons (
-						_("_Retry"), GTK_RESPONSE_OK,
-						NULL);
+		message_area = gtk_info_bar_new_with_buttons (_("_Retry"),
+							      GTK_RESPONSE_OK,
+							      NULL);
 	else
-		message_area = eog_message_area_new ();
+		message_area = gtk_info_bar_new ();
 
-	set_message_area_text_and_icon (EOG_MESSAGE_AREA (message_area),
+	gtk_info_bar_set_message_type (GTK_INFO_BAR (message_area),
+				       GTK_MESSAGE_ERROR);
+
+	set_message_area_text_and_icon (GTK_INFO_BAR (message_area),
 					GTK_STOCK_DIALOG_ERROR,
 					primary_text,
 					secondary_text);
diff --git a/src/eog-window.c b/src/eog-window.c
index 3ec02b1..803b488 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -1505,8 +1505,8 @@ eog_job_load_cb (EogJobLoad *job, gpointer data)
 
 		eog_window_set_message_area (window, message_area);
 
-		eog_message_area_set_default_response (EOG_MESSAGE_AREA (message_area),
-						       GTK_RESPONSE_CANCEL);
+		gtk_info_bar_set_default_response (GTK_INFO_BAR (message_area),
+						   GTK_RESPONSE_CANCEL);
 
 		gtk_widget_show (message_area);