[gnome-utils] [logview] use GtkInfoBar

[Cosimo Cecchi <cosimoc src gnome org>]

commit b434bff848bd5d004fb278c5d799482793a67112
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Jun 18 11:53:29 2009 +0200

    [logview] use GtkInfoBar
    
    Use GtkInfoBar instead of our own copy-and-pasted GtkMessageArea
    implementation. This requires depending on GTK+ 2.17.2.

 configure.ac             |    2 +-
 logview/Makefile.am      |    2 -
 logview/gtkmessagearea.c |  874 ----------------------------------------------
 logview/gtkmessagearea.h |  116 ------
 logview/logview-window.c |   17 +-
 5 files changed, 9 insertions(+), 1002 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cb21cd3..76ef9b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ dnl pkg-config check
 
 GLIB_REQUIRED=2.20.0
 GIO_REQUIRED=2.16.0
-GTK_REQUIRED=2.16.0
+GTK_REQUIRED=2.17.2
 GIO_UNIX_REQUIRED=2.18.0
 LIBPANEL_APPLET_REQUIRED=2.13.4
 LIBGTOP_REQUIRED=2.12.0
diff --git a/logview/Makefile.am b/logview/Makefile.am
index 0dce46c..eb2d915 100644
--- a/logview/Makefile.am
+++ b/logview/Makefile.am
@@ -18,8 +18,6 @@ BUILT_SOURCES = 		\
 	logview-marshal.h
 
 gnome_system_log_SOURCES = 	\
-	gtkmessagearea.h	\
-	gtkmessagearea.c	\
 	logview-app.c		\
 	logview-app.h		\
 	logview-main.c		\
diff --git a/logview/logview-window.c b/logview/logview-window.c
index c32aea8..e27d5c5 100644
--- a/logview/logview-window.c
+++ b/logview/logview-window.c
@@ -35,8 +35,6 @@
 #include "logview-manager.h"
 #include "logview-filter-manager.h"
 
-#include "gtkmessagearea.h"
-
 #define APP_NAME _("System Log Viewer")
 #define SEARCH_START_MARK "lw-search-start-mark"
 #define SEARCH_END_MARK "lw-search-end-mark"
@@ -1232,8 +1230,10 @@ message_area_create_error_box (LogviewWindow *window,
 
   window->priv->message_secondary = secondary_label;
 
-  gtk_message_area_set_contents (GTK_MESSAGE_AREA (message_area),
-                                 hbox_content);
+  gtk_container_add
+      (GTK_CONTAINER (gtk_info_bar_get_content_area
+                      (GTK_INFO_BAR (message_area))),
+       hbox_content);
 }
 
 static void
@@ -1257,7 +1257,7 @@ message_area_set_labels (LogviewWindow *window,
 }
 
 static void
-message_area_response_cb (GtkMessageArea *message_area,
+message_area_response_cb (GtkInfoBar *message_area,
                           int response_id, gpointer user_data)
 {
   LogviewWindow *window = user_data;
@@ -1369,11 +1369,10 @@ logview_window_init (LogviewWindow *logview)
   gtk_paned_pack2 (GTK_PANED (hpaned), main_view, TRUE, TRUE);
 
   /* second pane: error message area */
-  priv->message_area = gtk_message_area_new ();
+  priv->message_area = gtk_info_bar_new ();
   message_area_create_error_box (logview, priv->message_area);
-  gtk_message_area_add_stock_button_with_text (GTK_MESSAGE_AREA (priv->message_area),
-                                               _("Close"), GTK_STOCK_CLOSE,
-                                               GTK_RESPONSE_CLOSE);
+  gtk_info_bar_add_button (GTK_INFO_BAR (priv->message_area),
+                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
   gtk_box_pack_start (GTK_BOX (main_view), priv->message_area, FALSE, FALSE, 0);
 
   /* second pane: text view */