Imported Upstream version 1.0.0upstream/1.0.0

7 files changed, 188 insertions, 29 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index f0a69d9..424b51c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -8,6 +8,7 @@ include_HEADERS = \
 	ModemManager-names.h \
 	ModemManager-enums.h \
 	ModemManager-errors.h \
+	ModemManager-version.h \
 	ModemManager.h
 
 ModemManager-names.h: $(XMLS) $(top_srcdir)/build-aux/header-generator.xsl
@@ -15,3 +16,6 @@ ModemManager-names.h: $(XMLS) $(top_srcdir)/build-aux/header-generator.xsl
 
 CLEANFILES = \
 	ModemManager-names.h
+
+EXTRA_DIST = \
+	ModemManager-version.h.in
diff --git a/include/Makefile.in b/include/Makefile.in
index f091a10..5968e98 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -80,7 +80,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = include
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(include_HEADERS)
+	$(srcdir)/ModemManager-version.h.in $(include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
@@ -96,7 +96,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = ModemManager-version.h
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -175,8 +175,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -200,7 +198,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -217,7 +214,6 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
@@ -249,14 +245,20 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MBIM_CFLAGS = @MBIM_CFLAGS@
 MBIM_LIBS = @MBIM_LIBS@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MMCLI_CFLAGS = @MMCLI_CFLAGS@
 MMCLI_LIBS = @MMCLI_LIBS@
 MM_CFLAGS = @MM_CFLAGS@
+MM_DEFAULT_USER_POLICY = @MM_DEFAULT_USER_POLICY@
+MM_GLIB_LT_AGE = @MM_GLIB_LT_AGE@
+MM_GLIB_LT_CURRENT = @MM_GLIB_LT_CURRENT@
+MM_GLIB_LT_REVISION = @MM_GLIB_LT_REVISION@
 MM_LIBS = @MM_LIBS@
+MM_MAJOR_VERSION = @MM_MAJOR_VERSION@
+MM_MICRO_VERSION = @MM_MICRO_VERSION@
+MM_MINOR_VERSION = @MM_MINOR_VERSION@
+MM_VERSION = @MM_VERSION@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
-MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -275,13 +277,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QMI_CFLAGS = @QMI_CFLAGS@
 QMI_LIBS = @QMI_LIBS@
 RANLIB = @RANLIB@
@@ -356,11 +354,15 @@ include_HEADERS = \
 	ModemManager-names.h \
 	ModemManager-enums.h \
 	ModemManager-errors.h \
+	ModemManager-version.h \
 	ModemManager.h
 
 CLEANFILES = \
 	ModemManager-names.h
 
+EXTRA_DIST = \
+	ModemManager-version.h.in
+
 all: all-am
 
 .SUFFIXES:
@@ -394,6 +396,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+ModemManager-version.h: $(top_builddir)/config.status $(srcdir)/ModemManager-version.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h
index b268925..f90b223 100644
--- a/include/ModemManager-enums.h
+++ b/include/ModemManager-enums.h
@@ -395,6 +395,28 @@ typedef enum { /*< underscore_name=mm_modem_band >*/
 } MMModemBand;
 
 /**
+ * MMModemPortType:
+ * @MM_MODEM_PORT_TYPE_UNKNOWN: Unknown.
+ * @MM_MODEM_PORT_TYPE_NET: Net port.
+ * @MM_MODEM_PORT_TYPE_AT: AT port.
+ * @MM_MODEM_PORT_TYPE_QCDM: QCDM port.
+ * @MM_MODEM_PORT_TYPE_GPS: GPS port.
+ * @MM_MODEM_PORT_TYPE_QMI: QMI port.
+ * @MM_MODEM_PORT_TYPE_MBIM: MBIM port.
+ *
+ * Type of modem port.
+ */
+typedef enum { /*< underscore_name=mm_modem_port_type >*/
+    MM_MODEM_PORT_TYPE_UNKNOWN = 1,
+    MM_MODEM_PORT_TYPE_NET     = 2,
+    MM_MODEM_PORT_TYPE_AT      = 3,
+    MM_MODEM_PORT_TYPE_QCDM    = 4,
+    MM_MODEM_PORT_TYPE_GPS     = 5,
+    MM_MODEM_PORT_TYPE_QMI     = 6,
+    MM_MODEM_PORT_TYPE_MBIM    = 7
+} MMModemPortType;
+
+/**
  * MMSmsPduType:
  * @MM_SMS_PDU_TYPE_UNKNOWN: Unknown type.
  * @MM_SMS_PDU_TYPE_DELIVER: SMS has been received from the SMSC.
diff --git a/include/ModemManager-names.h b/include/ModemManager-names.h
index 4386883..76ff1aa 100644
--- a/include/ModemManager-names.h
+++ b/include/ModemManager-names.h
@@ -56,7 +56,6 @@
 #define MM_DBUS_INTERFACE_MODEM_LOCATION "org.freedesktop.ModemManager1.Modem.Location"
 #define MM_DBUS_INTERFACE_MODEM_TIME "org.freedesktop.ModemManager1.Modem.Time"
 #define MM_DBUS_INTERFACE_MODEM_FIRMWARE "org.freedesktop.ModemManager1.Modem.Firmware"
-#define MM_DBUS_INTERFACE_MODEM_CONTACTS "org.freedesktop.ModemManager1.Modem.Contacts"
 
 /******************************
  * Methods/Signals/Properties *
@@ -142,6 +141,7 @@
 #define MM_MODEM_PROPERTY_DRIVERS "Drivers"
 #define MM_MODEM_PROPERTY_PLUGIN "Plugin"
 #define MM_MODEM_PROPERTY_PRIMARYPORT "PrimaryPort"
+#define MM_MODEM_PROPERTY_PORTS "Ports"
 #define MM_MODEM_PROPERTY_EQUIPMENTIDENTIFIER "EquipmentIdentifier"
 #define MM_MODEM_PROPERTY_UNLOCKREQUIRED "UnlockRequired"
 #define MM_MODEM_PROPERTY_UNLOCKRETRIES "UnlockRetries"
@@ -225,18 +225,6 @@
  
 #define MM_MODEM_FIRMWARE_METHOD_LIST "List"
 #define MM_MODEM_FIRMWARE_METHOD_SELECT "Select"
-/*
- * Interface 'org.freedesktop.ModemManager1.Modem.Contacts'
- */
- 
-#define MM_MODEM_CONTACTS_METHOD_ADD "Add"
-#define MM_MODEM_CONTACTS_METHOD_DELETE "Delete"
-#define MM_MODEM_CONTACTS_METHOD_GET "Get"
-#define MM_MODEM_CONTACTS_METHOD_LIST "List"
-#define MM_MODEM_CONTACTS_METHOD_FIND "Find"
-#define MM_MODEM_CONTACTS_METHOD_GETCOUNT "GetCount"
-#define MM_MODEM_CONTACTS_SIGNAL_ADDED "Added"
-#define MM_MODEM_CONTACTS_SIGNAL_DELETED "Deleted"
 
 #endif /*  _MODEM_MANAGER_NAMES_H_ */
 
diff --git a/include/ModemManager-version.h b/include/ModemManager-version.h
new file mode 100644
index 0000000..e38ff2a
--- /dev/null
+++ b/include/ModemManager-version.h
@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2013 Lanedo GmbH
+ */
+
+#ifndef _MM_VERSION_H_
+#define _MM_VERSION_H_
+
+/**
+ * SECTION:mm-version
+ * @short_description: Version information in the API.
+ *
+ * This section defines types that are used to identify the ModemManager version.
+ **/
+
+/**
+ * MM_MAJOR_VERSION:
+ *
+ * Evaluates to the major version number of ModemManager which this source
+ * is compiled against.
+ */
+#define MM_MAJOR_VERSION (1)
+
+/**
+ * MM_MINOR_VERSION:
+ *
+ * Evaluates to the minor version number of ModemManager which this source
+ * is compiled against.
+ */
+#define MM_MINOR_VERSION (0)
+
+/**
+ * MM_MICRO_VERSION:
+ *
+ * Evaluates to the micro version number of ModemManager which this source
+ * compiled against.
+ */
+#define MM_MICRO_VERSION (0)
+
+/**
+ * MM_CHECK_VERSION:
+ * @major: major version (e.g. 1 for version 1.2.5)
+ * @minor: minor version (e.g. 2 for version 1.2.5)
+ * @micro: micro version (e.g. 5 for version 1.2.5)
+ *
+ * Returns: %TRUE if the version of the ModemManager header files
+ * is the same as or newer than the passed-in version.
+ */
+#define MM_CHECK_VERSION(major,minor,micro)                         \
+    (MM_MAJOR_VERSION > (major) ||                                  \
+     (MM_MAJOR_VERSION == (major) && MM_MINOR_VERSION > (minor)) || \
+     (MM_MAJOR_VERSION == (major) && MM_MINOR_VERSION == (minor) && MM_MICRO_VERSION >= (micro)))
+
+#endif /* _MM_VERSION_H_ */
diff --git a/include/ModemManager-version.h.in b/include/ModemManager-version.h.in
new file mode 100644
index 0000000..0cb4341
--- /dev/null
+++ b/include/ModemManager-version.h.in
@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2013 Lanedo GmbH
+ */
+
+#ifndef _MM_VERSION_H_
+#define _MM_VERSION_H_
+
+/**
+ * SECTION:mm-version
+ * @short_description: Version information in the API.
+ *
+ * This section defines types that are used to identify the ModemManager version.
+ **/
+
+/**
+ * MM_MAJOR_VERSION:
+ *
+ * Evaluates to the major version number of ModemManager which this source
+ * is compiled against.
+ */
+#define MM_MAJOR_VERSION (@MM_MAJOR_VERSION@)
+
+/**
+ * MM_MINOR_VERSION:
+ *
+ * Evaluates to the minor version number of ModemManager which this source
+ * is compiled against.
+ */
+#define MM_MINOR_VERSION (@MM_MINOR_VERSION@)
+
+/**
+ * MM_MICRO_VERSION:
+ *
+ * Evaluates to the micro version number of ModemManager which this source
+ * compiled against.
+ */
+#define MM_MICRO_VERSION (@MM_MICRO_VERSION@)
+
+/**
+ * MM_CHECK_VERSION:
+ * @major: major version (e.g. 1 for version 1.2.5)
+ * @minor: minor version (e.g. 2 for version 1.2.5)
+ * @micro: micro version (e.g. 5 for version 1.2.5)
+ *
+ * Returns: %TRUE if the version of the ModemManager header files
+ * is the same as or newer than the passed-in version.
+ */
+#define MM_CHECK_VERSION(major,minor,micro)                         \
+    (MM_MAJOR_VERSION > (major) ||                                  \
+     (MM_MAJOR_VERSION == (major) && MM_MINOR_VERSION > (minor)) || \
+     (MM_MAJOR_VERSION == (major) && MM_MINOR_VERSION == (minor) && MM_MICRO_VERSION >= (micro)))
+
+#endif /* _MM_VERSION_H_ */
diff --git a/include/ModemManager.h b/include/ModemManager.h
index 5a30ebc..3a6eb43 100644
--- a/include/ModemManager.h
+++ b/include/ModemManager.h
@@ -1,6 +1,6 @@
 /*
  * ModemManager Interface Specification
- * version 0.6
+ * version 0.8
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 - 2012 Red Hat, Inc.
- * Copyright (C) 2011 - 2012 Google, Inc.
+ * Copyright (C) 2009 - 2013 Red Hat, Inc.
+ * Copyright (C) 2011 - 2013 Google, Inc.
+ * Copyright (C) 2011 - 2013 Lanedo Gmbh
  */
 
 #ifndef _MODEM_MANAGER_H_
@@ -36,5 +37,7 @@
 /* Public header with errors */
 #include <ModemManager-errors.h>
 
+/* Public header with version info */
+#include <ModemManager-version.h>
 
 #endif /*  _MODEM_MANAGER_H_ */