diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/ModemManager.png (renamed from data/modem-manager.png) | bin | 817 -> 817 bytes | |||
| -rw-r--r-- | data/org.freedesktop.ModemManager1.policy.in | 2 | ||||
| -rw-r--r-- | data/org.freedesktop.ModemManager1.service.in | 2 | ||||
| -rw-r--r-- | docs/man/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/man/ModemManager.8.in (renamed from docs/man/modem-manager.8.in) | 21 | ||||
| -rw-r--r-- | src/Makefile.am | 14 |
9 files changed, 25 insertions, 28 deletions
@@ -31,7 +31,7 @@ ModemManager.pc callouts/mm-modem-probe test/lsudev -src/modem-manager +src/ModemManager src/mm-daemon-enums-types.c src/mm-daemon-enums-types.h src/mm-serial-enums-types.c @@ -43,8 +43,6 @@ src/tests/test-qcdm-serial-port src/tests/test-at-serial-port src/tests/test-sms-part -policy/org.freedesktop.modem-manager.policy - cli/mmcli libqcdm/tests/test-qcdm @@ -88,7 +86,7 @@ docs/reference/api/html docs/reference/api/tmpl docs/reference/api/xml -docs/man/modem-manager.8 +docs/man/ModemManager.8 m4/gtk-doc.m4 m4/intltool.m4 diff --git a/configure.ac b/configure.ac index d36a7ad5..0d22e378 100644 --- a/configure.ac +++ b/configure.ac @@ -199,7 +199,7 @@ introspection/Makefile po/Makefile.in docs/Makefile docs/man/Makefile -docs/man/modem-manager.8 +docs/man/ModemManager.8 docs/reference/Makefile docs/reference/api/Makefile docs/reference/api/version.xml diff --git a/data/Makefile.am b/data/Makefile.am index 3a5b7d17..6010e006 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -29,7 +29,7 @@ dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) # Icon icondir=${datadir}/icons/hicolor/22x22/apps -icon_DATA = modem-manager.png +icon_DATA = ModemManager.png # Polkit diff --git a/data/modem-manager.png b/data/ModemManager.png Binary files differindex 386abd54..386abd54 100644 --- a/data/modem-manager.png +++ b/data/ModemManager.png diff --git a/data/org.freedesktop.ModemManager1.policy.in b/data/org.freedesktop.ModemManager1.policy.in index 2dd899f1..9f58e6a0 100644 --- a/data/org.freedesktop.ModemManager1.policy.in +++ b/data/org.freedesktop.ModemManager1.policy.in @@ -7,7 +7,7 @@ <vendor>ModemManager</vendor> <vendor_url>http://www.freedesktop.org/wiki/ModemManager</vendor_url> - <icon_name>modem-manager</icon_name> + <icon_name>ModemManager</icon_name> <action id="org.freedesktop.ModemManager1.Control"> <_description>Control the Modem Manager daemon</_description> diff --git a/data/org.freedesktop.ModemManager1.service.in b/data/org.freedesktop.ModemManager1.service.in index 529aed0c..4e3a273f 100644 --- a/data/org.freedesktop.ModemManager1.service.in +++ b/data/org.freedesktop.ModemManager1.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.freedesktop.ModemManager1 -Exec=@sbindir@/modem-manager +Exec=@sbindir@/ModemManager User=root diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 5fa6460a..fd0e1823 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -1,7 +1,7 @@ -man_MANS = modem-manager.8 +man_MANS = ModemManager.8 EXTRA_DIST = \ $(man_MANS) \ - modem-manager.8.in + ModemManager.8.in CLEANFILES = $(man_MANS) diff --git a/docs/man/modem-manager.8.in b/docs/man/ModemManager.8.in index f7bc04cd..4d6c9a3c 100644 --- a/docs/man/modem-manager.8.in +++ b/docs/man/ModemManager.8.in @@ -1,16 +1,16 @@ -.\" modem-manager(8) manual page +.\" ModemManager(8) manual page .\" .\" Copyright (C) 2011 Aleksander Morgado .\" .TH MODEMMANAGER "8" "31 October 2011" .SH NAME -modem-manager \- modem management daemon +ModemManager \- modem management daemon .SH SYNOPSIS -.B modem-manager [\-\-version] | [\-\-help] +.B ModemManager [\-\-version] | [\-\-help] .PP -.B modem-manager [\-\-debug] [\-\-log\-level=<level>] [\-\-log\-file=<filename>] [\-\-timestamps] [\-\-relative\-timestamps] +.B ModemManager [\-\-debug] [\-\-log\-level=<level>] [\-\-log\-file=<filename>] [\-\-timestamps] [\-\-relative\-timestamps] .SH DESCRIPTION -The modem-manager (a.k.a. ModemManager) daemon provides a unified high level API +The ModemManager daemon provides a unified high level API for communicating with (mobile broadband) modems. While the basic commands are standardized, the more advanced operations (like signal quality monitoring while connected) varies a lot. @@ -21,23 +21,23 @@ command line. The following options are supported: .TP .I "\-\-version" -Print the modem-manager software version and exit. +Print the ModemManager software version and exit. .TP .I "\-\-help" -Print modem-manager's available options and exit. +Print ModemManager's available options and exit. .TP .I "\-\-debug" -Runs modem-manager with "DEBUG" log level and without daemonizing. This is useful +Runs ModemManager with "DEBUG" log level and without daemonizing. This is useful for debugging, as it directs log output to the controlling terminal in addition to syslog. .TP .I "\-\-log\-level=<level>" -Sets how much information modem-manager sends to the log destination (usually +Sets how much information ModemManager sends to the log destination (usually syslog's "daemon" facility). By default, only informational, warning, and error messages are logged. Given level must be one of "ERR", "WARN", "INFO" or "DEBUG". .TP .I "\-\-log\-file=<filename>" -Specify location of the file where modem-manager will dump its log messages, +Specify location of the file where ModemManager will dump its log messages, instead of syslog. .TP .I "\-\-timestamps" @@ -49,4 +49,3 @@ Include timestamps, relative to the start time of the daemon, in the log output. .SH SEE ALSO .BR NetworkManager (8). - diff --git a/src/Makefile.am b/src/Makefile.am index f2348572..21b9fbf5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,9 +95,9 @@ mm-marshal.c: mm-marshal.list mm-marshal.h $(AM_V_GEN) echo "#include \"mm-marshal.h\"" > $@ && \ $(GLIB_GENMARSHAL) $< --prefix=mm_marshal --body >> $@ -sbin_PROGRAMS = modem-manager +sbin_PROGRAMS = ModemManager -modem_manager_CPPFLAGS = \ +ModemManager_CPPFLAGS = \ $(MM_CFLAGS) \ $(GUDEV_CFLAGS) \ -I$(top_srcdir) \ @@ -108,10 +108,10 @@ modem_manager_CPPFLAGS = \ -DPLUGINDIR=\"$(pkglibdir)\" if WITH_POLKIT -modem_manager_CPPFLAGS += $(POLKIT_CFLAGS) +ModemManager_CPPFLAGS += $(POLKIT_CFLAGS) endif -modem_manager_LDADD = \ +ModemManager_LDADD = \ $(MM_LIBS) \ $(GUDEV_LIBS) \ $(builddir)/libmodem-helpers.la \ @@ -119,10 +119,10 @@ modem_manager_LDADD = \ $(top_builddir)/libqcdm/src/libqcdm.la if WITH_POLKIT -modem_manager_LDADD += $(POLKIT_LIBS) +ModemManager_LDADD += $(POLKIT_LIBS) endif -modem_manager_SOURCES = \ +ModemManager_SOURCES = \ main.c \ mm-marshal.h \ mm-marshal.c \ @@ -188,7 +188,7 @@ modem_manager_SOURCES = \ mm-plugin-base.h if WITH_POLKIT -modem_manager_SOURCES += \ +ModemManager_SOURCES += \ mm-auth-provider-polkit.c \ mm-auth-provider-polkit.h endif |
