Merge lp:~unity-api-team/indicator-network/fix-3g-icon into lp:indicator-network/14.10

[Antti Kaijanmäki]

Fix 3g icon.

[Thomas Strehl (strehl-t)]

finally proper icon

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-api-team/indicator-network/fix-3g-icon/+merge/219726/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-network-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/133/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/134/rebuild

review: Approve (continuous-integration)

=== modified file 'network/root-state.cpp'
--- network/root-state.cpp	2014-04-24 13:51:31 +0000
+++ network/root-state.cpp	2014-05-15 15:58:19 +0000
@@ -197,7 +197,7 @@
             m_modemTechIcon = "network-cellular-edge";
             break;
         case org::ofono::Interface::NetworkRegistration::Technology::umts:
-            m_modemTechIcon = "network-cellular-umts";
+            m_modemTechIcon = "network-cellular-3g";
             break;
         case org::ofono::Interface::NetworkRegistration::Technology::hspa:
             m_modemTechIcon = "network-cellular-hspa";