summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
14edff4)
* src/compose.c
Sync with HEAD
Fix focus handling in headers
+2004-09-29 [colin] 0.9.12cvs114.1
+
+ * src/compose.c
+ Sync with HEAD
+ Fix focus handling in headers
+
2004-09-29 [paul] 0.9.12cvs113.1
* src/quote_fmt_parse.y
2004-09-29 [paul] 0.9.12cvs113.1
* src/quote_fmt_parse.y
( cvs diff -u -r 1.207.2.15 -r 1.207.2.16 src/folderview.c; ) > 0.9.12cvs110.1.patchset
( cvs diff -u -r 1.207.2.16 -r 1.207.2.17 src/folderview.c; cvs diff -u -r 1.274.2.19 -r 1.274.2.20 src/mainwindow.c; ) > 0.9.12cvs112.1.patchset
( cvs diff -u -r 1.654.2.215 -r 1.654.2.216 configure.ac; cvs diff -u -r 1.22.2.2 -r 1.22.2.3 src/quote_fmt_parse.y; ) > 0.9.12cvs113.1.patchset
( cvs diff -u -r 1.207.2.15 -r 1.207.2.16 src/folderview.c; ) > 0.9.12cvs110.1.patchset
( cvs diff -u -r 1.207.2.16 -r 1.207.2.17 src/folderview.c; cvs diff -u -r 1.274.2.19 -r 1.274.2.20 src/mainwindow.c; ) > 0.9.12cvs112.1.patchset
( cvs diff -u -r 1.654.2.215 -r 1.654.2.216 configure.ac; cvs diff -u -r 1.22.2.2 -r 1.22.2.3 src/quote_fmt_parse.y; ) > 0.9.12cvs113.1.patchset
+( cvs diff -u -r 1.382.2.47 -r 1.382.2.48 src/compose.c; ) > 0.9.12cvs114.1.patchset
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=.1
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=.1
gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
-static gboolean compose_headerentry_button_pressed (GtkWidget *entry,
- GdkEventButton *event,
- gpointer data);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
- compose->sending = FALSE;
- gtk_widget_destroy(compose->window);
- /* No more compose access in the normal codepath after this point! */
+
+ if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ gtk_widget_destroy(compose->window);
+ /* No more compose access in the normal codepath
+ * after this point! */
+ }
if (msgnum == 0) {
alertpanel_error(_("The message was queued but could not be "
"sent.\nUse \"Send queued messages\" from "
"the main window to retry."));
if (msgnum == 0) {
alertpanel_error(_("The message was queued but could not be "
"sent.\nUse \"Send queued messages\" from "
"the main window to retry."));
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ compose_allow_user_actions (compose, TRUE);
+ }
val = procmsg_send_message_queue(msgpath);
g_free(msgpath);
val = procmsg_send_message_queue(msgpath);
g_free(msgpath);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ compose_allow_user_actions (compose, TRUE);
+ if (val != 0) {
+ folder_item_remove_msg(folder, msgnum);
+ folder_item_scan(folder);
+ }
+ }
+
if (val == 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
if (val == 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
+ gtk_widget_destroy(compose->window);
}
if (header)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
}
if (header)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(entry), "button-press-event",
- G_CALLBACK(compose_headerentry_button_pressed),
- NULL);
-
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
-static gboolean compose_headerentry_button_pressed
- (GtkWidget *entry, GdkEventButton *event, gpointer data)
-{
- /* if this is a lclick, grab the focus */
- if (event->button == 1)
- gtk_widget_grab_focus(entry);
- return FALSE;
-}
-
static void compose_show_first_last_header(Compose *compose, gboolean show_first)
{
GtkAdjustment *vadj;
static void compose_show_first_last_header(Compose *compose, gboolean show_first)
{
GtkAdjustment *vadj;