Attachment #2515 for bug #4832

View | Details | Raw Unified | Return to bug 4832
Collapse All | Expand All

Lines 353-355 contributors (in addition to the above; based on Changelog) Link Here

(-)a/AUTHORS (+1 lines)
353	Paul Wolneykien	353	Paul Wolneykien
354	Quentin Rameau	354	Quentin Rameau
355	MatN	355	MatN
		356	Jan Willamowius

Lines 1213-1219 dnl Fancy: Webkit, curl, optionally libsoup-gnome Link Here

(-)a/configure.ac (-1 / +14 lines)
1213	dnl Litehtml a C++ compiler, glib, cairo, fontconfig, gumbo, curl	1213	dnl Litehtml a C++ compiler, glib, cairo, fontconfig, gumbo, curl
1214	dnl Libravatar: libcurl	1214	dnl Libravatar: libcurl
1215	dnl Notification: optionally libnotify unity/messaging-menu	1215	dnl Notification: optionally libnotify unity/messaging-menu
1216	dnl libcanberra_gtk3 hotkey	1216	dnl libcanberra_gtk3 hotkey libayatana-appindicator3
1217	dnl Pdf-Viewer: libpoppler	1217	dnl Pdf-Viewer: libpoppler
1218	dnl Perl: sed perl	1218	dnl Perl: sed perl
1219	dnl PGP/Core: libgpgme	1219	dnl PGP/Core: libgpgme
Lines 1420-1425 fi Link Here
1420	AC_SUBST(unity_CFLAGS)	1420	AC_SUBST(unity_CFLAGS)
1421	AC_SUBST(unity_LIBS)	1421	AC_SUBST(unity_LIBS)
1422		1422
		1423	dnl ayatana app indicator *******************************************************
		1424	PKG_CHECK_MODULES(ayatanaappindicator, ayatana-appindicator3-0.1, HAVE_AYATANAAPPINDICATOR=yes, HAVE_AYATANAAPPINDICATOR=no)
		1425	if test x"$HAVE_AYATANAAPPINDICATOR" = xyes; then
		1426	AC_DEFINE(NOTIFICATION_AYATANA_INDICATOR, 1, [Activate support for Atayana app indicator])
		1427	fi
		1428	AC_SUBST(ayatanaappindicator_CFLAGS)
		1429	AC_SUBST(ayatanaappindicator_LIBS)
		1430
1423	dnl hotkeys ********************************************************************	1431	dnl hotkeys ********************************************************************
1424	PKG_CHECK_MODULES(CM_NP_HOTKEY, [gio-2.0 >= 2.15.6 gio-unix-2.0 >= 2.15.6], HAVE_HOTKEYS=yes, HAVE_HOTKEYS=no)	1432	PKG_CHECK_MODULES(CM_NP_HOTKEY, [gio-2.0 >= 2.15.6 gio-unix-2.0 >= 2.15.6], HAVE_HOTKEYS=yes, HAVE_HOTKEYS=no)
1425	if test x"$HAVE_HOTKEYS" = xyes; then	1433	if test x"$HAVE_HOTKEYS" = xyes; then
Lines 1739-1744 if test x"$enable_notification_plugin" != xno; then Link Here
1739	else	1747	else
1740	notification_missing_dependencies="$notification_missing_dependencies unity/messaging-menu"	1748	notification_missing_dependencies="$notification_missing_dependencies unity/messaging-menu"
1741	fi	1749	fi
		1750	if test x"$HAVE_AYATANAAPPINDICATOR" = xyes; then
		1751	notification_features="$notification_features libayatana-appindicator3"
		1752	else
		1753	notification_missing_dependencies="$notification_missing_dependencies libayatana-appindicator3"
		1754	fi
1742	if test x"$HAVE_LIBNOTIFY" = xyes; then	1755	if test x"$HAVE_LIBNOTIFY" = xyes; then
1743	notification_features="$notification_features libnotify"	1756	notification_features="$notification_features libnotify"
1744	else	1757	else

Lines 126-131 src/plugins/managesieve/sieve_manager.c Link Here

