about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--src/theme.c20
-rw-r--r--themes/aqua20
-rw-r--r--themes/hacker20
-rw-r--r--themes/headache20
-rw-r--r--themes/original20
-rw-r--r--themes/redsplash2
-rw-r--r--themes/whiteness20
-rw-r--r--themes/yellowsplash2
8 files changed, 62 insertions, 62 deletions
diff --git a/src/theme.c b/src/theme.c
index aeb5a70f..bdbc91f8 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -245,43 +245,43 @@ _load_colours(void)
     _set_colour(statusbar_val, &colour_prefs.statusbar, COLOR_BLUE);
     g_free(statusbar_val);
 
-    gchar *titlebartext_val = g_key_file_get_string(theme, "colours", "titlebartext", NULL);
+    gchar *titlebartext_val = g_key_file_get_string(theme, "colours", "titlebar.text", NULL);
     _set_colour(titlebartext_val, &colour_prefs.titlebartext, COLOR_WHITE);
     g_free(titlebartext_val);
 
-    gchar *titlebarbrackets_val = g_key_file_get_string(theme, "colours", "titlebarbrackets", NULL);
+    gchar *titlebarbrackets_val = g_key_file_get_string(theme, "colours", "titlebar.brackets", NULL);
     _set_colour(titlebarbrackets_val, &colour_prefs.titlebarbrackets, COLOR_CYAN);
     g_free(titlebarbrackets_val);
 
-    gchar *statusbartext_val = g_key_file_get_string(theme, "colours", "statusbartext", NULL);
+    gchar *statusbartext_val = g_key_file_get_string(theme, "colours", "statusbar.text", NULL);
     _set_colour(statusbartext_val, &colour_prefs.statusbartext, COLOR_WHITE);
     g_free(statusbartext_val);
 
-    gchar *statusbarbrackets_val = g_key_file_get_string(theme, "colours", "statusbarbrackets", NULL);
+    gchar *statusbarbrackets_val = g_key_file_get_string(theme, "colours", "statusbar.brackets", NULL);
     _set_colour(statusbarbrackets_val, &colour_prefs.statusbarbrackets, COLOR_CYAN);
     g_free(statusbarbrackets_val);
 
-    gchar *statusbaractive_val = g_key_file_get_string(theme, "colours", "statusbaractive", NULL);
+    gchar *statusbaractive_val = g_key_file_get_string(theme, "colours", "statusbar.active", NULL);
     _set_colour(statusbaractive_val, &colour_prefs.statusbaractive, COLOR_CYAN);
     g_free(statusbaractive_val);
 
-    gchar *statusbarnew_val = g_key_file_get_string(theme, "colours", "statusbarnew", NULL);
+    gchar *statusbarnew_val = g_key_file_get_string(theme, "colours", "statusbar.new", NULL);
     _set_colour(statusbarnew_val, &colour_prefs.statusbarnew, COLOR_WHITE);
     g_free(statusbarnew_val);
 
-    gchar *maintext_val = g_key_file_get_string(theme, "colours", "maintext", NULL);
+    gchar *maintext_val = g_key_file_get_string(theme, "colours", "main.text", NULL);
     _set_colour(maintext_val, &colour_prefs.maintext, COLOR_WHITE);
     g_free(maintext_val);
 
-    gchar *splashtext_val = g_key_file_get_string(theme, "colours", "splashtext", NULL);
+    gchar *splashtext_val = g_key_file_get_string(theme, "colours", "main.splash", NULL);
     _set_colour(splashtext_val, &colour_prefs.splashtext, COLOR_CYAN);
     g_free(splashtext_val);
 
-    gchar *inputtext_val = g_key_file_get_string(theme, "colours", "inputtext", NULL);
+    gchar *inputtext_val = g_key_file_get_string(theme, "colours", "input.text", NULL);
     _set_colour(inputtext_val, &colour_prefs.inputtext, COLOR_WHITE);
     g_free(inputtext_val);
 
-    gchar *timetext_val = g_key_file_get_string(theme, "colours", "timetext", NULL);
+    gchar *timetext_val = g_key_file_get_string(theme, "colours", "main.time", NULL);
     _set_colour(timetext_val, &colour_prefs.timetext, COLOR_WHITE);
     g_free(timetext_val);
 
