[gimp/gimp-attributes-wip: 29/328] repairs after merge

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 910c385f49a49abe1f6956cbca2feb992d6db3b5
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Fri May 27 18:28:53 2016 +0200

    repairs after merge

 app/core/gimpimage-merge.c     |    2 +-
 app/core/gimpimageundo.c       |    1 -
 plug-ins/file-tiff/file-tiff.c |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 3b396e0..f51f54a 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -44,7 +44,7 @@
 #include "gimpimage-undo.h"
 #include "gimpitemstack.h"
 #include "gimpitem-metadata.h"
-#include "gimplayer-floating-sel.h"
+#include "gimplayer-floating-selection.h"
 #include "gimplayer-new.h"
 #include "gimplayermask.h"
 #include "gimpmarshal.h"
diff --git a/app/core/gimpimageundo.c b/app/core/gimpimageundo.c
index 359c416..d00dc67 100644
--- a/app/core/gimpimageundo.c
+++ b/app/core/gimpimageundo.c
@@ -483,7 +483,6 @@ gimp_image_undo_pop (GimpUndo            *undo,
       }
       break;
 
-    case GIMP_UNDO_IMAGE_METADATA:
     case GIMP_UNDO_IMAGE_ATTRIBUTES:
       {
         GimpAttributes *attributes;
diff --git a/plug-ins/file-tiff/file-tiff.c b/plug-ins/file-tiff/file-tiff.c
index 6b9405c..473318a 100644
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@ -271,7 +271,7 @@ run (const gchar      *name,
                   gimp_set_data (LOAD_PROC,
                                  &pages.target, sizeof (pages.target));
 
-                  image = load_image (param[1].data.d_string, &layer_ID, tif, &pages,
+                  image = load_image (file, &layer_ID, tif, &pages,
                                       &resolution_loaded,
                                       &error);
 
@@ -474,7 +474,7 @@ run (const gchar      *name,
                    */
                   gimp_attributes_remove_attribute (attributes, "Exif.Image.0x0118");
                   gimp_attributes_remove_attribute (attributes, "Exif.Image.0x0119");
-                  gexiv2_metadata_clear_tag (metadata, "Exif.Image.PageNumber");
+                  gimp_attributes_remove_attribute (attributes, "Exif.Image.PageNumber");
 
                   gimp_attributes_set_bits_per_sample (attributes, saved_bpp);