diff --git a/.gitignore b/.gitignore
index e07b7149..78a89256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,10 @@ policy/org.freedesktop.modem-manager.policy
libqcdm/tests/test-qcdm
libwmc/tests/test-wmc
+data/org.freedesktop.ModemManager1.conf
+data/org.freedesktop.ModemManager1.service
+data/org.freedesktop.ModemManager1.policy
+
include/ModemManager-names.h
libmm-common/*.[ch]
diff --git a/data/Makefile.am b/data/Makefile.am
index bca0a7be..f46af85b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,15 +1,15 @@
# DBus Service file
dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = org.freedesktop.ModemManager.conf
-dbusservice_file_polkit = org.freedesktop.ModemManager.conf.polkit
-dbusservice_file_nopolkit = org.freedesktop.ModemManager.conf.nopolkit
+dbusservice_DATA = org.freedesktop.ModemManager1.conf
+dbusservice_file_polkit = org.freedesktop.ModemManager1.conf.polkit
+dbusservice_file_nopolkit = org.freedesktop.ModemManager1.conf.nopolkit
if WITH_POLKIT
-org.freedesktop.ModemManager.conf: $(top_srcdir)/data/$(dbusservice_file_polkit)
+org.freedesktop.ModemManager1.conf: $(top_srcdir)/data/$(dbusservice_file_polkit)
cp -f $(top_srcdir)/data/$(dbusservice_file_polkit) $(dbusservice_DATA)
else
-org.freedesktop.ModemManager.conf: $(top_srcdir)/data/$(dbusservice_file_nopolkit)
+org.freedesktop.ModemManager1.conf: $(top_srcdir)/data/$(dbusservice_file_nopolkit)
cp -f $(top_srcdir)/data/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
endif
@@ -21,16 +21,16 @@ edit = @sed \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g'
dbusactivationdir = $(datadir)/dbus-1/system-services
-dbusactivation_in_files = org.freedesktop.ModemManager.service.in
+dbusactivation_in_files = org.freedesktop.ModemManager1.service.in
dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
%service: %service.in
$(edit) $< >$@
# DBus Introspection files
-XMLS = $(wildcard $(top_srcdir)/introspection/*.xml)
+XMLS = $(wildcard $(top_srcdir)/new/*.xml)
xmldir = $(datadir)/dbus-1/interfaces
-xml_DATA = $(filter-out $(top_srcdir)/introspection/all.xml, $(XMLS))
+xml_DATA = $(filter-out $(top_srcdir)/new/all.xml, $(XMLS))
# Icon
@@ -39,7 +39,7 @@ icon_DATA = modem-manager.png
# Polkit
-dist_polkit_policy_in_files = org.freedesktop.modem-manager.policy.in
+dist_polkit_policy_in_files = org.freedesktop.ModemManager1.policy.in
if WITH_POLKIT
polkit_policydir = $(datadir)/polkit-1/actions
dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
diff --git a/data/org.freedesktop.ModemManager.conf.polkit b/data/org.freedesktop.ModemManager.conf.polkit
deleted file mode 100644
index 25490e33..00000000
--- a/data/org.freedesktop.ModemManager.conf.polkit
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 512
-
-
diff --git a/data/org.freedesktop.ModemManager.conf.nopolkit b/data/org.freedesktop.ModemManager1.conf.nopolkit
similarity index 76%
rename from data/org.freedesktop.ModemManager.conf.nopolkit
rename to data/org.freedesktop.ModemManager1.conf.nopolkit
index 2f331613..dab597a9 100644
--- a/data/org.freedesktop.ModemManager.conf.nopolkit
+++ b/data/org.freedesktop.ModemManager1.conf.nopolkit
@@ -5,11 +5,11 @@
-
+
-
+
512
diff --git a/data/org.freedesktop.ModemManager1.conf.polkit b/data/org.freedesktop.ModemManager1.conf.polkit
new file mode 100644
index 00000000..153c3936
--- /dev/null
+++ b/data/org.freedesktop.ModemManager1.conf.polkit
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 512
+
diff --git a/data/org.freedesktop.modem-manager.policy.in b/data/org.freedesktop.ModemManager1.policy.in
similarity index 86%
rename from data/org.freedesktop.modem-manager.policy.in
rename to data/org.freedesktop.ModemManager1.policy.in
index aab65bfb..65a0496e 100644
--- a/data/org.freedesktop.modem-manager.policy.in
+++ b/data/org.freedesktop.ModemManager1.policy.in
@@ -9,7 +9,7 @@
http://www.freedesktop.org/wiki/ModemManager
modem-manager
-
+
<_description>Control the Modem Manager daemon
<_message>System policy prevents controlling the Modem Manager.
@@ -18,7 +18,7 @@
-
+
<_description>Unlock and control a mobile broadband device
<_message>System policy prevents unlocking or controlling the mobile broadband device.
@@ -27,7 +27,7 @@
-
+
<_description>Request mobile broadband device identifying information
<_message>System policy prevents requesting identifying information from the mobile broadband device.
@@ -36,7 +36,7 @@
-
+
<_description>Add, modify, and delete mobile broadband contacts
<_message>System policy prevents adding, modifying, or deleting this device's contacts.
@@ -45,7 +45,7 @@
-
+
<_description>Send, save, modify, and delete text messages
<_message>System policy prevents sending or maniuplating this device's text messages.
@@ -54,7 +54,7 @@
-
+
<_description>Enable and view geographic location and positioning information
<_message>System policy prevents enabling or viewing geographic location information.
@@ -63,7 +63,7 @@
-
+
<_description>Query and utilize network information and services
<_message>System policy prevents querying or utilizing network information and services.
@@ -72,7 +72,7 @@
-
+
<_description>Query and manage firmware on a mobile broadband device
<_message>System policy prevents querying or managing this device's firmware.
diff --git a/data/org.freedesktop.ModemManager.service.in b/data/org.freedesktop.ModemManager1.service.in
similarity index 61%
rename from data/org.freedesktop.ModemManager.service.in
rename to data/org.freedesktop.ModemManager1.service.in
index 2b73ccea..529aed0c 100644
--- a/data/org.freedesktop.ModemManager.service.in
+++ b/data/org.freedesktop.ModemManager1.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
-Name=org.freedesktop.ModemManager
+Name=org.freedesktop.ModemManager1
Exec=@sbindir@/modem-manager
User=root