[gnome-photos] Drop GdHeaderSimpleButton

[Debarshi Ray <debarshir src gnome org>]

commit 42dabb59cb9974d3ba0a73e407b68dfd67c850cb
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Jul 28 10:36:17 2014 +0200

    Drop GdHeaderSimpleButton
    
    A GdHeaderSimpleButton is a GtkButton that either has a 16px icon,
    tooltop text and the image-button style class; or a label and the
    text-button style class.
    
    Fixes: https://bugzilla.gnome.org/733850

 src/photos-main-toolbar.c      |   18 +++++++-----------
 src/photos-selection-toolbar.c |   17 ++++++-----------
 2 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index a19e70c..9a99eb2 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -147,9 +147,8 @@ photos_main_toolbar_add_back_button (PhotosMainToolbar *self)
   PhotosMainToolbarPrivate *priv = self->priv;
   GtkWidget *back_button;
 
-  back_button = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (back_button), _("Back"));
-  gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (back_button), PHOTOS_ICON_GO_PREVIOUS_SYMBOLIC);
+  back_button = gtk_button_new_from_icon_name (PHOTOS_ICON_GO_PREVIOUS_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_tooltip_text (back_button, _("Back"));
   gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->toolbar), back_button);
 
   return back_button;
@@ -251,11 +250,10 @@ photos_main_toolbar_add_remote_display_button (PhotosMainToolbar *self)
   name = photos_dlna_renderer_get_friendly_name (renderer);
   text = g_markup_printf_escaped ("Displaying on <b>%s</b>", name);
 
-  priv->remote_display_button = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->remote_display_button), text);
-  gd_header_button_set_use_markup (GD_HEADER_BUTTON (priv->remote_display_button), TRUE);
+  priv->remote_display_button = gtk_button_new_with_label (text);
   label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->remote_display_button)));
   gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
+  gtk_label_set_use_markup (label, TRUE);
   gtk_widget_set_margin_end (priv->remote_display_button, 12);
   gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->toolbar), priv->remote_display_button);
   gtk_widget_show_all (priv->remote_display_button);
@@ -287,9 +285,8 @@ photos_main_toolbar_add_selection_button (PhotosMainToolbar *self)
   PhotosMainToolbarPrivate *priv = self->priv;
   GtkWidget *selection_button;
 
-  selection_button = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (selection_button), _("Select Items"));
-  gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (selection_button), 
PHOTOS_ICON_OBJECT_SELECT_SYMBOLIC);
+  selection_button = gtk_button_new_from_icon_name (PHOTOS_ICON_OBJECT_SELECT_SYMBOLIC, 
GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_tooltip_text (selection_button, _("Select Items"));
   gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->toolbar), selection_button);
   g_signal_connect (selection_button, "clicked", G_CALLBACK (photos_main_toolbar_select_button_clicked), 
self);
 
@@ -568,8 +565,7 @@ photos_main_toolbar_populate_for_selection_mode (PhotosMainToolbar *self)
 
   photos_header_bar_set_mode (PHOTOS_HEADER_BAR (priv->toolbar), PHOTOS_HEADER_BAR_MODE_SELECTION);
 
-  selection_button = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (selection_button), _("Cancel"));
+  selection_button = gtk_button_new_with_label (_("Cancel"));
   gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->toolbar), selection_button);
   g_signal_connect (selection_button, "clicked", G_CALLBACK (photos_main_toolbar_done_button_clicked), self);
 
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 58d0050..e21ee3d 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -283,7 +283,7 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
     /* Translators: this is the Open action in a context menu */
     open_label = g_strdup (_("Open"));
 
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->toolbar_open), open_label);
+  gtk_button_set_label (GTK_BUTTON (priv->toolbar_open), open_label);
   g_free (open_label);
   g_list_free_full (apps, g_free);
 
@@ -452,40 +452,35 @@ photos_selection_toolbar_init (PhotosSelectionToolbar *self)
                     G_CALLBACK (photos_selection_toolbar_favorite_clicked),
                     self);
 
-  priv->toolbar_open = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->toolbar_open), _("Open"));
+  priv->toolbar_open = gtk_button_new_with_label (_("Open"));
   gtk_action_bar_pack_start (GTK_ACTION_BAR (toolbar), priv->toolbar_open);
   g_signal_connect (priv->toolbar_open,
                     "clicked",
                     G_CALLBACK (photos_selection_toolbar_open_clicked),
                     self);
 
-  priv->toolbar_print = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->toolbar_print), _("Print"));
+  priv->toolbar_print = gtk_button_new_with_label (_("Print"));
   gtk_action_bar_pack_start (GTK_ACTION_BAR (toolbar), priv->toolbar_print);
   g_signal_connect (priv->toolbar_print,
                     "clicked",
                     G_CALLBACK (photos_selection_toolbar_print_clicked),
                     self);
 
-  priv->toolbar_trash = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->toolbar_trash), _("Delete"));
+  priv->toolbar_trash = gtk_button_new_with_label (_("Delete"));
   gtk_action_bar_pack_start (GTK_ACTION_BAR (toolbar), priv->toolbar_trash);
   g_signal_connect (priv->toolbar_trash,
                     "clicked",
                     G_CALLBACK (photos_selection_toolbar_trash_clicked),
                     self);
 
-  priv->toolbar_properties = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->toolbar_properties), _("Properties"));
+  priv->toolbar_properties = gtk_button_new_with_label (_("Properties"));
   gtk_action_bar_pack_end (GTK_ACTION_BAR (toolbar), priv->toolbar_properties);
   g_signal_connect (priv->toolbar_properties,
                     "clicked",
                     G_CALLBACK (photos_selection_toolbar_properties_clicked),
                     self);
 
-  priv->toolbar_collection = gd_header_simple_button_new ();
-  gd_header_button_set_label (GD_HEADER_BUTTON (priv->toolbar_collection), _("Add to Album"));
+  priv->toolbar_collection = gtk_button_new_with_label (_("Add to Album"));
   gtk_action_bar_pack_end (GTK_ACTION_BAR (toolbar), priv->toolbar_collection);
   g_signal_connect (priv->toolbar_collection,
                     "clicked",