summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe <[email protected]>2013-02-23 15:43:50 +0100
committerStefano Karapetsas <[email protected]>2013-02-23 15:43:50 +0100
commitff2194b0b749821e236b8e459cd4030e7375eef5 (patch)
treef0d7fe6cadbedf287d159d5115532846c9ac8a1e
parent044827e06e5d6cc1f3a1bc7d81d201d04a6541c7 (diff)
downloadmate-applets-ff2194b0b749821e236b8e459cd4030e7375eef5.tar.bz2
mate-applets-ff2194b0b749821e236b8e459cd4030e7375eef5.tar.xz
Rename cpufreq applet not to file conflict with GNOME
-rw-r--r--cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in2
-rw-r--r--cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in2
-rw-r--r--cpufreq/src/Makefile.am6
3 files changed, 5 insertions, 5 deletions
diff --git a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in b/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in
index d76b362e..45a9f5ad 100644
--- a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in
+++ b/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=CPUFreqAppletFactory
-Location=@LIBEXECDIR@/cpufreq-applet
+Location=@LIBEXECDIR@/mate-cpufreq-applet
_Name=CPU Frequency Scaling Monitor
_Description=Monitor the CPU Frequency Scaling
diff --git a/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in
index d1699748..a04c672b 100644
--- a/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in
+++ b/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.CPUFreqAppletFactory
-Exec=@LIBEXECDIR@/cpufreq-applet
+Exec=@LIBEXECDIR@/mate-cpufreq-applet
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index d51e1529..3f4162a9 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -10,13 +10,13 @@ INCLUDES = \
$(LIBGLADE_CFLAGS) \
$(DBUS_CFLAGS)
-libexec_PROGRAMS = cpufreq-applet
+libexec_PROGRAMS = mate-cpufreq-applet
if HAVE_LIBCPUFREQ
cpufreq_files=cpufreq-monitor-libcpufreq.c cpufreq-monitor-libcpufreq.h
endif
-cpufreq_applet_SOURCES = \
+mate_cpufreq_applet_SOURCES = \
cpufreq-applet.c cpufreq-applet.h \
cpufreq-utils.c cpufreq-utils.h \
cpufreq-prefs.c cpufreq-prefs.h \
@@ -29,7 +29,7 @@ cpufreq_applet_SOURCES = \
$(cpufreq_files) \
cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-cpufreq_applet_LDADD = \
+mate_cpufreq_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
$(LIBGLADE_LIBS) \
$(LIBCPUFREQ_LIBS) \