From 3c4988bae7c841cc308d77bc6b0611321939b1c0 Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Fri, 7 Jun 2013 11:57:13 -0400
Subject: Prefix icon names with indicator-keyboard.

---
 data/main.vala | 4 ++--
 lib/main.vala  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/main.vala b/data/main.vala
index 3dd940b7..9be80ebf 100644
--- a/data/main.vala
+++ b/data/main.vala
@@ -150,7 +150,7 @@ int main (string[] args) {
 	foreach (var entry in occurrences.entries) {
 		var layout = entry.key;
 		var count = entry.value;
-		var file = File.new_for_path (@"$output_path/$layout.svg");
+		var file = File.new_for_path (@"$output_path/indicator-keyboard-$layout.svg");
 
 		if (force || !file.query_exists (null)) {
 			int layout_width;
@@ -193,7 +193,7 @@ int main (string[] args) {
 			partial_data = partial_data.replace ("@LAYOUT_Y@", @"$layout_y");
 
 			for (var i = 1; i <= count; i++) {
-				file = File.new_for_path (@"$output_path/$layout-$i.svg");
+				file = File.new_for_path (@"$output_path/indicator-keyboard-$layout-$i.svg");
 
 				if (force || !file.query_exists (null)) {
 					var subscript = @"$i";
diff --git a/lib/main.vala b/lib/main.vala
index e0bb9207..9d438381 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -260,9 +260,9 @@ public class Indicator.Keyboard.Service : Object {
 					string icon_name;
 
 					if (icon_unique) {
-						icon_name = @"$icon_string";
+						icon_name = @"indicator-keyboard-$icon_string";
 					} else {
-						icon_name = @"$icon_string-$icon_subscript";
+						icon_name = @"indicator-keyboard-$icon_string-$icon_subscript";
 					}
 
 					var icon_theme = Gtk.IconTheme.get_default ();
-- 
cgit v1.2.3