eog r4895 - in trunk: . data src

[csaavedra svn gnome org]

Author: csaavedra
Date: Fri Dec  5 16:27:20 2008
New Revision: 4895
URL: http://svn.gnome.org/viewvc/eog?rev=4895&view=rev

Log:
2008-12-05  Claudio Saavedra  <csaavedra igalia com>

	* data/eog-toolbar.xml: Add a "Trash" item.
	* src/eog-window.c: (set_action_properties): Add the action for the new
	"Trash" item. Fixes bug #555480 (Robin Sonefors)



Modified:
   trunk/ChangeLog
   trunk/data/eog-toolbar.xml
   trunk/src/eog-window.c

Modified: trunk/data/eog-toolbar.xml
==============================================================================
--- trunk/data/eog-toolbar.xml	(original)
+++ trunk/data/eog-toolbar.xml	Fri Dec  5 16:27:20 2008
@@ -17,6 +17,7 @@
     <toolitem name="GoLast"/>
     <toolitem name="GoPrevious"/>
     <toolitem name="GoNext"/>
+    <toolitem name="EditMoveToTrash"/>
 </available>
 <toolbar name="Toolbar">
     <toolitem name="GoPrevious"/>

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Fri Dec  5 16:27:20 2008
@@ -3577,6 +3577,9 @@
 
         action = gtk_action_group_get_action (window_group, "ViewImageCollection");
         g_object_set (action, "short_label", _("Collection"), NULL);
+
+        action = gtk_action_group_get_action (image_group, "EditMoveToTrash");
+        g_object_set (action, "short_label", C_("action (to trash)", "Trash"), NULL);
 }
 
 static gint