diff options
| -rw-r--r-- | data/eom-ui.xml | 3 | ||||
| -rw-r--r-- | src/eom-window.c | 38 | 
2 files changed, 2 insertions, 39 deletions
| diff --git a/data/eom-ui.xml b/data/eom-ui.xml index 59056e6..dbc738d 100644 --- a/data/eom-ui.xml +++ b/data/eom-ui.xml @@ -23,7 +23,6 @@        <menuitem action="EditUndo"/>        <separator/>        <menuitem action="EditCopyImage"/> -      <menuitem action="EditCopyPath"/>        <separator/>        <menuitem action="EditFlipHorizontal"/>        <menuitem action="EditFlipVertical"/> @@ -117,7 +116,6 @@      <menuitem action="ImagePrint"/>      <separator/>      <menuitem action="EditCopyImage"/> -    <menuitem action="EditCopyPath">      <separator/>      <menuitem action="EditMoveToTrash"/>      <separator/> @@ -136,7 +134,6 @@      <menuitem action="ImagePrint"/>      <separator/>      <menuitem action="EditCopyImage"/> -    <menuitem action="EditCopyPath">      <separator/>      <menuitem action="EditMoveToTrash"/>      <separator/> diff --git a/src/eom-window.c b/src/eom-window.c index 8be70e4..7e8008f 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -3513,37 +3513,6 @@ move_to_trash_real (EomImage *image, GError **error)  }  static void -eom_window_cmd_copy_path (GtkAction *action, gpointer user_data) -{ -	EomWindow *window; -	EomWindowPrivate *priv; -	EomImage *image; -	GFile *file; -	char *filename = NULL; -	GtkClipboard *clipboard; - -	g_return_if_fail (EOM_IS_WINDOW (user_data)); - -	window = EOM_WINDOW (user_data); -	priv = window->priv; - -	image = eom_thumb_view_get_first_selected_image (EOM_THUMB_VIEW (priv->thumbview)); - -	g_return_if_fail (EOM_IS_IMAGE (image)); - -	file = eom_image_get_file (image); - -	filename = g_file_get_path (file); - -	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); -	gtk_clipboard_set_text (clipboard, filename, -1); - -	g_object_unref (file); -	g_free (filename); - -} - -static void  eom_window_cmd_copy_image (GtkAction *action, gpointer user_data)  {  	GtkClipboard *clipboard; @@ -3952,11 +3921,8 @@ static const GtkActionEntry action_entries_image[] = {  	{ "EditMoveToTrash", "user-trash", N_("Move to _Trash"), NULL,  	  N_("Move the selected image to the trash folder"),  	  G_CALLBACK (eom_window_cmd_move_to_trash) }, -	{ "EditCopyPath", NULL, N_("Copy _Path"), NULL, -	  N_("Copy the image file path to the clipboard"), -	  G_CALLBACK (eom_window_cmd_copy_path) }, -	{ "EditCopyImage", NULL, N_("Copy _Image"), NULL, -	  N_("Copy the image to the clipboard"), +	{ "EditCopyImage", "edit-copy", N_("_Copy"), "<control>C", +	  N_("Copy the selected image to the clipboard"),  	  G_CALLBACK (eom_window_cmd_copy_image) },  	{ "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>plus",  	  N_("Enlarge the image"), | 
