[gimp/gimp-attributes-wip: 37/37] merge corrections

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 3ab7e955bb10c3f2d40549e58a084f38db07bf90
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Fri Nov 14 21:14:53 2014 +0100

    merge corrections

 app/core/gimpitemundo.c        |    3 +-
 app/pdb/internal-procs.c       |    2 +-
 plug-ins/common/Makefile.am    |   22 +--
 plug-ins/common/gimprc.common  |    1 -
 plug-ins/common/metadata.c     |  382 ----------------------------------------
 plug-ins/common/plugin-defs.pl |    3 +-
 6 files changed, 7 insertions(+), 406 deletions(-)
---
diff --git a/app/core/gimpitemundo.c b/app/core/gimpitemundo.c
index aceb6c7..655fa07 100644
--- a/app/core/gimpitemundo.c
+++ b/app/core/gimpitemundo.c
@@ -187,7 +187,8 @@ gimp_item_undo_pop     (GimpUndo            *undo,
       break;
 
     default:
-      g_assert_not_reached ();
+//      g_assert_not_reached ();
+      break;
 
     }
 }
diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c
index 97498a4..bb09b21 100644
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@ -28,7 +28,7 @@
 #include "internal-procs.h"
 
 
-/* 737 procedures registered total */
+/* 739 procedures registered total */
 
 void
 internal_procs_init (GimpPDB *pdb)
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 5b89c5d..9103127 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -47,7 +47,7 @@ libexec_PROGRAMS = \
        align-layers \
        animation-optimize \
        animation-play \
-       attributes \
+       attributes      \
        blinds \
        blur \
        blur-gauss-selective \
@@ -121,8 +121,7 @@ libexec_PROGRAMS = \
        guillotine \
        hot \
        illusion \
-       iptc \
-       iwarp \
+       iptc    \
        jigsaw \
        lcms \
        lens-flare \
@@ -1569,23 +1568,6 @@ iptc_LDADD = \
        $(INTLLIBS)             \
        $(iptc_RC)
 
-iwarp_SOURCES = \
-       iwarp.c
-
-iwarp_LDADD = \
-       $(libgimpui)            \
-       $(libgimpwidgets)       \
-       $(libgimpmodule)        \
-       $(libgimp)              \
-       $(libgimpmath)          \
-       $(libgimpconfig)        \
-       $(libgimpcolor)         \
-       $(libgimpbase)          \
-       $(GTK_LIBS)             \
-       $(RT_LIBS)              \
-       $(INTLLIBS)             \
-       $(iwarp_RC)
-
 jigsaw_SOURCES = \
        jigsaw.c
 
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index 9f53b96..8253c3e 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -76,7 +76,6 @@ guillotine_RC = guillotine.rc.o
 hot_RC = hot.rc.o
 illusion_RC = illusion.rc.o
 iptc_RC = iptc.rc.o
-iwarp_RC = iwarp.rc.o
 jigsaw_RC = jigsaw.rc.o
 lcms_RC = lcms.rc.o
 lens_flare_RC = lens-flare.rc.o
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 05857aa..7934a5a 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -2,6 +2,7 @@
     'align-layers' => { ui => 1 },
     'animation-optimize' => {},
     'animation-play' => { ui => 1, gegl => 1 },
+    'attributes' => { ui => 1, gegl => 1 },
     'blinds' => { ui => 1 },
     'blur' => {},
     'blur-gauss-selective' => { ui => 1, cflags => 'MMX_EXTRA_CFLAGS' },
@@ -75,12 +76,12 @@
     'guillotine' => {},
     'hot' => { ui => 1 },
     'illusion' => { ui => 1 },
+    'iptc' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
     'jigsaw' => { ui => 1 },
     'lcms' => { ui => 1, gegl => 1, libs => 'LCMS_LIBS', cflags => 'LCMS_CFLAGS' },
     'lens-flare' => { ui => 1 },
     'mail' => { ui => 1, optional => 1 },
     'max-rgb' => { ui => 1 },
-    'metadata' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
     'newsprint' => { ui => 1 },
     'nl-filter' => { ui => 1 },
     'noise-solid' => { ui => 1 },