Commit 5e17408c authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Re-enabled the display filters. They work exactly the same way as before

2002-03-14  Michael Natterer  <mitch@gimp.org>

	Re-enabled the display filters. They work exactly the same way
	as before except for the color_area pseudo-display. More stuff
	to come...

	* app/display/Makefile.am: build them again.

	* app/display/gimpdisplayshell-filter-dialog.[ch]
	* app/display/gimpdisplayshell-filter.[ch]: changed to the new
	namespace, work on GimpDisplayShell instead of GimpDisplay.

	* app/display/gimpdisplayshell-render.c
	* app/display/gimpdisplayshell.[ch]: changed accordingly.

	* app/gui/dialogs-constructors.c: enabled the dialog constructor.

	* app/gui/gui.c: call the init() function.

	* app/gui/menus.c: enabled the menu entry, but moved it to
	<Image>/View. Moved "Undo History..." to <Image>/Image.

	* modules/Makefile.am: build and install the modules.

	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c: made them compile with minimal
	changes.

	Unrelated:

	* app/undo_history.c: connect to the image's "disconnect", not
	"destroy" signal.

	* app/tools/gimpselectiontool.c: mask out the irrelevant parts of
	the "state" passed to the modifier_key() func, so tool_options
	button toggling works with other modifiers (e.g. num_lock)
	pressed.
