aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-alert.c12
-rw-r--r--e-util/e-marshal.list1
2 files changed, 1 insertions, 12 deletions
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 88dbb7189d..d4a7a9ea13 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -909,18 +909,6 @@ e_alert_peek_actions (EAlert *alert)
{
g_return_val_if_fail (E_IS_ALERT (alert), NULL);
- /* Make sure we have at least one action. Do this on-demand
- * in case the XML definition did not specify any actions but
- * other actions were added via e_alert_add_action(). */
- if (g_queue_is_empty (&alert->priv->actions)) {
- GtkAction *action;
-
- action = gtk_action_new (
- "alert-response-0", _("_Dismiss"), NULL, NULL);
- e_alert_add_action (alert, action, GTK_RESPONSE_CLOSE);
- g_object_unref (action);
- }
-
return g_queue_peek_head_link (&alert->priv->actions);
}
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list
index c42078b2df..884886c83f 100644
--- a/e-util/e-marshal.list
+++ b/e-util/e-marshal.list
@@ -54,6 +54,7 @@ NONE:POINTER,POINTER,INT
NONE:STRING,DOUBLE
NONE:STRING,INT
NONE:STRING,INT,INT
+NONE:STRING,OBJECT
NONE:STRING,POINTER,POINTER
NONE:STRING,STRING
NONE:UINT,STRING