[shotwell/wip/backup: 2/3] Replace from_stock in EventsDirectoryPage

[Jens Georg <jensgeorg src gnome org>]

commit 58fbe1f9fc0e6bfdcad1a2f5750957c3dd3e6d0b
Author: Jens Georg <mail jensge org>
Date:   Sun Nov 20 16:06:14 2016 +0100

    Replace from_stock in EventsDirectoryPage
    
    Signed-off-by: Jens Georg <mail jensge org>

 src/events/EventsDirectoryPage.vala |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 2e0624f..46fabe3 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -62,11 +62,11 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         Gtk.Toolbar toolbar = get_toolbar();
         
         // merge tool
-        Gtk.ToolButton merge_button = new Gtk.ToolButton.from_stock(Resources.MERGE);
+        Gtk.ToolButton merge_button = new Gtk.ToolButton (null, Resources.MERGE_LABEL);
         merge_button.set_action_name("win.Merge");
         merge_button.is_important = true;
         merge_button.set_tooltip_text (Resources.MERGE_TOOLTIP);
-        merge_button.set_label (Resources.MERGE_LABEL);
+        merge_button.set_icon_name ("merge");
         
         toolbar.insert(merge_button, -1);
     }