diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index d318088a..3b8e3d18 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,10 +1,14 @@
EXTRA_DIST = \
mm-manager.xml \
+ mm-mobile-error.xml \
mm-modem.xml \
mm-modem-cdma.xml \
+ mm-modem-connect-error.xml \
+ mm-modem-error.xml \
mm-modem-gsm-card.xml \
mm-modem-gsm-contacts.xml \
mm-modem-gsm-hso.xml \
mm-modem-gsm-network.xml \
- mm-modem-gsm-sms.xml
+ mm-modem-gsm-sms.xml \
+ mm-serial-error.xml
diff --git a/introspection/all.xml b/introspection/all.xml
index 940ae598..dfe33b37 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -30,4 +30,9 @@
+
+
+
+
+
diff --git a/introspection/mm-mobile-error.xml b/introspection/mm-mobile-error.xml
new file mode 100644
index 00000000..5edbcb76
--- /dev/null
+++ b/introspection/mm-mobile-error.xml
@@ -0,0 +1,318 @@
+
+
+ Copyright (C) 2008 Novell, Inc.
+
+
+
+ A phone failure.
+
+
+
+
+
+ No connection to phone.
+
+
+
+
+
+ Phone-adaptor link reserved.
+
+
+
+
+
+ Operation not allowed.
+
+
+
+
+
+ Operation not supported.
+
+
+
+
+
+ PH-SIM PIN required.
+
+
+
+
+
+ PH-FSIM PIN required.
+
+
+
+
+
+ PH-FSIM PUK required.
+
+
+
+
+
+ SIM not inserted.
+
+
+
+
+
+ SIM PIN required.
+
+
+
+
+
+ SIM PUK required.
+
+
+
+
+
+ SIM failure.
+
+
+
+
+
+ SIM busy.
+
+
+
+
+
+ SIM wrong.
+
+
+
+
+
+ Incorrect password.
+
+
+
+
+
+ SIM PIN2 required.
+
+
+
+
+
+ SIM PUK2 required.
+
+
+
+
+
+ Memory full.
+
+
+
+
+
+ Invalid index.
+
+
+
+
+
+ Not found.
+
+
+
+
+
+ Memory failure.
+
+
+
+
+
+ Text string too long.
+
+
+
+
+
+ Invalid characters in text string.
+
+
+
+
+
+ Dial string too long.
+
+
+
+
+
+ Invalid characters in dial string.
+
+
+
+
+
+ No network service.
+
+
+
+
+
+ Network timeout.
+
+
+
+
+
+ Network not allowed - emergency calls only.
+
+
+
+
+
+ Network personalization PIN required.
+
+
+
+
+
+ Network personalization PUK required.
+
+
+
+
+
+ Network subset personalization PIN required.
+
+
+
+
+
+ Network subset personalization PUK required.
+
+
+
+
+
+ Service provider personalization PIN required.
+
+
+
+
+
+ Service provider personalization PUK required.
+
+
+
+
+
+ Corporate personalization PIN required.
+
+
+
+
+
+ Corporate personalization PUK required.
+
+
+
+
+
+ Hidden key required. This key is required when accessing hidden phonebook entries.
+
+
+
+
+
+ EAP method not supported.
+
+
+
+
+
+ Incorrect parameters.
+
+
+
+
+
+ An unknown error.
+
+
+
+
+
+ Illegal MS.
+
+
+
+
+
+ Illegal ME.
+
+
+
+
+
+ GPRS services not allowed.
+
+
+
+
+
+ PLMN not allowed.
+
+
+
+
+
+ Location area not allowed.
+
+
+
+
+
+ Roaming not allowed in this location area.
+
+
+
+
+
+ Service option not supported.
+
+
+
+
+
+ Requested service option not subscribed.
+
+
+
+
+
+ Service option temporarily out of order.
+
+
+
+
+
+ PDP authentication failure.
+
+
+
+
+
+ Unspecified GPRS error
+
+
+
+
+
+ Invalid mobile class.
+
+
+
+
diff --git a/introspection/mm-modem-connect-error.xml b/introspection/mm-modem-connect-error.xml
new file mode 100644
index 00000000..ea0d24bd
--- /dev/null
+++ b/introspection/mm-modem-connect-error.xml
@@ -0,0 +1,30 @@
+
+
+ Copyright (C) 2008 Novell, Inc.
+
+
+
+ No carrier.
+
+
+
+
+
+ No dialtone.
+
+
+
+
+
+ Busy.
+
+
+
+
+
+ No answer.
+
+
+
+
diff --git a/introspection/mm-modem-error.xml b/introspection/mm-modem-error.xml
new file mode 100644
index 00000000..d80df6c1
--- /dev/null
+++ b/introspection/mm-modem-error.xml
@@ -0,0 +1,18 @@
+
+
+ Copyright (C) 2008 Novell, Inc.
+
+
+
+ A generic error. An example of a generic error is ModemManager not being able to parse the response from modem.
+
+
+
+
+
+ Operation not implemented by modem.
+
+
+
+
diff --git a/introspection/mm-serial-error.xml b/introspection/mm-serial-error.xml
new file mode 100644
index 00000000..338a2232
--- /dev/null
+++ b/introspection/mm-serial-error.xml
@@ -0,0 +1,24 @@
+
+
+ Copyright (C) 2008 Novell, Inc.
+
+
+
+ Could not open serial device.
+
+
+
+
+
+ Could not write to the serial device.
+
+
+
+
+
+ A response was not received in time.
+
+
+
+
diff --git a/src/mm-errors.c b/src/mm-errors.c
index 129275fd..2523e5fc 100644
--- a/src/mm-errors.c
+++ b/src/mm-errors.c
@@ -7,91 +7,91 @@
GQuark
mm_serial_error_quark (void)
{
- static GQuark ret = 0;
+ static GQuark ret = 0;
- if (ret == 0)
- ret = g_quark_from_static_string ("mm_serial_error");
+ if (ret == 0)
+ ret = g_quark_from_static_string ("mm_serial_error");
- return ret;
+ return ret;
}
GType
mm_serial_error_get_type (void)
{
- static GType etype = 0;
+ static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- ENUM_ENTRY (MM_SERIAL_OPEN_FAILED, "SerialOpenFailed"),
- ENUM_ENTRY (MM_SERIAL_SEND_FAILED, "SerialSendfailed"),
- ENUM_ENTRY (MM_SERIAL_RESPONSE_TIMEOUT, "SerialResponseTimeout"),
- { 0, 0, 0 }
- };
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ ENUM_ENTRY (MM_SERIAL_OPEN_FAILED, "SerialOpenFailed"),
+ ENUM_ENTRY (MM_SERIAL_SEND_FAILED, "SerialSendfailed"),
+ ENUM_ENTRY (MM_SERIAL_RESPONSE_TIMEOUT, "SerialResponseTimeout"),
+ { 0, 0, 0 }
+ };
- etype = g_enum_register_static ("MMSerialError", values);
- }
+ etype = g_enum_register_static ("MMSerialError", values);
+ }
- return etype;
+ return etype;
}
GQuark
mm_modem_error_quark (void)
{
- static GQuark ret = 0;
+ static GQuark ret = 0;
- if (ret == 0)
- ret = g_quark_from_static_string ("mm_modem_error");
+ if (ret == 0)
+ ret = g_quark_from_static_string ("mm_modem_error");
- return ret;
+ return ret;
}
GType
mm_modem_error_get_type (void)
{
- static GType etype = 0;
+ static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
+ if (etype == 0) {
+ static const GEnumValue values[] = {
ENUM_ENTRY (MM_MODEM_ERROR_GENERAL, "Generial"),
- ENUM_ENTRY (MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, "OperationNotSupported"),
- { 0, 0, 0 }
- };
+ ENUM_ENTRY (MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, "OperationNotSupported"),
+ { 0, 0, 0 }
+ };
- etype = g_enum_register_static ("MMModemError", values);
- }
+ etype = g_enum_register_static ("MMModemError", values);
+ }
- return etype;
+ return etype;
}
GQuark
mm_modem_connect_error_quark (void)
{
- static GQuark ret = 0;
+ static GQuark ret = 0;
- if (ret == 0)
- ret = g_quark_from_static_string ("mm_modem_connect_error");
+ if (ret == 0)
+ ret = g_quark_from_static_string ("mm_modem_connect_error");
- return ret;
+ return ret;
}
GType
mm_modem_connect_error_get_type (void)
{
- static GType etype = 0;
+ static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_NO_CARRIER, "NoCarrier"),
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_NO_CARRIER, "NoCarrier"),
ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_NO_DIALTONE, "NoDialtone"),
- ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_BUSY, "Busy"),
- ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_NO_ANSWER, "NoAnswer"),
- { 0, 0, 0 }
- };
+ ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_BUSY, "Busy"),
+ ENUM_ENTRY (MM_MODEM_CONNECT_ERROR_NO_ANSWER, "NoAnswer"),
+ { 0, 0, 0 }
+ };
- etype = g_enum_register_static ("MMModemConnectError", values);
- }
+ etype = g_enum_register_static ("MMModemConnectError", values);
+ }
- return etype;
+ return etype;
}
GError *
@@ -127,22 +127,22 @@ mm_modem_connect_error_for_code (int error_code)
GQuark
mm_mobile_error_quark (void)
{
- static GQuark ret = 0;
+ static GQuark ret = 0;
- if (ret == 0)
- ret = g_quark_from_static_string ("mm_mobile_error");
+ if (ret == 0)
+ ret = g_quark_from_static_string ("mm_mobile_error");
- return ret;
+ return ret;
}
GType
mm_mobile_error_get_type (void)
{
- static GType etype = 0;
+ static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- ENUM_ENTRY (MM_MOBILE_ERROR_PHONE_FAILURE, "PhoneFailure"),
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ ENUM_ENTRY (MM_MOBILE_ERROR_PHONE_FAILURE, "PhoneFailure"),
ENUM_ENTRY (MM_MOBILE_ERROR_NO_CONNECTION, "NoConnection"),
ENUM_ENTRY (MM_MOBILE_ERROR_LINK_RESERVED, "LinkReserved"),
ENUM_ENTRY (MM_MOBILE_ERROR_NOT_ALLOWED, "OperationNotAllowed"),
@@ -194,13 +194,13 @@ mm_mobile_error_get_type (void)
ENUM_ENTRY (MM_MOBILE_ERROR_GPRS_PDP_AUTH_FAILURE, "GprsPdpAuthFailure"),
ENUM_ENTRY (MM_MOBILE_ERROR_GPRS_UNKNOWN, "GprsUnspecified"),
ENUM_ENTRY (MM_MOBILE_ERROR_GPRS_INVALID_CLASS, "GprsInvalidClass"),
- { 0, 0, 0 }
- };
+ { 0, 0, 0 }
+ };
- etype = g_enum_register_static ("MMMobileError", values);
- }
+ etype = g_enum_register_static ("MMMobileError", values);
+ }
- return etype;
+ return etype;
}
GError *
diff --git a/src/mm-errors.h b/src/mm-errors.h
index a17f428e..e9fa3ace 100644
--- a/src/mm-errors.h
+++ b/src/mm-errors.h
@@ -7,7 +7,7 @@
enum {
MM_SERIAL_OPEN_FAILED = 0,
- MM_SERIAL_SEND_FAILED = 1,
+ MM_SERIAL_SEND_FAILED = 1,
MM_SERIAL_RESPONSE_TIMEOUT = 2
};
diff --git a/src/mm-manager.c b/src/mm-manager.c
index e7a30d7d..367053ee 100644
--- a/src/mm-manager.c
+++ b/src/mm-manager.c
@@ -454,7 +454,6 @@ mm_manager_class_init (MMManagerClass *manager_class)
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class),
&dbus_glib_mm_manager_object_info);
- /* FIXME: Sigh, these don't work either */
dbus_g_error_domain_register (MM_SERIAL_ERROR, "org.freedesktop.ModemManager.Modem", MM_TYPE_SERIAL_ERROR);
dbus_g_error_domain_register (MM_MODEM_ERROR, "org.freedesktop.ModemManager.Modem", MM_TYPE_MODEM_ERROR);
dbus_g_error_domain_register (MM_MODEM_CONNECT_ERROR, "org.freedesktop.ModemManager.Modem", MM_TYPE_MODEM_CONNECT_ERROR);