Switching icons

diff --git a/support/builddeb.py b/support/builddeb.py
index ea0db8b..3f14884 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -191,12 +191,7 @@ def build_package(distribution):
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
-       p.icon = {
-               "debian": "26x26-theonering.png",
-               "diablo": "26x26-theonering.png",
-               "fremantle": "64x64-theonering.png", # Fremantle natively uses 48x48
-               "mer": "64x64-theonering.png",
-       }[distribution]
+       p.icon = "32-tor_handset.png"
        for relPath, files in unflatten_files(find_files(".")).iteritems():
                fullPath = "/usr/lib/theonering"
                if relPath:
@@ -212,7 +207,12 @@ def build_package(distribution):
                p["/usr/share/osso-rtcom"] = ["theonering.profile.%s|theonering.profile"% distribution]
        p["/usr/lib/telepathy"] = ["telepathy-theonering"]
        p["/usr/share/telepathy/managers"] = ["theonering.manager"]
-       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-theonering.png|im-theonering.png"]
+       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26-tor_handset.png|tor_handset.png"]
+       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26-tor_phone.png|tor_phone.png"]
+       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26-tor_question.png|tor_question.png"]
+       p["/usr/share/icons/hicolor/64x64/hildon"] = ["64-tor_handset.png|tor_handset.png"]
+       p["/usr/share/icons/hicolor/64x64/hildon"] = ["64-tor_phone.png|tor_phone.png"]
+       p["/usr/share/icons/hicolor/64x64/hildon"] = ["64-tor_question.png|tor_question.png"]
 
        if distribution == "debian":
                print p

diff --git a/support/icons/26x26-theonering.png b/support/icons/26x26-theonering.png
deleted file mode 100644 (file)
index df50c66..0000000
Binary files a/support/icons/26x26-theonering.png and /dev/null differ

diff --git a/support/icons/300-tor_handset.png b/support/icons/300-tor_handset.png
new file mode 100644 (file)
index 0000000..9d0f10d
Binary files /dev/null and b/support/icons/300-tor_handset.png differ

diff --git a/support/icons/300-tor_phone.png b/support/icons/300-tor_phone.png
new file mode 100644 (file)
index 0000000..50a5c24
Binary files /dev/null and b/support/icons/300-tor_phone.png differ

diff --git a/support/icons/300-tor_question.png b/support/icons/300-tor_question.png
new file mode 100644 (file)
index 0000000..e51ae48
Binary files /dev/null and b/support/icons/300-tor_question.png differ

diff --git a/support/icons/32-tor_handset.png b/support/icons/32-tor_handset.png
new file mode 100644 (file)
index 0000000..5598661
Binary files /dev/null and b/support/icons/32-tor_handset.png differ

diff --git a/support/icons/32-tor_phone.png b/support/icons/32-tor_phone.png
new file mode 100644 (file)
index 0000000..b51f117
Binary files /dev/null and b/support/icons/32-tor_phone.png differ

diff --git a/support/icons/32-tor_question.png b/support/icons/32-tor_question.png
new file mode 100644 (file)
index 0000000..14d8f21
Binary files /dev/null and b/support/icons/32-tor_question.png differ

diff --git a/support/icons/64-tor_handset.png b/support/icons/64-tor_handset.png
new file mode 100644 (file)
index 0000000..c4ffd38
Binary files /dev/null and b/support/icons/64-tor_handset.png differ

diff --git a/support/icons/64-tor_phone.png b/support/icons/64-tor_phone.png
new file mode 100644 (file)
index 0000000..94c159c
Binary files /dev/null and b/support/icons/64-tor_phone.png differ

diff --git a/support/icons/64-tor_question.png b/support/icons/64-tor_question.png
new file mode 100644 (file)
index 0000000..cf8a8a4
Binary files /dev/null and b/support/icons/64-tor_question.png differ

diff --git a/support/icons/64x64-theonering.png b/support/icons/64x64-theonering.png
deleted file mode 100644 (file)
index 8d98390..0000000
Binary files a/support/icons/64x64-theonering.png and /dev/null differ

diff --git a/support/theonering.profile.debian b/support/theonering.profile.debian
index 0ac91a5..79aeba8 100644 (file)
--- a/support/theonering.profile.debian
+++ b/support/theonering.profile.debian
@@ -2,7 +2,7 @@
 Manager=theonering
 Protocol=sip
 DisplayName=Google Voice
-IconName = im-theonering
+IconName = tor_handset
 SupportsInvisible = 1
 Capabilities = chat-p2p, voice-p2p, supports-alias, supports-roster
 VCardDefault = 1

diff --git a/support/theonering.profile.diablo b/support/theonering.profile.diablo
index cd5c28e..5972250 100644 (file)
--- a/support/theonering.profile.diablo
+++ b/support/theonering.profile.diablo
@@ -2,7 +2,7 @@
 Manager=theonering
 Protocol=sip
 DisplayName=Google Voice
-IconName = im-theonering
+IconName = tor_handset
 ConfigurationUI = haze-plugin
 SupportsInvisible = 1
 Capabilities = chat-p2p, voice-p2p, supports-alias, supports-roster

diff --git a/support/theonering.profile.fremantle b/support/theonering.profile.fremantle
index 42dbae1..225f91a 100644 (file)
--- a/support/theonering.profile.fremantle
+++ b/support/theonering.profile.fremantle
@@ -2,7 +2,7 @@
 Manager=theonering
 Protocol=sip
 DisplayName=Google Voice
-IconName = im-theonering
+IconName = tor_handset
 ConfigurationUI = haze-plugin
 SupportsInvisible = 1
 Capabilities = chat-p2p, voice-p2p, supports-alias, supports-roster
@@ -34,13 +34,13 @@ Type = 5
 
 [Action chat]
 Name = addr_bd_cont_starter_im_service_chat
-IconName = im-theonering
+IconName = tor_handset
 VCardFields = X-GV,TEL
 prop-org.freedesktop.Telepathy.Channel.ChannelType-s = org.freedesktop.Telepathy.Channel.Type.Text
 
 [Action call]
 Name = addr_bd_cont_starter_im_service_call
-IconName = im-theonering
+IconName = tor_handset
 VCardFields = X-GV,TEL
 prop-org.freedesktop.Telepathy.Channel.ChannelType-s = org.freedesktop.Telepathy.Channel.Type.StreamedMedia
 

diff --git a/support/theonering.profile.mer b/support/theonering.profile.mer
index 0ac91a5..79aeba8 100644 (file)
--- a/support/theonering.profile.mer
+++ b/support/theonering.profile.mer
@@ -2,7 +2,7 @@
 Manager=theonering
 Protocol=sip
 DisplayName=Google Voice
-IconName = im-theonering
+IconName = tor_handset
 SupportsInvisible = 1
 Capabilities = chat-p2p, voice-p2p, supports-alias, supports-roster
 VCardDefault = 1