1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
Description: Rename binaries to not conflict with indicator-applet
Author: Stefano Karapetsas <stefano@karapetsas.com>
Forwarded: not-needed
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
---
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
-Location=@LIBEXECDIR@/indicator-applet
+Location=@LIBEXECDIR@/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
-Location=@LIBEXECDIR@/indicator-applet-appmenu
+Location=@LIBEXECDIR@/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
-Location=@LIBEXECDIR@/indicator-applet-complete
+Location=@LIBEXECDIR@/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
-Exec=@LIBEXECDIR@/indicator-applet-appmenu
+Exec=@LIBEXECDIR@/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
-Exec=@LIBEXECDIR@/indicator-applet-complete
+Exec=@LIBEXECDIR@/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
-Exec=@LIBEXECDIR@/indicator-applet
+Exec=@LIBEXECDIR@/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
--
cgit
|
