[gnome-text-editor] infobar: namespace discard widgetry

[Christian Hergert <chergert src gnome org>]

commit 495b22bf80cf17854c0f3b0698590224ee412418
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jan 10 15:36:37 2022 -0800

    infobar: namespace discard widgetry

 src/editor-info-bar.c  | 16 ++++++++--------
 src/editor-info-bar.ui |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/editor-info-bar.c b/src/editor-info-bar.c
index 9a17161..81551a2 100644
--- a/src/editor-info-bar.c
+++ b/src/editor-info-bar.c
@@ -34,7 +34,7 @@ struct _EditorInfoBar
   GtkBox         *box;
 
   /* Discard widgetry */
-  GtkInfoBar     *infobar;
+  GtkInfoBar     *discard_infobar;
   GtkButton      *close;
   GtkButton      *discard;
   GtkButton      *save;
@@ -61,7 +61,7 @@ editor_info_bar_update (EditorInfoBar *self)
   /* Ignore things if we're busy to avoid flapping */
   if (editor_document_get_busy (self->document))
     {
-      gtk_info_bar_set_revealed (self->infobar, FALSE);
+      gtk_info_bar_set_revealed (self->discard_infobar, FALSE);
       return;
     }
 
@@ -74,7 +74,7 @@ editor_info_bar_update (EditorInfoBar *self)
       gtk_label_set_label (self->subtitle, _("The file has been changed by another program."));
       gtk_widget_show (GTK_WIDGET (self->discard));
       gtk_widget_hide (GTK_WIDGET (self->save));
-      gtk_info_bar_set_revealed (self->infobar, TRUE);
+      gtk_info_bar_set_revealed (self->discard_infobar, TRUE);
     }
   else if (_editor_document_get_was_restored (self->document))
     {
@@ -99,11 +99,11 @@ editor_info_bar_update (EditorInfoBar *self)
           gtk_widget_show (GTK_WIDGET (self->save));
         }
 
-      gtk_info_bar_set_revealed (self->infobar, TRUE);
+      gtk_info_bar_set_revealed (self->discard_infobar, TRUE);
     }
   else
     {
-      gtk_info_bar_set_revealed (self->infobar, FALSE);
+      gtk_info_bar_set_revealed (self->discard_infobar, FALSE);
     }
 }
 
@@ -127,7 +127,7 @@ editor_info_bar_close (GtkWidget   *widget,
 
   g_assert (EDITOR_IS_INFO_BAR (self));
 
-  gtk_info_bar_set_revealed (self->infobar, FALSE);
+  gtk_info_bar_set_revealed (self->discard_infobar, FALSE);
 }
 
 static void
@@ -225,7 +225,7 @@ editor_info_bar_class_init (EditorInfoBarClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/TextEditor/ui/editor-info-bar.ui");
   gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, box);
   gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, discard);
-  gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, infobar);
+  gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, discard_infobar);
   gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, save);
   gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, subtitle);
   gtk_widget_class_bind_template_child (widget_class, EditorInfoBar, title);
@@ -237,7 +237,7 @@ editor_info_bar_init (EditorInfoBar *self)
 {
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  g_signal_connect_object (self->infobar,
+  g_signal_connect_object (self->discard_infobar,
                            "response",
                            G_CALLBACK (on_response_cb),
                            self,
diff --git a/src/editor-info-bar.ui b/src/editor-info-bar.ui
index fbce818..bd54c93 100644
--- a/src/editor-info-bar.ui
+++ b/src/editor-info-bar.ui
@@ -5,7 +5,7 @@
       <object class="GtkBox" id="box">
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkInfoBar" id="infobar">
+          <object class="GtkInfoBar" id="discard_infobar">
             <property name="message-type">warning</property>
             <property name="show-close-button">True</property>
             <property name="revealed">False</property>