(-)a/po/POTFILES.in (+1 lines)
126	src/plugins/managesieve/sieve_plugin.c	126	src/plugins/managesieve/sieve_plugin.c
127	src/plugins/managesieve/sieve_prefs.c	127	src/plugins/managesieve/sieve_prefs.c
128	src/plugins/newmail/newmail.c	128	src/plugins/newmail/newmail.c
		129	src/plugins/notification/notification_ayatana_indicator.c
129	src/plugins/notification/notification_banner.c	130	src/plugins/notification/notification_banner.c
130	src/plugins/notification/notification_foldercheck.c	131	src/plugins/notification/notification_foldercheck.c
131	src/plugins/notification/notification_lcdproc.c	132	src/plugins/notification/notification_lcdproc.c

Lines 336-341 static char *CONTRIBS_LIST[] = { Link Here

(-)a/src/gtk/authors.h (+1 lines)
336	"Rafal Weglarz",	336	"Rafal Weglarz",
337	"Florian Weimer",	337	"Florian Weimer",
338	"Martin Wicke",	338	"Martin Wicke",
		339	"Jan Willamowius",
339	"Paul Wolneykien",	340	"Paul Wolneykien",
340	"Bob Woodside",	341	"Bob Woodside",
341	"YAMAGUCHI",	342	"YAMAGUCHI",

Lines 1-4 Link Here

(-)a/src/plugins/notification/Makefile.am (-1 / +5 lines)
1	# Copyright 1999-2022 the Claws Mail team.	1	# Copyright 1999-2024 the Claws Mail team.
2	# This file is part of Claws Mail package, and distributed under the	2	# This file is part of Claws Mail package, and distributed under the
3	# terms of the General Public License version 3 (or later).	3	# terms of the General Public License version 3 (or later).
4	# See COPYING file for license details.	4	# See COPYING file for license details.
Lines 40-45 notification_la_LIBADD = $(plugin_libadd) \ Link Here
40	$(libnotify_LIBS) \	40	$(libnotify_LIBS) \
41	$(unity_LIBS) \	41	$(unity_LIBS) \
42	$(libcanberra_gtk3_LIBS) \	42	$(libcanberra_gtk3_LIBS) \
		43	$(ayatanaappindicator_LIBS) \
43	$(hotkey_lib_path)	44	$(hotkey_lib_path)
44		45
45	notification_la_CPPFLAGS = \	46	notification_la_CPPFLAGS = \
Lines 48-59 notification_la_CPPFLAGS = \ Link Here
48	$(GLIB_CFLAGS) \	49	$(GLIB_CFLAGS) \
49	$(GTK_CFLAGS) \	50	$(GTK_CFLAGS) \
50	$(ENCHANT_CFLAGS) \	51	$(ENCHANT_CFLAGS) \
		52	$(ayatanaappindicator_CFLAGS) \
51	$(libnotify_CFLAGS) \	53	$(libnotify_CFLAGS) \
52	$(unity_CFLAGS) \	54	$(unity_CFLAGS) \
53	$(libcanberra_gtk3_CFLAGS) \	55	$(libcanberra_gtk3_CFLAGS) \
54	-Wall	56	-Wall
55		57
56	notification_la_SOURCES = \	58	notification_la_SOURCES = \
		59	notification_ayatana_indicator.c \
		60	notification_ayatana_indicator.h \
57	notification_banner.c \	61	notification_banner.c \
58	notification_banner.h \	62	notification_banner.h \
59	notification_command.c \	63	notification_command.c \

Lines 38-43 Link Here

(-)a/src/plugins/notification/notification_core.c (+6 lines)
38	#ifdef HAVE_LIBCANBERRA_GTK	38	#ifdef HAVE_LIBCANBERRA_GTK
39	# include <canberra-gtk.h>	39	# include <canberra-gtk.h>
40	#endif	40	#endif
		41	#ifdef NOTIFICATION_AYATANA_INDICATOR
		42	# include "notification_ayatana_indicator.h"
		43	#endif
41		44
42	typedef struct {	45	typedef struct {
43	GSList *collected_msgs;	46	GSList *collected_msgs;
Lines 125-130 void notification_update_msg_counts(FolderItem *removed_item) Link Here
125	#ifdef NOTIFICATION_TRAYICON	128	#ifdef NOTIFICATION_TRAYICON
126	notification_update_trayicon();	129	notification_update_trayicon();
127	#endif	130	#endif
		131	#ifdef NOTIFICATION_AYATANA_INDICATOR
		132	notification_update_ayatana_indicator();
		133	#endif
128	#ifdef NOTIFICATION_INDICATOR	134	#ifdef NOTIFICATION_INDICATOR
129	notification_update_indicator();	135	notification_update_indicator();
130	#endif	136	#endif

Lines 37-42 Link Here

(-)a/src/plugins/notification/notification_plugin.c (-1 / +8 lines)
37	#include "notification_plugin.h"	37	#include "notification_plugin.h"
38	#include "notification_core.h"	38	#include "notification_core.h"
39	#include "notification_prefs.h"	39	#include "notification_prefs.h"
		40	#include "notification_ayatana_indicator.h"
40	#include "notification_banner.h"	41	#include "notification_banner.h"
41	#include "notification_lcdproc.h"	42	#include "notification_lcdproc.h"
42	#include "notification_trayicon.h"	43	#include "notification_trayicon.h"
Lines 162-168 static gboolean my_folder_item_update_hook(gpointer source, gpointer data) Link Here
162	if (folder_has_parent_of_type(update_data->item, F_DRAFT))	163	if (folder_has_parent_of_type(update_data->item, F_DRAFT))
163	return FALSE;	164	return FALSE;
164		165
165	#if defined(NOTIFICATION_LCDPROC) \|\| defined(NOTIFICATION_TRAYICON) \|\| defined(NOTIFICATION_INDICATOR)	166	#if defined(NOTIFICATION_LCDPROC) \|\| defined(NOTIFICATION_TRAYICON) \|\| defined(NOTIFICATION_AYATANA_INDICATOR) \|\| defined(NOTIFICATION_INDICATOR)
166	notification_update_msg_counts(NULL);	167	notification_update_msg_counts(NULL);
167	#else	168	#else
168	if(notify_config.urgency_hint_new \|\| notify_config.urgency_hint_unread)	169	if(notify_config.urgency_hint_new \|\| notify_config.urgency_hint_unread)
Lines 326-331 gint plugin_init(gchar **error) Link Here
326		327
327	notify_gtk_init();	328	notify_gtk_init();
328		329
		330	#ifdef NOTIFICATION_AYATANA_INDICATOR
		331	notification_ayatana_indicator_enable();
		332	#endif
329	#ifdef NOTIFICATION_INDICATOR	333	#ifdef NOTIFICATION_INDICATOR
330	notification_indicator_setup();	334	notification_indicator_setup();
331	#endif	335	#endif
Lines 379-384 gboolean plugin_done(void) Link Here
379	notification_foldercheck_write_array();	383	notification_foldercheck_write_array();
380	notification_free_folder_specific_array();	384	notification_free_folder_specific_array();
381		385
		386	#ifdef NOTIFICATION_AYATANA_INDICATOR
		387	notification_ayatana_indicator_disable();
		388	#endif
382	#ifdef NOTIFICATION_BANNER	389	#ifdef NOTIFICATION_BANNER
383	notification_collected_msgs_free(banner_collected_msgs);	390	notification_collected_msgs_free(banner_collected_msgs);
384	banner_collected_msgs = NULL;	391	banner_collected_msgs = NULL;

Lines 43-48 Link Here

(-)a/src/plugins/notification/notification_prefs.c (+84 lines)
43	#include "notification_command.h"	43	#include "notification_command.h"
44	#include "notification_lcdproc.h"	44	#include "notification_lcdproc.h"
45	#include "notification_trayicon.h"	45	#include "notification_trayicon.h"
		46	#include "notification_ayatana_indicator.h"
46	#include "notification_indicator.h"	47	#include "notification_indicator.h"
47		48
48	#ifdef GDK_WINDOWING_X11	49	#ifdef GDK_WINDOWING_X11
Lines 165-170 typedef struct { Link Here
165	NotifyTrayiconPage trayicon_page;	166	NotifyTrayiconPage trayicon_page;
166	#endif	167	#endif
167		168
		169	#ifdef NOTIFICATION_AYATANA_INDICATOR
		170	typedef struct {
		171	PrefsPage page;
		172	GtkWidget *ayatana_indicator_enabled;
		173	}NotifyAtayanaIndicatorPage;
		174	NotifyAtayanaIndicatorPage ayatana_indicator_page;
		175	#endif
		176
168	#ifdef NOTIFICATION_INDICATOR	177	#ifdef NOTIFICATION_INDICATOR
169	typedef struct {	178	typedef struct {
170	PrefsPage page;	179	PrefsPage page;
Lines 307-312 PrefParam Link Here
307	#endif /* HAVE_LIBNOTIFY */	316	#endif /* HAVE_LIBNOTIFY */
308	#endif	317	#endif
309		318
		319	#ifdef NOTIFICATION_AYATANA_INDICATOR
		320	{ "ayatana_indicator_enabled", "FALSE", &notify_config.ayatana_indicator_enabled, P_BOOL,
		321	NULL, NULL, NULL},
		322	#endif /* NOTIFICATION_AYATANA_INDICATOR */
310	#ifdef NOTIFICATION_INDICATOR	323	#ifdef NOTIFICATION_INDICATOR
311	{ "indicator_enabled", "FALSE", &notify_config.indicator_enabled, P_BOOL,	324	{ "indicator_enabled", "FALSE", &notify_config.indicator_enabled, P_BOOL,
312	NULL, NULL, NULL},	325	NULL, NULL, NULL},
Lines 379-384 static void notify_trayicon_popup_enable_set_sensitivity(GtkToggleButton*, Link Here
379	#endif	392	#endif
380	#endif	393	#endif
381		394
		395	#ifdef NOTIFICATION_AYATANA_INDICATOR
		396	static void notify_create_ayatana_indicator_page(PrefsPage, GtkWindow, gpointer);
		397	static void notify_destroy_ayatana_indicator_page(PrefsPage*);
		398	static void notify_save_ayatana_indicator(PrefsPage*);
		399	#endif /* NOTIFICATION_AYATANA_INDICATOR */
		400
382	#ifdef NOTIFICATION_INDICATOR	401	#ifdef NOTIFICATION_INDICATOR
383	static void notify_create_indicator_page(PrefsPage, GtkWindow, gpointer);	402	static void notify_create_indicator_page(PrefsPage, GtkWindow, gpointer);
384	static void notify_destroy_indicator_page(PrefsPage*);	403	static void notify_destroy_indicator_page(PrefsPage*);
Lines 519-524 void notify_gtk_init(void) Link Here
519	}	538	}
520	#endif /* NOTIFICATION_TRAYICON */	539	#endif /* NOTIFICATION_TRAYICON */
521		540
		541	#ifdef NOTIFICATION_AYATANA_INDICATOR
		542	{
		543	static gchar *ayatana_indicator_path[4];
		544
		545	ayatana_indicator_path[0] = _("Plugins");
		546	ayatana_indicator_path[1] = _("Notification");
		547	ayatana_indicator_path[2] = _("Atayana App Indicator");
		548	ayatana_indicator_path[3] = NULL;
		549
		550	ayatana_indicator_page.page.path = ayatana_indicator_path;
		551	ayatana_indicator_page.page.create_widget = notify_create_ayatana_indicator_page;
		552	ayatana_indicator_page.page.destroy_widget = notify_destroy_ayatana_indicator_page;
		553	ayatana_indicator_page.page.save_page = notify_save_ayatana_indicator;
		554	ayatana_indicator_page.page.weight = 70.0;
		555	prefs_gtk_register_page((PrefsPage*) &ayatana_indicator_page);
		556	}
		557	#endif /* NOTIFICATION_AYATANA_INDICATOR */
		558
522	#ifdef NOTIFICATION_INDICATOR	559	#ifdef NOTIFICATION_INDICATOR
523	{	560	{
524	static gchar *indicator_path[4];	561	static gchar *indicator_path[4];
Lines 558-563 void notify_gtk_done(void) Link Here
558	#ifdef NOTIFICATION_TRAYICON	595	#ifdef NOTIFICATION_TRAYICON
559	prefs_gtk_unregister_page((PrefsPage*) &trayicon_page);	596	prefs_gtk_unregister_page((PrefsPage*) &trayicon_page);
560	#endif	597	#endif
		598	#ifdef NOTIFICATION_AYATANA_INDICATOR
		599	prefs_gtk_unregister_page((PrefsPage*) &ayatana_indicator_page);
		600	#endif
561	#ifdef NOTIFICATION_INDICATOR	601	#ifdef NOTIFICATION_INDICATOR
562	prefs_gtk_unregister_page((PrefsPage*) &indicator_page);	602	prefs_gtk_unregister_page((PrefsPage*) &indicator_page);
563	#endif	603	#endif
Lines 1772-1777 static void notify_trayicon_popup_enable_set_sensitivity(GtkToggleButton *bu, Link Here
1772		1812
1773	#endif /* NOTIFICATION_TRAYICON */	1813	#endif /* NOTIFICATION_TRAYICON */
1774		1814
		1815	#ifdef NOTIFICATION_AYATANA_INDICATOR
		1816
		1817	static void notify_create_ayatana_indicator_page(PrefsPage page, GtkWindow window,
		1818	gpointer data)
		1819	{
		1820	GtkWidget *pvbox;
		1821	GtkWidget *vbox;
		1822	GtkWidget *checkbox;
		1823
		1824	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
		1825	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
		1826
		1827	/* Enable indicator */
		1828	checkbox = gtk_check_button_new_with_label(_("Enable Ayatana App Indicator"));
		1829	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
		1830	notify_config.ayatana_indicator_enabled);
		1831	gtk_box_pack_start(GTK_BOX(pvbox), checkbox, FALSE, FALSE, 0);
		1832	ayatana_indicator_page.ayatana_indicator_enabled = checkbox;
		1833
		1834	/* Container vbox for greying out everything */
		1835	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
		1836	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
		1837
		1838	gtk_widget_show_all(pvbox);
		1839	ayatana_indicator_page.page.widget = pvbox;
		1840	}
		1841
		1842	static void notify_destroy_ayatana_indicator_page(PrefsPage *page)
		1843	{
		1844	}
		1845
		1846	static void notify_save_ayatana_indicator(PrefsPage *page)
		1847	{
		1848	notification_ayatana_indicator_disable();
		1849
		1850	notify_config.ayatana_indicator_enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ayatana_indicator_page.ayatana_indicator_enabled));
		1851
		1852	if(notify_config.ayatana_indicator_enabled) {
		1853	notification_ayatana_indicator_enable();
		1854	notification_update_ayatana_indicator();
		1855	}
		1856	}
		1857	#endif /* NOTIFICATION_AYATANA_INDICATOR */
		1858
1775	#ifdef NOTIFICATION_INDICATOR	1859	#ifdef NOTIFICATION_INDICATOR
1776		1860
1777	static void notify_create_indicator_page(PrefsPage page, GtkWindow window,	1861	static void notify_create_indicator_page(PrefsPage page, GtkWindow window,

Lines 100-105 typedef struct { Link Here

(-)a/src/plugins/notification/notification_prefs.h (+3 lines)
100	gint trayicon_popup_timeout;	100	gint trayicon_popup_timeout;
101	#endif /* HAVE_LIBNOTIFY */	101	#endif /* HAVE_LIBNOTIFY */
102	#endif /* Trayicon */	102	#endif /* Trayicon */
		103	#ifdef NOTIFICATION_AYATANA_INDICATOR
		104	gboolean ayatana_indicator_enabled;
		105	#endif /* NOTIFICATION_AYATANA_INDICATOR */
103	#ifdef NOTIFICATION_INDICATOR	106	#ifdef NOTIFICATION_INDICATOR
104	gboolean indicator_enabled;	107	gboolean indicator_enabled;
105	gboolean indicator_hide_minimized;	108	gboolean indicator_hide_minimized;

Return to bug 4832