From 51ebf20237270a785af0aa0e614db42275a05c62 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 15 Oct 2010 14:51:13 -0400
Subject: EAlert: Allow arbitrary actions to be added.

You can now amend the predefined actions in an EAlert by calling
e_alert_add_action().  Useful for adding actions from an existing
GtkUIManager.

Call e_alert_peek_actions() to obtain a combined list of predefined
and custom actions.  These will typically serve as "related" actions
for GtkButtons (cf. gtk_activatable_set_related_action()).

Also, both EShellWindow and EShellView now implement EAlertSink.  Use
EShellWindow for application-wide alerts, EShellView for view-specific
alerts.
---
 modules/offline-alert/Makefile.am                  | 26 ++++++++++++++++++++++
 .../evolution-offline-alert.error.xml              | 13 +++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 modules/offline-alert/Makefile.am
 create mode 100644 modules/offline-alert/evolution-offline-alert.error.xml

(limited to 'modules/offline-alert')

diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
new file mode 100644
index 0000000000..cdad615797
--- /dev/null
+++ b/modules/offline-alert/Makefile.am
@@ -0,0 +1,26 @@
+module_LTLIBRARIES = libevolution-module-offline-alert.la
+
+libevolution_module_offline_alert_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)						\
+	-I$(top_srcdir)						\
+	-DG_LOG_DOMAIN=\"evolution-offline-alert\"		\
+	$(GNOME_PLATFORM_CFLAGS)
+
+libevolution_module_offline_alert_la_SOURCES =			\
+	evolution-offline-alert.c
+
+libevolution_module_offline_alert_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/shell/libeshell.la			\
+	$(GNOME_PLATFORM_LIBS)
+
+libevolution_module_offline_alert_la_LDFLAGS =			\
+	-module -avoid-version $(NO_UNDEFINED)
+
+error_DATA = evolution-offline-alert.error
+errordir = $(privdatadir)/errors
+@EVO_PLUGIN_RULE@
+
+EXTRA_DIST = evolution-offline-alert.error.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/offline-alert/evolution-offline-alert.error.xml b/modules/offline-alert/evolution-offline-alert.error.xml
new file mode 100644
index 0000000000..65a1ec7099
--- /dev/null
+++ b/modules/offline-alert/evolution-offline-alert.error.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="offline-alert">
+  <error id="offline" type="info">
+    <_primary>Evolution is currently offline.</_primary>
+    <_secondary>Click 'Work Online' to return to online mode.</_secondary>
+    <button _label="_Dismiss" response="GTK_RESPONSE_OK"/>
+  </error>
+  <error id="no-network" type="info">
+    <_primary>Evolution is currently offline due to a network outage.</_primary>
+    <_secondary>Evolution will return to online mode once a network connection is established.</secondary>
+    <button _label="_Dismiss" response="GTK_RESPONSE_OK"/>
+  </error>
+</error-list>
-- 
cgit v1.2.3