From 69fd08dbf8b52e6e5b812d01e11299d151427395 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Mon, 14 Jan 2013 01:25:01 +0100
Subject: [PATCH] plug-ins: remove some more totally unused cruft from imagemap

with the nice side effect that it now compiles without further
changes on GTK+ 3.x
---
 plug-ins/imagemap/imap_circle.c    | 2 --
 plug-ins/imagemap/imap_main.c      | 6 ------
 plug-ins/imagemap/imap_object.h    | 2 --
 plug-ins/imagemap/imap_polygon.c   | 2 --
 plug-ins/imagemap/imap_rectangle.c | 2 --
 5 files changed, 14 deletions(-)

diff --git a/plug-ins/imagemap/imap_circle.c b/plug-ins/imagemap/imap_circle.c
index 9854dfd479..e040ebf6a8 100644
--- a/plug-ins/imagemap/imap_circle.c
+++ b/plug-ins/imagemap/imap_circle.c
@@ -62,8 +62,6 @@ static const gchar* circle_get_stock_icon_name(void);
 static ObjectClass_t circle_class = {
    N_("C_ircle"),
    NULL,                        /* info_dialog */
-   NULL,                        /* icon */
-   NULL,                        /* mask */
 
    circle_is_valid,
    NULL,                        /* circle_destruct */
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index d944ab418c..446cbac8fd 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -204,7 +204,6 @@ get_preferences(void)
 static void
 init_preferences(void)
 {
-   GdkColormap *colormap = gdk_drawable_get_colormap(gtk_widget_get_window (_dlg));
    ColorSelData_t *colors = &_preferences.colors;
 
    colors->normal_fg.red = 0;
@@ -233,11 +232,6 @@ init_preferences(void)
 
    preferences_load(&_preferences);
 
-   gdk_colormap_alloc_color(colormap, &colors->normal_fg, FALSE, TRUE);
-   gdk_colormap_alloc_color(colormap, &colors->normal_bg, FALSE, TRUE);
-   gdk_colormap_alloc_color(colormap, &colors->selected_fg, FALSE, TRUE);
-   gdk_colormap_alloc_color(colormap, &colors->selected_bg, FALSE, TRUE);
-
    mru_set_size(_mru, _preferences.mru_size);
    command_list_set_undo_level(_preferences.undo_levels);
 }
diff --git a/plug-ins/imagemap/imap_object.h b/plug-ins/imagemap/imap_object.h
index a33dff1619..acf17e7e4b 100644
--- a/plug-ins/imagemap/imap_object.h
+++ b/plug-ins/imagemap/imap_object.h
@@ -53,8 +53,6 @@ struct AreaInfoDialog_t;
 struct ObjectClass_t {
    const gchar          *name;
    AreaInfoDialog_t     *info_dialog;
-   GdkPixmap            *icon;
-   GdkBitmap            *mask;
 
    gboolean (*is_valid)(Object_t *obj);
    void (*destruct)(Object_t *obj);
diff --git a/plug-ins/imagemap/imap_polygon.c b/plug-ins/imagemap/imap_polygon.c
index 8f522c6912..b654488c53 100644
--- a/plug-ins/imagemap/imap_polygon.c
+++ b/plug-ins/imagemap/imap_polygon.c
@@ -72,8 +72,6 @@ static const gchar* polygon_get_stock_icon_name(void);
 static ObjectClass_t polygon_class = {
    N_("_Polygon"),
    NULL,                        /* info_dialog */
-   NULL,                        /* icon */
-   NULL,                        /* mask */
 
    polygon_is_valid,
    polygon_destruct,
diff --git a/plug-ins/imagemap/imap_rectangle.c b/plug-ins/imagemap/imap_rectangle.c
index 10b8d931e0..35e79752ac 100644
--- a/plug-ins/imagemap/imap_rectangle.c
+++ b/plug-ins/imagemap/imap_rectangle.c
@@ -67,8 +67,6 @@ static const gchar* rectangle_get_stock_icon_name(void);
 static ObjectClass_t rectangle_class = {
    N_("_Rectangle"),
    NULL,                        /* info_dialog */
-   NULL,                        /* icon */
-   NULL,                        /* mask */
 
    rectangle_is_valid,
    NULL,                        /* rectangle_destruct */