diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-01-24 14:36:24 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-01-24 14:36:24 -0600 |
| commit | 00b6cce4df7d4acbf3e580a03c2f044e18589d2c (patch) | |
| tree | 5cabb0ab457846912d99ef675160be0dce4fbe6f | |
| parent | 245b893e98d0d572f4285ee82cc8e2cb80eddad7 (diff) | |
api: fix up StateChanged duplicate reason code
And add new reason codes to the C headers.
| -rw-r--r-- | introspection/org.freedesktop.ModemManager.Modem.xml | 13 | ||||
| -rw-r--r-- | src/mm-modem.h | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/introspection/org.freedesktop.ModemManager.Modem.xml b/introspection/org.freedesktop.ModemManager.Modem.xml index 37b9fc7a..3f6f0bbc 100644 --- a/introspection/org.freedesktop.ModemManager.Modem.xml +++ b/introspection/org.freedesktop.ModemManager.Modem.xml @@ -99,11 +99,6 @@ New state. </tp:docstring> </arg> - <arg name="reason" type="u"> - <tp:docstring> - Reason for state transition. - </tp:docstring> - </arg> <arg name="reason" type="u" tp:type="MM_MODEM_STATE_CHANGED_REASON"> <tp:docstring> Reason for this state change. @@ -227,20 +222,20 @@ </tp:enumvalue> </tp:enum> - <tp:enum name="MM_MODEM_STATE_CHANGE_REASON" type="u"> + <tp:enum name="MM_MODEM_STATE_CHANGED_REASON" type="u"> <tp:enumvalue suffix="UNKNOWN" value="0"> <tp:docstring> Reason unknown or not reportable. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="REQUESTED" value="1"> + <tp:enumvalue suffix="USER_REQUESTED" value="1"> <tp:docstring> - Connection state change was requested by an interface user. + State change was requested by an interface user. </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="SUSPEND" value="2"> <tp:docstring> - Connection state change was caused by a system suspend. + State change was caused by a system suspend. </tp:docstring> </tp:enumvalue> </tp:enum> diff --git a/src/mm-modem.h b/src/mm-modem.h index 8a755d88..7f0bf58d 100644 --- a/src/mm-modem.h +++ b/src/mm-modem.h @@ -40,7 +40,9 @@ typedef enum { } MMModemState; typedef enum { - MM_MODEM_STATE_REASON_NONE = 0 + MM_MODEM_STATE_REASON_NONE = 0, + MM_MODEM_STATE_REASON_USER_REQUESTED, + MM_MODEM_STATE_REASON_SUSPEND } MMModemStateReason; #define DBUS_PATH_TAG "dbus-path" |