commit 1ec741c0493fb2a94cb726507e4310f819992a4e
author Darin Petkov <petkov@chromium.org> Tue Aug 02 10:45:27 2011 -0700
committer Darin Petkov <petkov@chromium.org> Tue Aug 02 13:59:56 2011 -0700
tree f79b9ab87d885e2a458208fdc95b2388ecc47fe5
parent bec79a277e55177945db0e56c26f901fd2990fc0

shill: No need to clone modem.xml now that dbus-c++ is patched to process it.

BUG=none
TEST=unit tests

Change-Id: I32e8fbf6b28671280a2488587753d334cfd652dd
Reviewed-on: http://gerrit.chromium.org/gerrit/5146
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

modem_proxy.h

diff --git a/modem_proxy.h b/modem_proxy.h
index b9c588c..a1300b8 100644
--- a/modem_proxy.h
+++ b/modem_proxy.h
@@ -36,8 +36,8 @@
 
    private:
     // Signal callbacks inherited from ModemManager::Modem_proxy.
-    virtual void StateChanged(const uint32 &old_state,
-                              const uint32 &new_state,
+    virtual void StateChanged(const uint32 &old,
+                              const uint32 &_new,
                               const uint32 &reason);
 
     DISALLOW_COPY_AND_ASSIGN(Proxy);