summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoshua L. Blocher <verbalshadow@gmail.com>2006-04-28 03:57:58 +0000
committerverbalshadow <verbalshadow@users.sourceforge.net>2006-04-28 03:57:58 +0000
commit8aaf3d80829fcd3c2e9c026441aba95eb21cf587 (patch)
tree3201a45a14f8cffd761e6271093966d57c5045e6 /src
parentUpdated to additions for <switch> (diff)
downloadinkscape-8aaf3d80829fcd3c2e9c026441aba95eb21cf587.tar.gz
inkscape-8aaf3d80829fcd3c2e9c026441aba95eb21cf587.zip
Added CREATE v0.1 support for gradients/swatches/patterns
(bzr r600)
Diffstat (limited to 'src')
-rw-r--r--src/dialogs/swatches.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index 4338b4252..5af23f95e 100644
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -856,6 +856,7 @@ static void loadEmUp()
std::list<gchar *> sources;
sources.push_back( profile_path("palettes") );
sources.push_back( g_strdup(INKSCAPE_PALETTESDIR) );
+ sources.push_back( g_strdup(CREATE_PALETTESDIR) );
// Use this loop to iterate through a list of possible document locations.
while (!sources.empty()) {
@@ -872,13 +873,13 @@ static void loadEmUp()
gchar *filename = 0;
while ((filename = (gchar *)g_dir_read_name(directory)) != NULL) {
gchar* lower = g_ascii_strdown( filename, -1 );
- if ( g_str_has_suffix(lower, ".gpl") ) {
+// if ( g_str_has_suffix(lower, ".gpl") ) {
gchar* full = g_build_filename(dirname, filename, NULL);
if ( !Inkscape::IO::file_test( full, (GFileTest)(G_FILE_TEST_IS_DIR ) ) ) {
_loadPaletteFile(full);
}
g_free(full);
- }
+// }
g_free(lower);
}
g_dir_close(directory);