From 9b2ac3c3db9d7ee775049bc5739d3355b49b9bfd Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Tue, 23 May 2006 16:39:31 +0000
Subject: Flipped LCMS on

(bzr r981)
---
 src/dialogs/swatches.cpp | 10 ++++++----
 src/interface.cpp        |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index dc9b6fdd6..dc9de8d2b 100644
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -98,10 +98,10 @@ typedef enum {
 } colorFlavorType;
 
 static const GtkTargetEntry sourceColorEntries[] = {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
 //    {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
     {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
     {"application/x-color", 0, APP_X_COLOR},
     {"text/plain", 0, TEXT_DATA},
 };
@@ -234,10 +234,10 @@ static void dieDieDie( GtkObject *obj, gpointer user_data )
 }
 
 static const GtkTargetEntry destColorTargets[] = {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
 //    {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
     {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
     {"application/x-color", 0, APP_X_COLOR},
 };
 
@@ -837,7 +837,9 @@ void _loadPaletteFile( gchar const *filename )
                 } while ( result && !hasErr );
                 if ( !hasErr ) {
                     possible.push_back(onceMore);
+#if ENABLE_MAGIC_COLORS
                     ColorItem::_wireMagicColors( onceMore );
+#endif ENABLE_MAGIC_COLORS
                 } else {
                     delete onceMore;
                 }
diff --git a/src/interface.cpp b/src/interface.cpp
index c5d893ede..959e231e2 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -88,9 +88,9 @@ static GtkTargetEntry ui_drop_target_entries [] = {
     {"image/svg",     0, SVG_DATA},
     {"image/png",     0, PNG_DATA},
     {"image/jpeg",    0, JPEG_DATA},
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
     {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
     {"application/x-color", 0, APP_X_COLOR}
 };
 
@@ -978,7 +978,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
                          gpointer user_data)
 {
     switch (info) {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
         case APP_X_INKY_COLOR:
         {
             SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -1052,7 +1052,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
             }
         }
         break;
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
 
         case APP_X_COLOR:
         {
-- 
cgit v1.2.3