charpick: Rename binary and manpage. fixes #103

Avoid file collision with gnome applets.

5 files changed, 14 insertions, 14 deletions

diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 365fae44..b58c4c98 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -8,13 +8,13 @@ AM_CPPFLAGS =					\
 	$(MATEDESKTOP_CFLAGS)		\
 	$(GUCHARMAP_CFLAGS)
 
-libexec_PROGRAMS = charpick-applet
+libexec_PROGRAMS = mate-charpick-applet
 
-charpick_applet_SOURCES = charpick.c \
+mate_charpick_applet_SOURCES = charpick.c \
                           charpick.h \
                           properties.c
 
-charpick_applet_LDADD = \
+mate_charpick_applet_LDADD = \
 		       $(MATE_APPLETS4_LIBS)	\
 		       $(MATEDESKTOP_LIBS)	\
 		       $(GUCHARMAP_LIBS)
diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
index f7a9d2b0..3642f058 100644
--- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
+++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=CharpickerAppletFactory
-Location=@LIBEXECDIR@/charpick-applet
+Location=@LIBEXECDIR@/mate-charpick-applet
 _Name=Charpicker Applet Factory
 _Description=Charpicker Applet Factory
 
diff --git a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
index bfca2847..531430b2 100644
--- a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
+++ b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.CharpickerAppletFactory
-Exec=@LIBEXECDIR@/charpick-applet
+Exec=@LIBEXECDIR@/mate-charpick-applet
diff --git a/man/Makefile.am b/man/Makefile.am
index 6eb58659..ffc75f1a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
 man_MANS = \
-	charpick_applet.1	\
+	mate-charpick-applet.1	\
 	cpufreq-selector.1	\
 	drivemount_applet.1	\
 	geyes_applet.1		\
diff --git a/man/charpick_applet.1 b/man/mate-charpick-applet.1
index 13a452e2..75862564 100644
--- a/man/charpick_applet.1
+++ b/man/mate-charpick-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 "CHARPICK_APPLET" "1" "10 februar 2002" "" ""
+.TH "MATE-CHARPICK-APPLET" "1" "10 februar 2002" "" ""
 .SH NAME
-charpick_applet \- Character Picker Applet for the MATE panel.
+mate-charpick-applet \- Character Picker Applet for the MATE panel.
 .SH SYNOPSIS
 
-\fBcharpick_applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID] \fB\fR ]
+\fBmate-charpick-applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID] \fB\fR ]
 
 .SH "DESCRIPTION"
 .PP
-\fBcharpick_applet\fR allows you to easily write many
+\fBmate-charpick-applet\fR allows you to easily write many
 characters which are not available on standard keyboards such as
 accented characters, certain mathematical symbols and punctuation,
 and some other special symbols.
@@ -24,7 +24,7 @@ choose Applets->Utility->Character Picker.
 \fB--activate-goad-server\fR
 (Internal use only) GOAD server ID to activate.
 
-GOAD_ID is usually the applet name [\fBcharpick_applet\fR]
+GOAD_ID is usually the applet name [\fBmate-charpick-applet\fR]
 .SH "AUTHOR"
 .PP
 This manual page was written by Christian Marillat <[email protected]> for