Renamed icon files

20 files changed, 6 insertions, 6 deletions

diff --git a/bat_tray.c b/bat_tray.c
index 3b2b698..274009b 100644
--- a/bat_tray.c
+++ b/bat_tray.c
@@ -94,15 +94,15 @@ gboolean update_icon(gpointer user_data)
 	switch ( get_battery_state() )
 	{
 		case STATE_DISCHARGING:
-			asprintf(&icon_file,"%s/traybat-%d.png",_DEFAULT_THEME,rounded);
+			asprintf(&icon_file,"%s/bat-%d.png",_DEFAULT_THEME,rounded);
 			break;
 
 		case STATE_CHARGING:
-			asprintf(&icon_file,"%s/traybat-%d-charging.png",_DEFAULT_THEME,rounded);
+			asprintf(&icon_file,"%s/bat-%d-charging.png",_DEFAULT_THEME,rounded);
 			break;
 
 		default:
-			asprintf(&icon_file,"%s/traybat-charged.png",_DEFAULT_THEME);
+			asprintf(&icon_file,"%s/bat-charged.png",_DEFAULT_THEME);
 			break;
 	}
 
@@ -131,7 +131,7 @@ void bat_tray_init()
 
 	debug("Spawning new status icon\n");
 	tray = gtk_status_icon_new();
-	asprintf(&icon_file,"%s/traybat-charged.png",_DEFAULT_THEME);
+	asprintf(&icon_file,"%s/bat-charged.png",_DEFAULT_THEME);
 	gtk_status_icon_set_from_file(tray, icon_file);
 	free(icon_file);
 	gtk_status_icon_set_has_tooltip (tray, TRUE);
diff --git a/themes/default/traybat-0-charging.png b/themes/default/bat-0-charging.png
index 9255e66..9255e66 100644
--- a/themes/default/traybat-0-charging.png
+++ b/themes/default/bat-0-charging.png
diff --git a/themes/default/traybat-0.png b/themes/default/bat-0.png
index 2554a6a..2554a6a 100644
--- a/themes/default/traybat-0.png
+++ b/themes/default/bat-0.png
diff --git a/themes/default/traybat-100-charging.png b/themes/default/bat-100-charging.png
index bae3a43..bae3a43 100644
--- a/themes/default/traybat-100-charging.png
+++ b/themes/default/bat-100-charging.png
diff --git a/themes/default/traybat-100.png b/themes/default/bat-100.png
index fe4ba7f..fe4ba7f 100644
--- a/themes/default/traybat-100.png
+++ b/themes/default/bat-100.png
diff --git a/themes/default/traybat-20-charging.png b/themes/default/bat-20-charging.png
index aabd778..aabd778 100644
--- a/themes/default/traybat-20-charging.png
+++ b/themes/default/bat-20-charging.png
diff --git a/themes/default/traybat-20.png b/themes/default/bat-20.png
index 83e7065..83e7065 100644
--- a/themes/default/traybat-20.png
+++ b/themes/default/bat-20.png
diff --git a/themes/default/traybat-40-charging.png b/themes/default/bat-40-charging.png
index c016a28..c016a28 100644
--- a/themes/default/traybat-40-charging.png
+++ b/themes/default/bat-40-charging.png
diff --git a/themes/default/traybat-40.png b/themes/default/bat-40.png
index 3245106..3245106 100644
--- a/themes/default/traybat-40.png
+++ b/themes/default/bat-40.png
diff --git a/themes/default/traybat-60-charging.png b/themes/default/bat-60-charging.png
index 1667458..1667458 100644
--- a/themes/default/traybat-60-charging.png
+++ b/themes/default/bat-60-charging.png
diff --git a/themes/default/traybat-60.png b/themes/default/bat-60.png
index aa25803..aa25803 100644
--- a/themes/default/traybat-60.png
+++ b/themes/default/bat-60.png
diff --git a/themes/default/traybat-80-charging.png b/themes/default/bat-80-charging.png
index b9c6991..b9c6991 100644
--- a/themes/default/traybat-80-charging.png
+++ b/themes/default/bat-80-charging.png
diff --git a/themes/default/traybat-80.png b/themes/default/bat-80.png
index e649be0..e649be0 100644
--- a/themes/default/traybat-80.png
+++ b/themes/default/bat-80.png
diff --git a/themes/default/traybat-charged.png b/themes/default/bat-charged.png
index 1e61940..1e61940 100644
--- a/themes/default/traybat-charged.png
+++ b/themes/default/bat-charged.png
diff --git a/themes/default/cpufreq-0.png b/themes/default/cpu-0.png
index 9a1b3b4..9a1b3b4 100644
--- a/themes/default/cpufreq-0.png
+++ b/themes/default/cpu-0.png
diff --git a/themes/default/cpufreq-100.png b/themes/default/cpu-100.png
index 6b63453..6b63453 100644
--- a/themes/default/cpufreq-100.png
+++ b/themes/default/cpu-100.png
diff --git a/themes/default/cpufreq-25.png b/themes/default/cpu-25.png
index ae2acf6..ae2acf6 100644
--- a/themes/default/cpufreq-25.png
+++ b/themes/default/cpu-25.png
diff --git a/themes/default/cpufreq-50.png b/themes/default/cpu-50.png
index 03ab5e3..03ab5e3 100644
--- a/themes/default/cpufreq-50.png
+++ b/themes/default/cpu-50.png
diff --git a/themes/default/cpufreq-75.png b/themes/default/cpu-75.png
index 49e9342..49e9342 100644
--- a/themes/default/cpufreq-75.png
+++ b/themes/default/cpu-75.png
diff --git a/tray.c b/tray.c
index 83b1504..10e9668 100644
--- a/tray.c
+++ b/tray.c
@@ -306,7 +306,7 @@ void tray_init()
 {
 	tray_set_defaults();
 	tray = gtk_status_icon_new();
-	char* icon_file = g_strconcat(_DEFAULT_THEME, "/cpufreq-0.png", NULL);
+	char* icon_file = g_strconcat(_DEFAULT_THEME, "/cpu-0.png", NULL);
 
 	debug("Setting icon to '%s'\n",icon_file);
 	gtk_status_icon_set_from_file(tray, icon_file);
@@ -362,7 +362,7 @@ void tray_update_icon_percent()
 	}
 
 	debug("Rounded/adjusted CPU percentage: %d\n",adjusted_percent);
-	asprintf(&file, "%s/cpufreq-%d.png", _DEFAULT_THEME,adjusted_percent);
+	asprintf(&file, "%s/cpu-%d.png", _DEFAULT_THEME,adjusted_percent);
 	debug("Setting tray icon to '%s'\n",file);
 	gtk_status_icon_set_from_file(tray, file);