From 0f67e21c98b38638a74eb2f3a6626f17775067e4 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Tue, 22 Mar 2016 16:37:10 +0100
Subject: [PATCH] themes: rename theme "Default" into "System".

Since we have many themes now, this new name better indicates that it
is meant to follow your desktop theme settings.
Also it will likely not remain the default theme.
---
 app/config/gimpguiconfig.h             | 2 +-
 configure.ac                           | 2 +-
 docs/gimprc.5.in                       | 2 +-
 etc/gimprc                             | 2 +-
 libgimpbase/gimpenv.c                  | 2 +-
 themes/Makefile.am                     | 2 +-
 themes/{Default => System}/.gitignore  | 0
 themes/{Default => System}/Makefile.am | 2 +-
 themes/{Default => System}/gtkrc       | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename themes/{Default => System}/.gitignore (100%)
 rename themes/{Default => System}/Makefile.am (71%)
 rename themes/{Default => System}/gtkrc (100%)

diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index d487d0e91f..c0fe3e84df 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -24,7 +24,7 @@
 #include "config/gimpdisplayconfig.h"
 
 
-#define GIMP_CONFIG_DEFAULT_THEME          "Default"
+#define GIMP_CONFIG_DEFAULT_THEME          "System"
 #define GIMP_CONFIG_DEFAULT_ICON_THEME     "Color"
 
 
diff --git a/configure.ac b/configure.ac
index f256476335..a2d8e5de81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2422,7 +2422,7 @@ icons/Legacy/Makefile
 icons/Symbolic/Makefile
 icons/Symbolic-Inverted/Makefile
 themes/Makefile
-themes/Default/Makefile
+themes/System/Makefile
 themes/Small/Makefile
 themes/Darker/Makefile
 themes/Dark/Makefile
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 370558222b..d17458ec5c 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -850,7 +850,7 @@ Sets the theme search path.  This is a colon-separated list of folders to
 search.
 
 .TP
-(theme "Default")
+(theme "System")
 
 The name of the theme to use.  This is a string value.
 
diff --git a/etc/gimprc b/etc/gimprc
index 70e79d363e..cc732f2612 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -667,7 +667,7 @@
 
 # The name of the theme to use.  This is a string value.
 # 
-# (theme "Default")
+# (theme "System")
 
 # Sets the icon theme search path.  This is a colon-separated list of folders
 # to search.
diff --git a/libgimpbase/gimpenv.c b/libgimpbase/gimpenv.c
index 1587523aa4..04fe249de7 100644
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@ -814,7 +814,7 @@ gimp_gtkrc (void)
 
   if (! gimp_gtkrc_filename)
     gimp_gtkrc_filename = g_build_filename (gimp_data_directory (),
-                                            "themes", "Default", "gtkrc",
+                                            "themes", "System", "gtkrc",
                                             NULL);
 
   return gimp_gtkrc_filename;
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 8fda3cacd6..56c9edaea7 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = Default Small Darker Dark Gray Light Lighter
+SUBDIRS = Darker Dark Gray Light Lighter Small System
diff --git a/themes/Default/.gitignore b/themes/System/.gitignore
similarity index 100%
rename from themes/Default/.gitignore
rename to themes/System/.gitignore
diff --git a/themes/Default/Makefile.am b/themes/System/Makefile.am
similarity index 71%
rename from themes/Default/Makefile.am
rename to themes/System/Makefile.am
index e623ef3e2e..cbfcc22969 100644
--- a/themes/Default/Makefile.am
+++ b/themes/System/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-themedatadir = $(gimpdatadir)/themes/Default
+themedatadir = $(gimpdatadir)/themes/System
 
 themedata_DATA = gtkrc
 
diff --git a/themes/Default/gtkrc b/themes/System/gtkrc
similarity index 100%
rename from themes/Default/gtkrc
rename to themes/System/gtkrc