diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | plugin/test/test.c | 2 | ||||
-rw-r--r-- | src/compose.c | 12 |
4 files changed, 15 insertions, 8 deletions
@@ -1,5 +1,12 @@ 2011-06-10 + * src/compose.c + plugin/test/test.c: changed the spec of compose-send signal + because the previous one prohibited sending if the signal is not + used. + +2011-06-10 + * src/textview.c: added border line before and after headers. Made attachments display more graphical. diff --git a/configure.in b/configure.in index af6eabea..66ae804d 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ MICRO_VERSION=1 INTERFACE_AGE=1 BINARY_AGE=1 EXTRA_VERSION= -BUILD_REVISION=1118 +BUILD_REVISION=1119 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl define if this is a development release diff --git a/plugin/test/test.c b/plugin/test/test.c index 4160da2f..7a2b4631 100644 --- a/plugin/test/test.c +++ b/plugin/test/test.c @@ -236,7 +236,7 @@ static gboolean compose_send_cb(GObject *obj, gpointer compose, g_print("test: compose_mode: %d, send_mode: %d, file: %s\n", compose_mode, send_mode, msg_file); - return TRUE; /* return FALSE to cancel sending */ + return FALSE; /* return TRUE to cancel sending */ } static void messageview_show_cb(GObject *obj, gpointer msgview, diff --git a/src/compose.c b/src/compose.c index 32858e15..ee574610 100644 --- a/src/compose.c +++ b/src/compose.c @@ -3444,7 +3444,7 @@ static gint compose_send(Compose *compose) { gchar tmp[MAXPATHLEN + 1]; gint ok = 0; - gboolean ack = TRUE; + gboolean cancel = FALSE; if (compose->lock_count > 0) return 1; @@ -3495,8 +3495,8 @@ static gint compose_send(Compose *compose) } syl_plugin_signal_emit("compose-send", compose, compose->mode, 0, - tmp, compose->to_list, &ack); - if (ack == FALSE) { + tmp, compose->to_list, &cancel); + if (cancel) { g_unlink(tmp); compose_unlock(compose); return -1; @@ -7213,7 +7213,7 @@ static void compose_send_later_cb(gpointer data, guint action, Compose *compose = (Compose *)data; FolderItem *queue; gchar tmp[MAXPATHLEN + 1]; - gboolean ack = TRUE; + gboolean cancel = FALSE; if (compose_check_entries(compose) == FALSE) return; @@ -7253,8 +7253,8 @@ static void compose_send_later_cb(gpointer data, guint action, } syl_plugin_signal_emit("compose-send", compose, compose->mode, 1, - tmp, compose->to_list, &ack); - if (ack == FALSE) { + tmp, compose->to_list, &cancel); + if (cancel) { g_unlink(tmp); return; } |