[evince] Remove the internal copy of gtkinfobar and use GtkInfoBar directly

[Carlos Garcia Campos <carlosgc src gnome org>]

commit b81ab84ffbb263771071c9ed79350dbb4017a17b
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Wed Mar 31 18:06:02 2010 +0200

    Remove the internal copy of gtkinfobar and use GtkInfoBar directly

 configure.ac                      |    1 -
 cut-n-paste/Makefile.am           |    2 +-
 cut-n-paste/evinfobar/Makefile.am |   11 -
 cut-n-paste/evinfobar/evinfobar.c | 1245 -------------------------------------
 cut-n-paste/evinfobar/evinfobar.h |  115 ----
 shell/Makefile.am                 |    2 -
 shell/ev-message-area.c           |    8 +-
 shell/ev-message-area.h           |    6 +-
 8 files changed, 6 insertions(+), 1384 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 472aa99..01eef2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,7 +761,6 @@ backend/pixbuf/Makefile
 backend/ps/Makefile
 backend/tiff/Makefile
 cut-n-paste/Makefile
-cut-n-paste/evinfobar/Makefile
 cut-n-paste/gimpcellrenderertoggle/Makefile
 cut-n-paste/smclient/Makefile
 cut-n-paste/toolbar-editor/Makefile
diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am
index c0cf0cc..a39d781 100644
--- a/cut-n-paste/Makefile.am
+++ b/cut-n-paste/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = zoom-control toolbar-editor totem-screensaver evinfobar smclient gimpcellrenderertoggle
+SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient gimpcellrenderertoggle
 
 -include $(top_srcdir)/git.mk
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 16f3034..b2bc86d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES=							\
 	-I$(top_srcdir)/cut-n-paste/zoom-control/		\
 	-I$(top_srcdir)/cut-n-paste/toolbar-editor/		\
 	-I$(top_srcdir)/cut-n-paste/totem-screensaver/		\
-	-I$(top_srcdir)/cut-n-paste/evinfobar/			\
 	-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/	\
 	-I$(top_srcdir)/cut-n-paste/smclient/			\
 	-I$(top_srcdir)/libdocument				\
@@ -102,7 +101,6 @@ evince_LDADD=										\
 	$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la				\
 	$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la			\
 	$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la		\
-	$(top_builddir)/cut-n-paste/evinfobar/libevinfobar.la				\
 	$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
 	$(top_builddir)/properties/libevproperties.la					\
diff --git a/shell/ev-message-area.c b/shell/ev-message-area.c
index 4d33898..a182303 100644
--- a/shell/ev-message-area.c
+++ b/shell/ev-message-area.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include "ev-message-area.h"
 
 #define EV_MESSAGE_AREA_GET_PRIVATE(obj) \
@@ -55,7 +53,7 @@ static void ev_message_area_get_property (GObject      *object,
 					  GValue       *value,
 					  GParamSpec   *pspec);
 
-G_DEFINE_TYPE (EvMessageArea, ev_message_area, EV_TYPE_INFO_BAR)
+G_DEFINE_TYPE (EvMessageArea, ev_message_area, GTK_TYPE_INFO_BAR)
 
 static void
 ev_message_area_class_init (EvMessageAreaClass *class)
@@ -131,7 +129,7 @@ ev_message_area_init (EvMessageArea *area)
 	gtk_box_pack_start (GTK_BOX (area->priv->main_box), hbox, TRUE, TRUE, 0);
 	gtk_widget_show (hbox);
 
-	content_area = ev_info_bar_get_content_area (EV_INFO_BAR (area));
+	content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (area));
 	gtk_container_add (GTK_CONTAINER (content_area), area->priv->main_box);
 	gtk_widget_show (area->priv->main_box);
 }
@@ -242,7 +240,7 @@ _ev_message_area_add_buttons_valist (EvMessageArea *area,
 	response_id = va_arg (args, gint);
 
 	while (text != NULL) {
-		ev_info_bar_add_button (EV_INFO_BAR (area), text, response_id);
+		gtk_info_bar_add_button (GTK_INFO_BAR (area), text, response_id);
 
 		text = va_arg (args, gchar*);
 		if (text == NULL)
diff --git a/shell/ev-message-area.h b/shell/ev-message-area.h
index 74f99a8..b1c7e23 100644
--- a/shell/ev-message-area.h
+++ b/shell/ev-message-area.h
@@ -26,8 +26,6 @@
 
 #include <gtk/gtk.h>
 
-#include "evinfobar.h"
-
 G_BEGIN_DECLS
 
 #define EV_TYPE_MESSAGE_AREA                  (ev_message_area_get_type ())
@@ -42,14 +40,14 @@ typedef struct _EvMessageAreaClass   EvMessageAreaClass;
 typedef struct _EvMessageAreaPrivate EvMessageAreaPrivate;
 
 struct _EvMessageArea {
-	EvInfoBar parent_instance;
+	GtkInfoBar parent_instance;
 
 	/*< private >*/
 	EvMessageAreaPrivate *priv;
 };
 
 struct _EvMessageAreaClass {
-	EvInfoBarClass parent_class;
+	GtkInfoBarClass parent_class;
 };
 
 GType      ev_message_area_get_type             (void) G_GNUC_CONST;