From 80b6ce93650b470fab75f1b9e4f3147ecf2a3602 Mon Sep 17 00:00:00 2001
From: Bert Burgemeister <trebbu@googlemail.com>
Date: Mon, 26 Jan 2015 11:35:30 +0100
Subject: [PATCH] Remove explicit support for GtkInfoBar

- There is too much volatility between Gtk versions.
- It can be used anyway (use :set_visible).
---
 NEWS             |  2 +-
 pipeglade.1      | 19 ---------------
 pipeglade.c      |  4 +---
 pipeglade.ui     | 71 --------------------------------------------------------
 pipegladetest.sh |  3 ---
 5 files changed, 2 insertions(+), 97 deletions(-)

diff --git a/NEWS b/NEWS
index bd82ae4..dd653e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 (unreleased)
 ------------------
-  * Add support for GtkExpander, GtkFrame, GtkInfoBar, GtkNotebook,
+  * Add support for GtkExpander, GtkFrame, GtkNotebook,
   and GtkSwitch.
   * Add support for changing of GUI fonts and colors.
   * Rewrite parts of manual page.
diff --git a/pipeglade.1 b/pipeglade.1
index a621283..4726702 100644
--- a/pipeglade.1
+++ b/pipeglade.1
@@ -875,25 +875,6 @@ replaces the image with one of the standard icons.
 replaces the image by the one found at
 .Fa path Ns .
 .El
-.Ss GtkInfoBar
-.Bl -tag -width "signals/callbacks"
-.It signals/callbacks
-Connect
-.Ic response
-to one of
-.Ic cb_0 , cb_1 , cb_2 ,
-or
-.Ic cb_3 .
-.It feedback
-.Qo
-.Fa name Ns
-.Ic \&: Ns
-.Fa section
-.Ic clicked
-.Qc
-.It commands
-none
-.El
 .Ss GtkLabel
 .Bl -tag -width "signals/callbacks"
 .It signals/callbacks
diff --git a/pipeglade.c b/pipeglade.c
index 79f0d8d..e4efc4b 100644
--- a/pipeglade.c
+++ b/pipeglade.c
@@ -310,9 +310,7 @@ do_callback(GtkBuildable *obj, gpointer user_data, const char *section)
                 gtk_calendar_get_date(GTK_CALENDAR(obj), &year, &month, &day);
                 snprintf(str, BUFLEN, "%04u-%02u-%02u", year, ++month, day);
                 send_msg(obj, section, str, NULL);
-        } else if (GTK_IS_INFO_BAR(obj))
-                send_msg(obj, section, "clicked", NULL);
-        else if (GTK_IS_TREE_VIEW_COLUMN(obj))
+        } else if (GTK_IS_TREE_VIEW_COLUMN(obj))
                 send_msg(obj, section, "clicked", NULL);
         else if (GTK_IS_TREE_SELECTION(obj)) {
                 tree_view = gtk_tree_selection_get_tree_view(GTK_TREE_SELECTION(obj));
diff --git a/pipeglade.ui b/pipeglade.ui
index e9d0242..7bc4a96 100644
--- a/pipeglade.ui
+++ b/pipeglade.ui
@@ -569,77 +569,6 @@ et dolore magna aliqua.
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkInfoBar" id="infobar1">
-                <property name="app_paintable">True</property>
-                <property name="can_focus">False</property>
-                <property name="show_close_button">True</property>
-                <signal name="response" handler="cb_1" swapped="no"/>
-                <child internal-child="action_area">
-                  <object class="GtkButtonBox" id="infobar-action_area">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">end</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child internal-child="content_area">
-                  <object class="GtkBox" id="infobar-content_area">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">16</property>
-                    <child>
-                      <object class="GtkButton" id="button3">
-                        <property name="label" translatable="yes">button</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <signal name="clicked" handler="cb_2" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/pipegladetest.sh b/pipegladetest.sh
index bb1c39e..1d06376 100755
--- a/pipegladetest.sh
+++ b/pipegladetest.sh
@@ -308,9 +308,6 @@ check 12 "statusbar1:push Click the highest line visible in the scrolled area (s
 
 check 1 "statusbar1:push Click the header of column \"col3\"" "treeviewcolumn3:3 clicked"
 
-check 1 "statusbar1:push Close the infobar\n infobar1:set_visible 1" "infobar1:1 clicked"
-check 0 "infobar1:set_visible 0"
-
 check 0 "notebook1:set_current_page 1"
 check 1 "statusbar1:push Press \"send_text\"" "send_text:text some textnetcn"
 check 1 "statusbar1:push Press \"send_text\" again\n textview1:place_cursor 5\n textview1:insert_at_cursor MORE " "send_text:text some MORE textnetcn"
-- 
2.11.4.GIT