[meld] Use Matthijs van de Water's picture for "Mark as resolved" VC action

[Vincent Legoll <vincele src gnome org>]

commit a3509f72ffadc5369a444448f486f81429a312b2
Author: Vincent Legoll <vincent legoll gmail com>
Date:   Fri May 1 11:02:43 2009 +0200

    Use Matthijs van de Water's picture for "Mark as resolved" VC action
---
 glade2/pixmaps/vc-resolve-24.png |  Bin 0 -> 736 bytes
 vcview.py                        |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/glade2/pixmaps/vc-resolve-24.png b/glade2/pixmaps/vc-resolve-24.png
new file mode 100644
index 0000000..287c9f4
Binary files /dev/null and b/glade2/pixmaps/vc-resolve-24.png differ
diff --git a/vcview.py b/vcview.py
index ddedd97..3f63928 100644
--- a/vcview.py
+++ b/vcview.py
@@ -129,7 +129,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
             ("VcAdd",           "vc-add-24",                _("_Add"),          None, _("Add to VC"), self.on_button_add_clicked), # FIXME: popup used to use gtk.STOCK_ADD
             ("VcAddBinary",     gtk.STOCK_ADD,              _("Add _Binary"),   None, _("Add binary to VC"), self.on_button_add_binary_clicked), # FIXME: stock is inconsistent with other VC actions
             ("VcRemove",        "vc-remove-24",             _("_Remove"),       None, _("Remove from VC"), self.on_button_remove_clicked), # FIXME: popup used to use gtk.STOCK_REMOVE
-            ("VcResolved",      gtk.STOCK_CLEAR,            _("_Resolved"),     None, _("Mark as resolved for VC"), self.on_button_resolved_clicked),
+            ("VcResolved",      "vc-resolve-24",            _("_Resolved"),     None, _("Mark as resolved for VC"), self.on_button_resolved_clicked),
             ("VcRevert",        gtk.STOCK_REVERT_TO_SAVED,  None,               None, _("Revert to original"), self.on_button_revert_clicked),
             ("VcDeleteLocally", gtk.STOCK_DELETE,           None,               None, _("Delete locally"), self.on_button_delete_clicked), # FIXME: popup label was "_Remove locally"
         )