parent ce569349
2002-03-14 Michael Natterer <mitch@gimp.org>
Re-enabled the display filters. They work exactly the same way
as before except for the color_area pseudo-display. More stuff
to come...
* app/display/Makefile.am: build them again.
* app/display/gimpdisplayshell-filter-dialog.[ch]
* app/display/gimpdisplayshell-filter.[ch]: changed to the new
namespace, work on GimpDisplayShell instead of GimpDisplay.
* app/display/gimpdisplayshell-render.c
* app/display/gimpdisplayshell.[ch]: changed accordingly.
* app/gui/dialogs-constructors.c: enabled the dialog constructor.
* app/gui/gui.c: call the init() function.
* app/gui/menus.c: enabled the menu entry, but moved it to
<Image>/View. Moved "Undo History..." to <Image>/Image.
* modules/Makefile.am: build and install the modules.
* modules/cdisplay_gamma.c
* modules/cdisplay_highcontrast.c: made them compile with minimal
changes.
Unrelated:
* app/undo_history.c: connect to the image's "disconnect", not
"destroy" signal.
* app/tools/gimpselectiontool.c: mask out the irrelevant parts of
the "state" passed to the modifier_key() func, so tool_options
button toggling works with other modifiers (e.g. num_lock)
pressed.
2002-03-14 Michael Natterer <mitch@gimp.org>
* app/tools/gimpcolorpickertool.c: oops, including removed files
......
......@@ -60,6 +60,10 @@
#include "widgets/gimptoolbox-color-area.h"
#include "widgets/gimpvectorslistview.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpdisplayshell-filter-dialog.h"
#include "about-dialog.h"
#include "brushes-commands.h"
#include "buffers-commands.h"
......@@ -85,10 +89,6 @@
#include "gimprc.h"
#include "undo_history.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color_ui.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpintl.h"
......@@ -202,21 +202,23 @@ dialogs_display_filters_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
#ifdef DISPLAY_FILTERS
GimpDisplay *gdisp;
gdisp = gimp_context_get_display (context);
if (! gdisp)
gdisp = color_area_gdisp;
if (gdisp)
{
GimpDisplayShell *shell;
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
if (! shell->cd_ui)
gimp_display_shell_filter_dialog_new (shell);
if (! gdisp->cd_ui)
gdisplay_color_ui_new (gdisp);
return shell->cd_ui;
}
return gdisp->cd_ui;
#else
return NULL;
#endif /* DISPLAY_FILTERS */
}
GtkWidget *
......
......@@ -34,6 +34,10 @@ libappdisplay_a_sources = @STRIP_BEGIN@ \
gimpdisplayshell-dnd.h \
gimpdisplayshell-handlers.c \
gimpdisplayshell-handlers.h \
gimpdisplayshell-filter.c \
gimpdisplayshell-filter.h \
gimpdisplayshell-filter-dialog.c \
gimpdisplayshell-filter-dialog.h \
gimpdisplayshell-layer-select.c \
gimpdisplayshell-layer-select.h \
gimpdisplayshell-marching-ants.h \
......
......@@ -59,6 +59,7 @@
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-callbacks.h"
#include "gimpdisplayshell-dnd.h"
#include "gimpdisplayshell-filter.h"
#include "gimpdisplayshell-handlers.h"
#include "gimpdisplayshell-render.h"
#include "gimpdisplayshell-selection.h"
......@@ -68,10 +69,6 @@
#include "nav_window.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpintl.h"
......@@ -236,10 +233,8 @@ gimp_display_shell_init (GimpDisplayShell *shell)
shell->nav_dialog = NULL;
shell->nav_popup = NULL;
#ifdef DISPLAY_FILTERS
shell->cd_list = NULL;
shell->cd_ui = NULL;
#endif /* DISPLAY_FILTERS */
gtk_window_set_wmclass (GTK_WINDOW (shell), "image_window", "Gimp");
gtk_window_set_resizable (GTK_WINDOW (shell), TRUE);
......@@ -311,10 +306,7 @@ gimp_display_shell_destroy (GtkObject *object)
shell->display_areas = gimp_display_area_list_free (shell->display_areas);
#ifdef DISPLAY_FILTERS
/* detach any color displays */
gdisplay_color_detach_all (gdisp);
#endif /* DISPLAY_FILTERS */
gimp_display_shell_filter_detach_all (shell);
if (shell->render_buf)
{
......
......@@ -102,10 +102,8 @@ struct _GimpDisplayShell
NavigationDialog *nav_dialog; /* image navigation dialog */
NavigationDialog *nav_popup; /* navigation popup */
#ifdef DISPLAY_FILTERS
GList *cd_list; /* color display conversion stuff */
GtkWidget *cd_ui; /* color display filter dialog */
#endif /* DISPLAY_FILTERS */
};
struct _GimpDisplayShellClass
......
......@@ -18,19 +18,23 @@
#include "config.h"
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#include "libgimpbase/gimpbsse.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "display-types.h"
#include "color_area.h"
#include "dialog_handler.h"
#include "gdisplay.h"
#include "gdisplay_color.h"
#include "gdisplay_color_ui.h"
#include "gimpimageP.h"
#include "gimpui.h"
#include "core/gimpimage.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-filter.h"
#include "gimpdisplayshell-filter-dialog.h"
#include "libgimp/gimpintl.h"
......@@ -39,9 +43,9 @@ typedef struct _ColorDisplayDialog ColorDisplayDialog;
struct _ColorDisplayDialog
{
GimpDisplay *gdisp;
GimpDisplayShell *shell;
GtkWidget *shell;
GtkWidget *dialog;
GtkWidget *src;
GtkWidget *dest;
......@@ -124,12 +128,10 @@ static void color_display_update_up_and_down(ColorDisplayDialog *cdd);
#define LIST_WIDTH 180
#define LIST_HEIGHT 180
#define UPDATE_DISPLAY(gdisp) G_STMT_START { \
if (gdisp != color_area_gdisp) \
{ \
gdisplay_expose_full (gdisp); \
gdisplay_flush (gdisp); \
} \
#define UPDATE_DISPLAY(shell) G_STMT_START \
{ \
gimp_display_shell_expose_full (shell); \
gimp_display_shell_flush (shell); \
} G_STMT_END
static void
......@@ -138,8 +140,8 @@ make_dialog (ColorDisplayDialog *cdd)
GtkWidget *hbox;
GtkWidget *scrolled_win;
GtkWidget *vbbox;
gchar *titles[2];
gint i;
gchar *titles[2];
gint i;
static ButtonInfo buttons[] =
{
......@@ -150,7 +152,7 @@ make_dialog (ColorDisplayDialog *cdd)
{ N_("Configure"), color_display_configure_callback }
};
cdd->shell = gimp_dialog_new (_("Color Display Filters"), "display_color",
cdd->dialog = gimp_dialog_new (_("Color Display Filters"), "display_color",
gimp_standard_help_func,
"dialogs/display_filters/display_filters.html",
GTK_WIN_POS_NONE,
......@@ -164,10 +166,8 @@ make_dialog (ColorDisplayDialog *cdd)
NULL);
dialog_register (cdd->shell);
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cdd->shell)->vbox), hbox,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cdd->dialog)->vbox), hbox,
TRUE, TRUE, 4);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
......@@ -236,29 +236,24 @@ static void
color_display_ok_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
GList *list;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
GList *list;
dialog_unregister(cdd->shell);
gtk_widget_destroy (GTK_WIDGET (cdd->shell));
gdisp->cd_ui = NULL;
gtk_widget_destroy (GTK_WIDGET (cdd->dialog));
shell->cd_ui = NULL;
if (cdd->modified)
{
list = cdd->old_nodes;
while (list)
for (list = cdd->old_nodes; list; list = g_list_next (list))
{
if (!g_list_find (gdisp->cd_list, list->data))
gdisplay_color_detach_destroy (gdisp, list->data);
list = list->next;
if (! g_list_find (shell->cd_list, list->data))
gimp_display_shell_filter_detach_destroy (shell, list->data);
}
g_list_free (cdd->old_nodes);
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
}
......@@ -266,38 +261,37 @@ static void
color_display_cancel_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
GList *list;
GList *next;
dialog_unregister(cdd->shell);
gtk_widget_destroy (GTK_WIDGET (cdd->shell));
gdisp->cd_ui = NULL;
gtk_widget_destroy (GTK_WIDGET (cdd->dialog));
shell->cd_ui = NULL;
if (cdd->modified)
{
list = gdisp->cd_list;
gdisp->cd_list = cdd->old_nodes;
list = shell->cd_list;
shell->cd_list = cdd->old_nodes;
while (list)
{
next = list->next;
if (!g_list_find (cdd->old_nodes, list->data))
gdisplay_color_detach_destroy (gdisp, list->data);
if (! g_list_find (cdd->old_nodes, list->data))
gimp_display_shell_filter_detach_destroy (shell, list->data);
list = next;
}
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
}
static void
color_display_update_up_and_down (ColorDisplayDialog *cdd)
{
gtk_widget_set_sensitive (cdd->buttons[BUTTON_UP], cdd->dest_row > 0);
gtk_widget_set_sensitive (cdd->buttons[BUTTON_UP], cdd->dest_row > 0);
gtk_widget_set_sensitive (cdd->buttons[BUTTON_DOWN], cdd->dest_row >= 0 &&
cdd->dest_row < GTK_CLIST (cdd->dest)->rows - 1);
}
......@@ -306,11 +300,11 @@ static void
color_display_add_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
gchar *name = NULL;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
gchar *name = NULL;
ColorDisplayNode *node;
gint row;
gint row;
if (cdd->src_row < 0)
return;
......@@ -322,22 +316,22 @@ color_display_add_callback (GtkWidget *widget,
cdd->modified = TRUE;
node = gdisplay_color_attach (gdisp, name);
node = gimp_display_shell_filter_attach (shell, name);
row = gtk_clist_append (GTK_CLIST (cdd->dest), &name);
gtk_clist_set_row_data (GTK_CLIST (cdd->dest), row, node);
color_display_update_up_and_down (cdd);
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
static void
color_display_remove_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
ColorDisplayNode *node;
if (cdd->dest_row < 0)
......@@ -349,23 +343,23 @@ color_display_remove_callback (GtkWidget *widget,
cdd->modified = TRUE;
if (g_list_find (cdd->old_nodes, node))
gdisplay_color_detach (gdisp, node);
gimp_display_shell_filter_detach (shell, node);
else
gdisplay_color_detach_destroy (gdisp, node);
gimp_display_shell_filter_detach_destroy (shell, node);
cdd->dest_row = -1;
color_display_update_up_and_down (cdd);
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
static void
color_display_up_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
ColorDisplayNode *node;
if (cdd->dest_row < 1)
......@@ -374,22 +368,22 @@ color_display_up_callback (GtkWidget *widget,
node = gtk_clist_get_row_data (GTK_CLIST (cdd->dest), cdd->dest_row);
gtk_clist_row_move (GTK_CLIST (cdd->dest), cdd->dest_row, cdd->dest_row - 1);
gdisplay_color_reorder_up (gdisp, node);
gimp_display_shell_filter_reorder_up (shell, node);
cdd->modified = TRUE;
cdd->dest_row--;
color_display_update_up_and_down (cdd);
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
static void
color_display_down_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
ColorDisplayNode *node;
if (cdd->dest_row < 0)
......@@ -401,22 +395,22 @@ color_display_down_callback (GtkWidget *widget,
node = gtk_clist_get_row_data (GTK_CLIST (cdd->dest), cdd->dest_row);
gtk_clist_row_move (GTK_CLIST (cdd->dest), cdd->dest_row, cdd->dest_row + 1);
gdisplay_color_reorder_down (gdisp, node);
gimp_display_shell_filter_reorder_down (shell, node);
cdd->modified = TRUE;
cdd->dest_row++;
color_display_update_up_and_down (cdd);
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
static void
color_display_configure_callback (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
GimpDisplay *gdisp = cdd->gdisp;
ColorDisplayDialog *cdd = data;
GimpDisplayShell *shell = cdd->shell;
ColorDisplayNode *node;
if (cdd->dest_row < 0)
......@@ -424,17 +418,18 @@ color_display_configure_callback (GtkWidget *widget,
node = gtk_clist_get_row_data (GTK_CLIST (cdd->dest), cdd->dest_row);
if (!g_list_find (cdd->conf_nodes, node))
if (! g_list_find (cdd->conf_nodes, node))
cdd->conf_nodes = g_list_append (cdd->conf_nodes, node);
gdisplay_color_configure (node, NULL, NULL, NULL, NULL);
gimp_display_shell_filter_configure (node, NULL, NULL, NULL, NULL);
cdd->modified = TRUE;
UPDATE_DISPLAY (gdisp);
UPDATE_DISPLAY (shell);
}
void
gdisplay_color_ui_new (GimpDisplay *gdisp)
gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
{
ColorDisplayDialog *cdd;
......@@ -447,16 +442,16 @@ gdisplay_color_ui_new (GimpDisplay *gdisp)
color_display_foreach (src_list_populate, cdd->src);
cdd->old_nodes = gdisp->cd_list;
dest_list_populate (gdisp->cd_list, cdd->dest);
gdisp->cd_list = g_list_copy (cdd->old_nodes);
cdd->old_nodes = shell->cd_list;
dest_list_populate (shell->cd_list, cdd->dest);
shell->cd_list = g_list_copy (cdd->old_nodes);
cdd->gdisp = gdisp;
cdd->shell = shell;
cdd->src_row = -1;
cdd->dest_row = -1;
gdisp->cd_ui = cdd->shell;
shell->cd_ui = cdd->dialog;
}
static void
......@@ -471,7 +466,7 @@ dest_list_populate (GList *node_list,
GtkWidget *dest)
{
ColorDisplayNode *node;
int row;
int row;
while (node_list)
{
......@@ -492,7 +487,9 @@ select_src (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
cdd->src_row = row;
gtk_widget_set_sensitive (cdd->buttons[BUTTON_ADD], TRUE);
}
......@@ -504,7 +501,9 @@ unselect_src (GtkWidget *widget,
gpointer data)
{
ColorDisplayDialog *cdd = data;
cdd->src_row = -1;
gtk_widget_set_sensitive (cdd->buttons[BUTTON_ADD], FALSE);
}
......
......@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GDISPLAY_COLOR_UI_H__
#define __GDISPLAY_COLOR_UI_H__
#ifndef __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__
#define __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__
void gdisplay_color_ui_new (GimpDisplay *gdisp);
void gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell);
#endif /* __GDISPLAY_COLOR_UI_H__ */
#endif /* __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__ */
......@@ -21,16 +21,18 @@
#include <string.h>
#include <gmodule.h>
#include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h"
#include "apptypes.h"
#include "gdisplay_color.h"
#include "gdisplay.h"
#include "gimpimageP.h"
#include "gimpui.h"
#include "display-types.h"
#include "core/gimpimage.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-filter.h"
#include <gtk/gtk.h>
typedef struct _ColorDisplayInfo ColorDisplayInfo;
......@@ -41,16 +43,19 @@ struct _ColorDisplayInfo
GSList *refs;
};
static void color_display_foreach_real (gpointer key,
gpointer value,
gpointer user_data);
static void gimp_display_shell_filter_detach_real (GimpDisplayShell *shell,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const gchar *name);
static GHashTable *color_display_table = NULL;
static void color_display_foreach_real (gpointer key,
gpointer value,
gpointer user_data);
static void gdisplay_color_detach_real (GimpDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const gchar *name);
void
color_display_init (void)
......@@ -87,26 +92,24 @@ G_MODULE_EXPORT gboolean
gimp_color_display_unregister (const gchar *name)
{
ColorDisplayInfo *info;
GimpDisplay *gdisp;
GList *node;
GimpDisplayShell *shell;
GList *node;
if ((info = g_hash_table_lookup (color_display_table, name)))
{
GSList *refs = info->refs;
GSList *refs;
while (refs)
for (refs = info->refs; refs; refs = g_slist_next (refs))
{
gdisp = (GimpDisplay *) refs->data;
shell = GIMP_DISPLAY_SHELL (refs->data);
node = g_list_find_custom (gdisp->cd_list, (gpointer) name,
node = g_list_find_custom (shell->cd_list, (gpointer) name,
(GCompareFunc) node_name_compare);
gdisp->cd_list = g_list_remove_link (gdisp->cd_list, node);
shell->cd_list = g_list_remove_link (shell->cd_list, node);
gdisplay_color_detach_real (gdisp, node->data, FALSE);
gimp_display_shell_filter_detach_real (shell, node->data, FALSE);
g_list_free_1 (node);
refs = refs->next;
}
g_slist_free (info->refs);
......@@ -145,18 +148,21 @@ color_display_foreach_real (gpointer key,
gpointer value,
gpointer user_data)
{
DisplayForeachData *data = (DisplayForeachData *) user_data;
DisplayForeachData *data;
data = (DisplayForeachData *) user_data;
data->func (key, data->user_data);
}
ColorDisplayNode *
gdisplay_color_attach (GimpDisplay *gdisp,
const gchar *name)
gimp_display_shell_filter_attach (GimpDisplayShell *shell,
const gchar *name)
{
ColorDisplayInfo *info;
ColorDisplayNode *node;
g_return_val_if_fail (gdisp != NULL, NULL);
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
if ((info = g_hash_table_lookup (color_display_table, name)))
{
......@@ -168,14 +174,14 @@ gdisplay_color_attach (GimpDisplay *gdisp,
if (!info->refs && info->methods.init)
info->methods.init ();
info->refs = g_slist_append (info->refs, gdisp);
info->refs = g_slist_append (info->refs, shell);
if (info->methods.new)
node->cd_ID = info->methods.new (gdisp->gimage->base_type);
node->cd_ID = info->methods.new (shell->gdisp->gimage->base_type);
node->cd_convert = info->methods.convert;
gdisp->cd_list = g_list_append (gdisp->cd_list, node);
shell->cd_list = g_list_append (shell->cd_list, node);
return node;
}
......@@ -186,13 +192,13 @@ gdisplay_color_attach (GimpDisplay *gdisp,
}
ColorDisplayNode *
gdisplay_color_attach_clone (GimpDisplay *gdisp,
ColorDisplayNode *node)
gimp_display_shell_filter_attach_clone (GimpDisplayShell *shell,
ColorDisplayNode *node)
{
ColorDisplayInfo *info;
ColorDisplayNode *clone;
g_return_val_if_fail (gdisp != NULL, NULL);
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
g_return_val_if_fail (node != NULL, NULL);
if ((info = g_hash_table_lookup (color_display_table, node->cd_name)))
......@@ -200,16 +206,16 @@ gdisplay_color_attach_clone (GimpDisplay *gdisp,
clone = g_new (ColorDisplayNode, 1);
clone->cd_name = g_strdup (node->cd_name);
clone->cd_ID = NULL;
clone->cd_ID = NULL;
info->refs = g_slist_append (info->refs, gdisp);
info->refs = g_slist_append (info->refs, shell);
if (info->methods.clone)
node->cd_ID = info->methods.clone (node->cd_ID);
node->cd_convert = info->methods.convert;
gdisp->cd_list = g_list_append (gdisp->cd_list, node);
shell->cd_list = g_list_append (shell->cd_list, node);
return node;
}
......@@ -220,51 +226,49 @@ gdisplay_color_attach_clone (GimpDisplay *gdisp,
}
void
gdisplay_color_detach (GimpDisplay *gdisp,
ColorDisplayNode *node)