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
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
|
--- mate-control-center-1.26.0.old/configure.ac 2023-04-28 16:12:05.281295458 +0200
+++ mate-control-center-1.26.0/configure.ac 2023-04-28 16:48:44.374329792 +0200
@@ -84,30 +84,50 @@
AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
-dnl app indicator
-APPINDICATOR_PKG=appindicator3-0.1
+dnl app indicator (Ubuntu and Ayatana implementation)
+AYATANA_APPINDICATOR_PKG=ayatana-appindicator3-0.1
+UBUNTU_APPINDICATOR_PKG=appindicator3-0.1
+
+PKG_CHECK_EXISTS($AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED,
+ [have_appindicator_ayatana="yes"],
+ [have_appindicator_ayatana="no"])
+PKG_CHECK_EXISTS($UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED,
+ [have_appindicator_ubuntu="yes"],
+ [have_appindicator_ubuntu="no"])
AC_ARG_ENABLE(appindicator,
AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
[enable_appindicator=$enableval],
[enable_appindicator="auto"])
-if test x$enable_appindicator = xauto ; then
- PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
- enable_appindicator="yes",
- enable_appindicator="no")
+if test "x$enable_appindicator" == "xauto" &&
+ (test "x$have_appindicator_ayatana" == "xyes" ||
+ test "x$have_appindicator_ubuntu" == "xyes"); then
+ AC_MSG_NOTICE([Enabling AppIndicator support (as --enable-appindicator=auto was used).])
+ enable_appindicator="yes"
fi
-if test x$enable_appindicator = xyes ; then
- PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
- AC_MSG_ERROR([appindicator-0.1 is not installed]))
- PKG_CHECK_MODULES(APP_INDICATOR,
- $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
- AC_SUBST(APP_INDICATOR_CFLAGS)
- AC_SUBST(APP_INDICATOR_LIBS)
- AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
+if test "x$enable_appindicator" == "xyes"; then
+ if test "x$have_appindicator_ayatana" == "xyes"; then
+ AC_MSG_NOTICE([Buidling against Ayatana AppIndicator.])
+ PKG_CHECK_MODULES(AYATANA_APPINDICATOR,
+ [$AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
+ [AC_DEFINE(HAVE_AYATANA_APPINDICATOR, 1, [Have Ayatana AppIndicator])])
+ AC_SUBST(AYATANA_APPINDICATOR_CFLAGS)
+ AC_SUBST(AYATANA_APPINDICATOR_LIBS)
+ elif test "x$have_appindicator_ubuntu" == "xyes"; then
+ AC_MSG_NOTICE([Buidling against Ubuntu AppIndicator.])
+ PKG_CHECK_MODULES(UBUNTU_APPINDICATOR,
+ [$UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
+ [AC_DEFINE(HAVE_UBUNTU_APPINDICATOR, 1, [Have Ubuntu AppIndicator])])
+ AC_SUBST(UBUNTU_APPINDICATOR_CFLAGS)
+ AC_SUBST(UBUNTU_APPINDICATOR_LIBS)
+ else
+ AC_MSG_ERROR([Neither Ayatana AppIndicator nor Ubuntu AppIndicator library is present, but you enabled AppIndicator support.])
+ fi
fi
-AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
+AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes)
+AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes)
dnl keyboard-properties-capplet
savecppflags=$CPPFLAGS
@@ -322,7 +342,10 @@
Warning flags: ${WARN_CFLAGS}
Linker flags: ${LDFLAGS}
- Appindicator: ${enable_appindicator}
+ AppIndicator enabled: ${enable_appindicator}
+ Ayatana AppIndicator (preferred) ${have_appindicator_ayatana}
+ Ubuntu AppIndicator (legacy) ${have_appindicator_ubuntu}
+
Libmate-slab: ${have_libmateslab}
Accountsservice: ${have_accountsservice}
Native Language support: ${USE_NLS}
--- mate-control-center-1.26.0.old/typing-break/drwright.c 2023-04-28 16:12:05.282295452 +0200
+++ mate-control-center-1.26.0/typing-break/drwright.c 2023-04-28 16:27:03.082651572 +0200
@@ -30,9 +30,11 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
-#ifdef HAVE_APP_INDICATOR
-#include <libappindicator/app-indicator.h>
-#endif /* HAVE_APP_INDICATOR */
+#if defined(HAVE_AYATANA_APPINDICATOR)
+# include <libayatana-appindicator/app-indicator.h>
+#elif defined(HAVE_UBUNTU_APPINDICATOR)
+# include <libappindicator/app-indicator.h>
+#endif
#define MATE_DESKTOP_USE_UNSTABLE_API
#include <libmate-desktop/mate-desktop-utils.h>
@@ -43,11 +45,11 @@
#include "drw-utils.h"
#include "drw-timer.h"
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
#define BLINK_TIMEOUT 200
#define BLINK_TIMEOUT_MIN 120
#define BLINK_TIMEOUT_FACTOR 100
-#endif /* HAVE_APP_INDICATOR */
+#endif
typedef enum {
STATE_START,
@@ -59,10 +61,10 @@
STATE_BREAK_DONE
} DrwState;
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
#define TYPING_MONITOR_ACTIVE_ICON "bar-green"
#define TYPING_MONITOR_ATTENTION_ICON "bar-red"
-#endif /* HAVE_APP_INDICATOR */
+#endif
struct _DrWright {
/* Widgets. */
@@ -88,7 +90,7 @@
gboolean enabled;
guint clock_timeout_id;
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
AppIndicator *indicator;
#else
guint blink_timeout_id;
@@ -102,7 +104,7 @@
cairo_surface_t *green_bar;
cairo_surface_t *disabled_bar;
GdkPixbuf *composite_bar;
-#endif /* HAVE_APP_INDICATOR */
+#endif
GtkWidget *warn_dialog;
};
@@ -124,11 +126,11 @@
DrWright *dr);
static void popup_about_cb (GtkAction *action,
DrWright *dr);
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
static void init_app_indicator (DrWright *dr);
#else
static void init_tray_icon (DrWright *dr);
-#endif /* HAVE_APP_INDICATOR */
+#endif
static GList * create_secondary_break_windows (void);
static const GtkActionEntry actions[] = {
@@ -147,7 +149,7 @@
dr->break_time = 10;
}
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
static void
update_app_indicator (DrWright *dr)
{
@@ -304,32 +306,32 @@
return FALSE;
}
-#endif /* HAVE_APP_INDICATOR */
+#endif
static void
start_blinking (DrWright *dr)
{
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
if (!dr->blink_timeout_id) {
dr->blink_on = TRUE;
blink_timeout_cb (dr);
}
/*gtk_widget_show (GTK_WIDGET (dr->icon));*/
-#endif /* HAVE_APP_INDICATOR */
+#endif
}
static void
stop_blinking (DrWright *dr)
{
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
if (dr->blink_timeout_id) {
g_source_remove (dr->blink_timeout_id);
dr->blink_timeout_id = 0;
}
/*gtk_widget_hide (GTK_WIDGET (dr->icon));*/
-#endif /* HAVE_APP_INDICATOR */
+#endif
}
static gboolean
@@ -397,9 +399,9 @@
dr->break_window = NULL;
}
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
set_status_icon (dr->icon, dr->neutral_bar);
-#endif /* HAVE_APP_INDICATOR */
+#endif
dr->save_last_time = 0;
@@ -437,9 +439,9 @@
}
stop_blinking (dr);
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
set_status_icon (dr->icon, dr->red_bar);
-#endif /* HAVE_APP_INDICATOR */
+#endif
drw_timer_start (dr->timer);
@@ -480,9 +482,9 @@
case STATE_BREAK_DONE_SETUP:
stop_blinking (dr);
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
set_status_icon (dr->icon, dr->green_bar);
-#endif /* HAVE_APP_INDICATOR */
+#endif
dr->state = STATE_BREAK_DONE;
break;
@@ -498,11 +500,11 @@
dr->last_elapsed_time = elapsed_time;
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
update_app_indicator (dr);
#else
update_icon (dr);
-#endif /* HAVE_APP_INDICATOR */
+#endif
return TRUE;
}
@@ -512,45 +514,45 @@
{
gint min;
gchar *str;
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
GtkWidget *item;
-#endif /* HAVE_APP_INDICATOR */
+#endif
if (!dr->enabled) {
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
app_indicator_set_status (dr->indicator,
APP_INDICATOR_STATUS_PASSIVE);
#else
gtk_status_icon_set_tooltip_text (dr->icon,
_("Disabled"));
-#endif /* HAVE_APP_INDICATOR */
+#endif
return TRUE;
}
min = get_time_left (dr);
if (min >= 1) {
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
str = g_strdup_printf (_("Take a break now (next in %dm)"), min);
#else
str = g_strdup_printf (ngettext("%d minute until the next break",
"%d minutes until the next break",
min), min);
-#endif /* HAVE_APP_INDICATOR */
+#endif
} else {
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
str = g_strdup_printf (_("Take a break now (next in less than one minute)"));
#else
str = g_strdup_printf (_("Less than one minute until the next break"));
-#endif /* HAVE_APP_INDICATOR */
+#endif
}
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
item = gtk_ui_manager_get_widget (dr->ui_manager, "/Pop/TakeABreak");
gtk_menu_item_set_label (GTK_MENU_ITEM (item), str);
#else
gtk_status_icon_set_tooltip_text (dr->icon, str);
-#endif /* HAVE_APP_INDICATOR */
+#endif
g_free (str);
@@ -665,7 +667,7 @@
NULL);
}
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
static void
popup_menu_cb (GtkWidget *widget,
guint button,
@@ -684,7 +686,7 @@
0,
gtk_get_current_event_time ());
}
-#endif /* HAVE_APP_INDICATOR */
+#endif
static void
break_window_done_cb (GtkWidget *window,
@@ -724,11 +726,11 @@
drw_timer_start (dr->timer);
maybe_change_state (dr);
update_status (dr);
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
update_app_indicator (dr);
#else
update_icon (dr);
-#endif /* HAVE_APP_INDICATOR */
+#endif
}
static void
@@ -745,7 +747,7 @@
dr->secondary_break_windows = NULL;
}
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
static void
init_app_indicator (DrWright *dr)
{
@@ -792,7 +794,7 @@
G_CALLBACK (popup_menu_cb),
dr);
}
-#endif /* HAVE_APP_INDICATOR */
+#endif
static GList *
create_secondary_break_windows (void)
@@ -891,7 +893,7 @@
G_CALLBACK (activity_detected_cb),
dr);
-#ifdef HAVE_APP_INDICATOR
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
init_app_indicator (dr);
#else
dr->neutral_bar = cairo_image_surface_create_from_png (IMAGEDIR "/bar.png");
@@ -900,7 +902,7 @@
dr->disabled_bar = cairo_image_surface_create_from_png (IMAGEDIR "/bar-disabled.png");
init_tray_icon (dr);
-#endif /* HAVE_APP_INDICATOR */
+#endif
g_timeout_add_seconds (12,
(GSourceFunc) update_status,
--- mate-control-center-1.26.0.old/typing-break/Makefile.am 2023-04-28 16:12:05.283295447 +0200
+++ mate-control-center-1.26.0/typing-break/Makefile.am 2023-04-28 16:30:45.343491923 +0200
@@ -32,9 +32,14 @@
mate_typing_monitor_LDADD += @LIBCANBERRA_GTK_LIBS@
endif
-if HAVE_APP_INDICATOR
- mate_typing_monitor_CFLAGS += -DHAVE_APP_INDICATOR @APP_INDICATOR_CFLAGS@
- mate_typing_monitor_LDADD += @APP_INDICATOR_LIBS@
+if HAVE_AYATANA_APPINDICATOR
+ mate_typing_monitor_CFLAGS += -DHAVE_AYATANA_APPINDICATOR @AYATANA_APPINDICATOR_CFLAGS@
+ mate_typing_monitor_LDADD += @AYATANA_APPINDICATOR_LIBS@
+endif
+
+if HAVE_UBUNTU_APPINDICATOR
+ mate_typing_monitor_CFLAGS += -DHAVE_UBUNTU_APPINDICATOR @UBUNTU_APPINDICATOR_CFLAGS@
+ mate_typing_monitor_LDADD += @UBUNTU_APPINDICATOR_LIBS@
endif
imagedir = $(pkgdatadir)/pixmaps
--- mate-control-center-1.26.0.old/typing-break/main.c 2023-04-28 16:12:05.282295452 +0200
+++ mate-control-center-1.26.0/typing-break/main.c 2023-04-28 16:32:09.781067404 +0200
@@ -31,7 +31,7 @@
gboolean debug = FALSE;
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
static gboolean
have_tray (void)
{
@@ -50,7 +50,7 @@
return FALSE;
}
}
-#endif /* HAVE_APP_INDICATOR */
+#endif
int
main (int argc, char *argv[])
@@ -98,7 +98,7 @@
return 0;
}
-#ifndef HAVE_APP_INDICATOR
+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
if (!no_check && !have_tray ()) {
GtkWidget *dialog;
@@ -116,7 +116,7 @@
gtk_widget_destroy (dialog);
}
-#endif /* HAVE_APP_INDICATOR */
+#endif
drwright_new ();
|
