[gedit] Use close button on info bars

[Ken VanDine <kvandine src gnome org>]

commit a2b50882da92ddc14f38c490f1bc99ecf9718718
Author: William Jon McCann <william jon mccann gmail com>
Date:   Mon Jul 15 17:31:37 2013 -0400

    Use close button on info bars
    
    Instead of Cancel buttons.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704296

 gedit/gedit-io-error-info-bar.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gedit/gedit-io-error-info-bar.c b/gedit/gedit-io-error-info-bar.c
index 0b67e1c..e68a622 100644
--- a/gedit/gedit-io-error-info-bar.c
+++ b/gedit/gedit-io-error-info-bar.c
@@ -127,11 +127,10 @@ create_io_loading_error_info_bar (const gchar *primary_text,
 {
        GtkWidget *info_bar;
 
-       info_bar = gtk_info_bar_new_with_buttons (_("_Cancel"),
-                                                 GTK_RESPONSE_CANCEL,
-                                                 NULL);
+       info_bar = gtk_info_bar_new ();
        gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar),
                                       GTK_MESSAGE_ERROR);
+       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (info_bar), TRUE);
 
        set_info_bar_text (info_bar,
                           primary_text,
@@ -486,6 +485,7 @@ create_conversion_error_info_bar (const gchar *primary_text,
        GtkWidget *secondary_label;
 
        info_bar = gtk_info_bar_new ();
+       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (info_bar), TRUE);
 
        gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
                                 _("_Retry"),
@@ -507,10 +507,6 @@ create_conversion_error_info_bar (const gchar *primary_text,
                                               GTK_MESSAGE_ERROR);
        }
 
-       gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
-                                _("_Cancel"),
-                                GTK_RESPONSE_CANCEL);
-
        hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
@@ -1183,9 +1179,7 @@ gedit_externally_modified_info_bar_new (GFile    *location,
                                         GTK_RESPONSE_OK);
        }
 
-       gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
-                                _("_Ignore"),
-                                GTK_RESPONSE_CANCEL);
+       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (info_bar), TRUE);
        gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar),
                                       GTK_MESSAGE_WARNING);