summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-06-25 13:45:56 +0200
committerinfirit <[email protected]>2014-09-25 12:27:12 +0200
commit2a0f259289472fbdd69f021aabb5b5ac48249403 (patch)
tree2f60768eb354053a4316e04f01a5e57d303b6708
parent9857351e0574aa10889a5172d05ba6c9a28c8562 (diff)
downloadmate-indicator-applet-2a0f259289472fbdd69f021aabb5b5ac48249403.tar.bz2
mate-indicator-applet-2a0f259289472fbdd69f021aabb5b5ac48249403.tar.xz
Rename binaries to not conflict with indicator-applet
-rw-r--r--data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in2
-rw-r--r--data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in2
-rw-r--r--data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in2
-rw-r--r--data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in2
-rw-r--r--data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in2
-rw-r--r--data/org.mate.panel.applet.IndicatorAppletFactory.service.in2
-rw-r--r--src/Makefile.am33
7 files changed, 24 insertions, 21 deletions
diff --git a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
index b6db5b4..1f67e56 100644
--- a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
+++ b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=IndicatorAppletFactory
[email protected]@/indicator-applet
[email protected]@/mate-indicator-applet
Name=Indicator Applet Factory
Description=Indicator Applet Factory
diff --git a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
index ccce1ee..9147727 100644
--- a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
+++ b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=IndicatorAppletAppmenuFactory
[email protected]@/indicator-applet-appmenu
[email protected]@/mate-indicator-applet-appmenu
Name=Indicator Applet Appmenu Factory
Description=Indicator Applet Appmenu Factory
diff --git a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
index eb53fa3..9a34be6 100644
--- a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
+++ b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=IndicatorAppletCompleteFactory
[email protected]@/indicator-applet-complete
[email protected]@/mate-indicator-applet-complete
Name=Indicator Applet Complete Factory
Description=Indicator Applet Complete Factory
diff --git a/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
index fd32342..6985354 100644
--- a/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
+++ b/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.IndicatorAppletAppmenuFactory
[email protected]@/indicator-applet-appmenu
[email protected]@/mate-indicator-applet-appmenu
diff --git a/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
index 27575a3..24f1f83 100644
--- a/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
+++ b/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.IndicatorAppletCompleteFactory
[email protected]@/indicator-applet-complete
[email protected]@/mate-indicator-applet-complete
diff --git a/data/org.mate.panel.applet.IndicatorAppletFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
index 97d81cb..0339d51 100644
--- a/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
+++ b/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.IndicatorAppletFactory
[email protected]@/indicator-applet
[email protected]@/mate-indicator-applet
diff --git a/src/Makefile.am b/src/Makefile.am
index a1428b2..1b66f5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
libexec_PROGRAMS = \
- indicator-applet \
- indicator-applet-appmenu \
- indicator-applet-complete
+ mate-indicator-applet \
+ mate-indicator-applet-appmenu \
+ mate-indicator-applet-complete
-indicator_applet_CFLAGS = \
+mate_indicator_applet_CFLAGS = \
-DG_LOG_DOMAIN=\""Indicator-Applet"\" \
-DDATADIR=\""$(datadir)"\" \
-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
@@ -14,18 +14,19 @@ indicator_applet_CFLAGS = \
$(APPLET_CFLAGS) \
$(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
-indicator_applet_SOURCES = \
+mate_indicator_applet_SOURCES = \
applet-main.c \
eggaccelerators.c \
eggaccelerators.h \
tomboykeybinder.c \
tomboykeybinder.h
-indicator_applet_LDADD = \
+mate_indicator_applet_LDADD = \
$(APPLET_LIBS) \
- $(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
+ $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
+ -lX11
-indicator_applet_appmenu_CFLAGS = \
+mate_indicator_applet_appmenu_CFLAGS = \
-DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
-DDATADIR=\""$(datadir)"\" \
-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
@@ -35,18 +36,19 @@ indicator_applet_appmenu_CFLAGS = \
$(APPLET_CFLAGS) \
$(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
-indicator_applet_appmenu_SOURCES = \
+mate_indicator_applet_appmenu_SOURCES = \
applet-main.c \
eggaccelerators.c \
eggaccelerators.h \
tomboykeybinder.c \
tomboykeybinder.h
-indicator_applet_appmenu_LDADD = \
+mate_indicator_applet_appmenu_LDADD = \
$(APPLET_LIBS) \
- $(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
+ $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
+ -lX11
-indicator_applet_complete_CFLAGS = \
+mate_indicator_applet_complete_CFLAGS = \
-DG_LOG_DOMAIN=\""Indicator-Applet-Complete"\" \
-DDATADIR=\""$(datadir)"\" \
-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
@@ -56,13 +58,14 @@ indicator_applet_complete_CFLAGS = \
$(APPLET_CFLAGS) \
$(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
-indicator_applet_complete_SOURCES = \
+mate_indicator_applet_complete_SOURCES = \
applet-main.c \
eggaccelerators.c \
eggaccelerators.h \
tomboykeybinder.c \
tomboykeybinder.h
-indicator_applet_complete_LDADD = \
+mate_indicator_applet_complete_LDADD = \
$(APPLET_LIBS) \
- $(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
+ $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
+ -lX11