diff --git a/themes/aqua b/themes/aqua
index a96ae9e8..f8797f0b 100644
--- a/themes/aqua
+++ b/themes/aqua
@@ -2,16 +2,16 @@
 bkgnd=default
 titlebar=blue
 statusbar=blue
-titlebartext=white
-titlebarbrackets=white
-statusbartext=white
-statusbarbrackets=white
-statusbaractive=cyan
-statusbarnew=white
-maintext=blue
-inputtext=white
-timetext=cyan
-splashtext=white
+titlebar.text=white
+titlebar.brackets=white
+statusbar.text=white
+statusbar.brackets=white
+statusbar.active=cyan
+statusbar.new=white
+main.text=blue
+input.text=white
+main.time=cyan
+main.splash=white
 online=white
 away=cyan
 chat=white
diff --git a/themes/hacker b/themes/hacker
index fc38c529..a9fa0d4d 100644
--- a/themes/hacker
+++ b/themes/hacker
@@ -2,16 +2,16 @@
 bkgnd=default
 titlebar=green
 statusbar=green
-titlebartext=black
-titlebarbrackets=black
-statusbartext=black
-statusbarbrackets=black
-statusbaractive=black
-statusbarnew=black
-maintext=green
-inputtext=green
-timetext=green
-splashtext=green
+titlebar.text=black
+titlebar.brackets=black
+statusbar.text=black
+statusbar.brackets=black
+statusbar.active=black
+statusbar.new=black
+main.text=green
+input.text=green
+main.time=green
+main.splash=green
 online=green
 away=green
 chat=green
diff --git a/themes/headache b/themes/headache
index 350b589a..768363a7 100644
--- a/themes/headache
+++ b/themes/headache
@@ -2,16 +2,16 @@
 bkgnd=default
 titlebar=magenta
 statusbar=default
-titlebartext=white
-titlebarbrackets=white
-statusbartext=white
-statusbarbrackets=red
-statusbaractive=cyan
-statusbarnew=white
-maintext=blue
-inputtext=yellow
-timetext=green
-splashtext=red
+titlebar.text=white
+titlebar.brackets=white
+statusbar.text=white
+statusbar.brackets=red
+statusbar.active=cyan
+statusbar.new=white
+main.text=blue
+input.text=yellow
+main.time=green
+main.splash=red
 online=red
 away=cyan
 chat=green
diff --git a/themes/original b/themes/original
index 7c401040..4a53feb7 100644
--- a/themes/original
+++ b/themes/original
@@ -2,16 +2,16 @@
 bkgnd=default
 titlebar=blue
 statusbar=blue
-titlebartext=white
-titlebarbrackets=cyan
-statusbartext=white
-statusbarbrackets=cyan
-statusbaractive=cyan
-statusbarnew=white
-maintext=white
-inputtext=white
-timetext=white
-splashtext=cyan
+titlebar.text=white
+titlebar.brackets=cyan
+statusbar.text=white
+statusbar.brackets=cyan
+statusbar.active=cyan
+statusbar.new=white
+main.text=white
+input.text=white
+main.time=white
+main.splash=cyan
 online=green
 away=cyan
 chat=green
diff --git a/themes/redsplash b/themes/redsplash
index 6c6a5999..965ff871 100644
--- a/themes/redsplash
+++ b/themes/redsplash
@@ -1,2 +1,2 @@
 [colours]
-splashtext=red
+main.splash=red
diff --git a/themes/whiteness b/themes/whiteness
index 0795cdf6..46d353b9 100644
--- a/themes/whiteness
+++ b/themes/whiteness
@@ -2,16 +2,16 @@
 bkgnd=white
 titlebar=blue
 statusbar=blue
-titlebartext=white
-titlebarbrackets=white
-statusbartext=white
-statusbarbrackets=white
-statusbaractive=megenta
-statusbarnew=red
-maintext=black
-inputtext=black
-timetext=black
-splashtext=black
+titlebar.text=white
+titlebar.brackets=white
+statusbar.text=white
+statusbar.brackets=white
+statusbar.active=megenta
+statusbar.new=red
+main.text=black
+input.text=black
+main.time=black
+main.splash=black
 online=green
 away=cyan
 chat=green
diff --git a/themes/yellowsplash b/themes/yellowsplash
index 46510a06..7fd80185 100644
--- a/themes/yellowsplash
+++ b/themes/yellowsplash
@@ -1,2 +1,2 @@
 [colours]
-splashtext=yellow
+main.splash=yellow