[gedit] Remove custom small button class

[Paolo Borelli <pborelli src gnome org>]

commit 44d9bd95c0f135f61d2642411257908b7ab8d72e
Author: Paolo Borelli <pborelli gnome org>
Date:   Wed Dec 30 18:47:50 2015 +0100

    Remove custom small button class
    
    We should now simply add the "small-button" css class and let adwaita do
    its magic

 gedit/Makefile.am                     |    2 -
 gedit/gedit-documents-panel.c         |   15 ++++-
 gedit/gedit-small-button.c            |  123 ---------------------------------
 gedit/gedit-small-button.h            |   86 -----------------------
 gedit/gedit-window.c                  |    1 -
 gedit/resources/ui/gedit-tab-label.ui |   13 +++-
 gedit/resources/ui/gedit-window.ui    |   12 +++-
 7 files changed, 36 insertions(+), 216 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 42c1cfc..1676d96 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -127,7 +127,6 @@ gedit_NOINST_H_FILES =                                      \
        gedit/gedit-recent.h                            \
        gedit/gedit-replace-dialog.h                    \
        gedit/gedit-settings.h                          \
-       gedit/gedit-small-button.h                      \
        gedit/gedit-status-menu-button.h                \
        gedit/gedit-tab-label.h                         \
        gedit/gedit-tab-private.h                       \
@@ -202,7 +201,6 @@ gedit_libgedit_c_files =                            \
        gedit/gedit-replace-dialog.c                    \
        gedit/gedit-resources.c                         \
        gedit/gedit-settings.c                          \
-       gedit/gedit-small-button.c                      \
        gedit/gedit-statusbar.c                         \
        gedit/gedit-status-menu-button.c                \
        gedit/gedit-tab.c                               \
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index 935dcb5..ce59835 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -31,7 +31,6 @@
 #include "gedit-multi-notebook.h"
 #include "gedit-notebook.h"
 #include "gedit-notebook-popup-menu.h"
-#include "gedit-small-button.h"
 #include "gedit-tab.h"
 #include "gedit-tab-private.h"
 #include "gedit-utils.h"
@@ -1582,6 +1581,8 @@ row_create (GtkWidget *row)
 {
        GeditDocumentsGenericRow *generic_row = (GeditDocumentsGenericRow *)row;
        GtkWidget *event_box;
+       GtkWidget *image;
+       GIcon *icon;
 
        gedit_debug (DEBUG_PANEL);
 
@@ -1599,7 +1600,17 @@ row_create (GtkWidget *row)
        gtk_widget_set_halign (generic_row->status_label, GTK_ALIGN_END);
        gtk_widget_set_valign (generic_row->status_label, GTK_ALIGN_CENTER);
 
-       generic_row->close_button = gedit_close_button_new ();
+       generic_row->close_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
+                                                             "relief", GTK_RELIEF_NONE,
+                                                             "focus-on-click", FALSE,
+                                                             NULL));
+
+       icon = g_themed_icon_new_with_default_fallbacks ("window-close-symbolic");
+       image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+       gtk_widget_show (image);
+       g_object_unref (icon);
+
+       gtk_container_add (GTK_CONTAINER (generic_row->close_button), image);
 
        gtk_box_pack_start (GTK_BOX (generic_row->box),
                            generic_row->label, FALSE, FALSE, 0);
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 7597863..8c83424 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -56,7 +56,6 @@
 #include "gedit-dirs.h"
 #include "gedit-status-menu-button.h"
 #include "gedit-settings.h"
-#include "gedit-small-button.h"
 #include "gedit-menu-stack-switcher.h"
 #include "gedit-highlight-mode-selector.h"
 #include "gedit-open-document-selector.h"
diff --git a/gedit/resources/ui/gedit-tab-label.ui b/gedit/resources/ui/gedit-tab-label.ui
index 2ccf0a8..e274cca 100644
--- a/gedit/resources/ui/gedit-tab-label.ui
+++ b/gedit/resources/ui/gedit-tab-label.ui
@@ -27,13 +27,24 @@
       </packing>
     </child>
     <child>
-      <object class="GeditCloseButton" id="close_button">
+      <object class="GtkButton" id="close_button">
         <property name="visible">True</property>
+        <property name="relief">none</property>
+        <property name="focus-on-click">False</property>
         <property name="tooltip_text" translatable="yes">Close Document</property>
+        <property name="image">close_button_image</property>
+        <style>
+          <class name="small-button"/>
+          <class name="flat"/>
+        </style>
       </object>
       <packing>
         <property name="pack_type">end</property>
       </packing>
     </child>
   </template>
+  <object class="GtkImage" id="close_button_image">
+    <property name="visible">True</property>
+    <property name="icon_name">window-close-symbolic</property>
+  </object>
 </interface>
diff --git a/gedit/resources/ui/gedit-window.ui b/gedit/resources/ui/gedit-window.ui
index 3c91873..2ca450a 100644
--- a/gedit/resources/ui/gedit-window.ui
+++ b/gedit/resources/ui/gedit-window.ui
@@ -247,11 +247,17 @@
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GeditCloseButton" id="bottom_panel_close_button">
+                                  <object class="GtkButton" id="bottom_panel_close_button">
                                     <property name="visible">True</property>
                                     <property name="relief">none</property>
+                                    <property name="focus-on-click">False</property>
                                     <property name="tooltip-text" translatable="yes">Hide panel</property>
                                     <property name="action_name">win.bottom-panel</property>
+                                    <property name="image">close_button_image</property>
+                                    <style>
+                                      <class name="small-button"/>
+                                      <class name="flat"/>
+                                    </style>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -492,6 +498,10 @@
     <property name="visible">True</property>
     <property name="icon_name">view-restore-symbolic</property>
   </object>
+  <object class="GtkImage" id="close_button_image">
+    <property name="visible">True</property>
+    <property name="icon_name">window-close-symbolic</property>
+  </object>
   <object class="GtkSizeGroup">
     <property name="mode">horizontal</property>
     <widgets>