summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMotoHoss <[email protected]>2014-10-12 14:15:08 -0500
committerinfirit <[email protected]>2014-10-15 19:11:50 +0200
commit6ae66da5cfa159067868269c8b601eb6902c3613 (patch)
treea9830b33068ce930b2e1d702bbe3c0e4af28d593
parent9eb0389374df736e902485f6f5889455da4c7af1 (diff)
downloadmate-applets-6ae66da5cfa159067868269c8b601eb6902c3613.tar.bz2
mate-applets-6ae66da5cfa159067868269c8b601eb6902c3613.tar.xz
multiload: Rename binary and manpage. fixes #103
Avoid file collision with gnome applets.
-rw-r--r--man/Makefile.am4
-rw-r--r--man/mate-multiload-applet.1 (renamed from man/multiload_applet.1)14
-rw-r--r--multiload/Makefile.am6
-rw-r--r--multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in2
-rw-r--r--multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in2
5 files changed, 14 insertions, 14 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index 0343a20a..ad1cdd15 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -4,8 +4,8 @@ man_MANS = \
mate-drivemount-applet.1 \
mate-geyes-applet.1 \
mate-invest-chart.1 \
- mateweather.1 \
- multiload_applet.1
+ mateweather.1 \
+ mate-multiload-applet.1
EXTRA_DIST = $(man_MANS)
diff --git a/man/multiload_applet.1 b/man/mate-multiload-applet.1
index d6c90b87..04e93d11 100644
--- a/man/multiload_applet.1
+++ b/man/mate-multiload-applet.1
@@ -1,18 +1,18 @@
-.\" This manpage has been automatically generated by docbook2man
+.\" This manpage has been automatically generated by docbook2man
.\" from a DocBook document. This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
-.\" Please send any bug reports, improvements, comments, patches,
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <[email protected]>.
-.TH "MULTILOAD_APPLET" "1" "10 februar 2002" "" ""
+.TH "MATE-MULTILOAD-APPLET" "1" "10 februar 2002" "" ""
.SH NAME
-multiload_applet \- Multiload (cpu, load average, memory, net, swap) applet for the MATE panel.
+mate-multiload-applet \- Multiload (cpu, load average, memory, net, swap) applet for the MATE panel.
.SH SYNOPSIS
-\fBmultiload_applet\fR [ \fB--activate-goad-server\fI[=GOAD_ID]\fB\fR ]
+\fBmate-multiload-applet\fR [ \fB--activate-goad-server\fI[=GOAD_ID]\fB\fR ]
.SH "DESCRIPTION"
.PP
-\fBmultiload_applet\fR Contains 5 applets.
+\fBmate-multiload-applet\fR Contains 5 applets.
.PP
CPU Load Applet. To add this applet to a Panel, right-click on the
Panel and choose Applets->Monitors->CPULoad
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 43b238e4..4241b48b 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = \
$(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS)
-libexec_PROGRAMS = multiload-applet
+libexec_PROGRAMS = mate-multiload-applet
-multiload_applet_SOURCES = \
+mate_multiload_applet_SOURCES = \
global.h \
linux-proc.h \
load-graph.h \
@@ -22,7 +22,7 @@ multiload_applet_SOURCES = \
autoscaler.c \
autoscaler.h
-multiload_applet_LDADD = \
+mate_multiload_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
$(GTOP_APPLETS_LIBS) \
$(MATEDESKTOP_LIBS) \
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
index 584b0c03..ad17fffe 100644
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
+++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=MultiLoadAppletFactory
-Location=@LIBEXECDIR@/multiload-applet
+Location=@LIBEXECDIR@/mate-multiload-applet
Name=MultiLoad Applet Factory
Description=Factory for creating the load applet.
diff --git a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
index f592f048..d4c7da3c 100644
--- a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
+++ b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.MultiLoadAppletFactory
-Exec=@LIBEXECDIR@/multiload-applet
+Exec=@LIBEXECDIR@/mate-multiload-applet