From c416b66d4f6de2da355f350ec05b84fc415dd20c Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sat, 13 Apr 2002 07:02:19 +0000 Subject: [PATCH] sync with 0.7.4cvs39 --- ChangeLog | 7 +++++++ ChangeLog.claws | 5 +++++ ChangeLog.jp | 8 ++++++++ configure.in | 2 +- src/compose.c | 9 ++++++--- src/mainwindow.c | 43 ++++++++++++++++++++++--------------------- 6 files changed, 49 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33844e911..56ed8cd46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-04-12 + + * src/mainwindow.c: reorderd the menu a bit. + * src/compose.c: made 'Ctrl-Enter' ignore some modifiers. + compose_reply_set_entry(): made 'Reply to sender' work for + newsgroups. + 2002-04-11 * src/compose.c: compose_create(): set geometry hints to restrict diff --git a/ChangeLog.claws b/ChangeLog.claws index 19c370832..ed9af0714 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2002-04-13 [paul] 0.7.4claws78 + + * sync with 0.7.4cvs39 + see ChangeLog entry 2002-04-12 + 2002-04-11 [paul] 0.7.4claws77 * sync with 0.7.4cvs37 diff --git a/ChangeLog.jp b/ChangeLog.jp index e02a727c3..940e4abe9 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,3 +1,11 @@ +2002-04-12 + + * src/mainwindow.c: ¥á¥Ë¥å¡¼¤Î½ç½ø¤ò¾¯¤·Êѹ¹¡£ + * src/compose.c: 'Ctrl-Enter' ¤Ç¤¤¤¯¤Ä¤«¤Î½¤¾þ¥­¡¼¤ò̵»ë¤¹¤ë¤è¤¦¤Ë + ¤·¤¿¡£ + compose_reply_set_entry(): ¡Öº¹½Ð¿Í¤ËÊÖ¿®¡×¤¬¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤Ç + »È¤¨¤ë¤è¤¦¤Ë¤·¤¿¡£ + 2002-04-11 * src/compose.c: compose_create(): ¥¸¥ª¥á¥È¥ê¥Ò¥ó¥È¤òÀßÄꤷ¤Æ diff --git a/configure.in b/configure.in index b3f01be2b..42e79ca56 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=7 MICRO_VERSION=4 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws77 +EXTRA_VERSION=claws78 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/compose.c b/src/compose.c index 6c724ebc3..34b73df00 100644 --- a/src/compose.c +++ b/src/compose.c @@ -6649,20 +6649,23 @@ static gboolean compose_send_control_enter(Compose *compose) GtkAccelEntry *accel; GtkWidget *send_menu; GSList *list; - gint ignored_mods = (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK - | GDK_MOD4_MASK | GDK_MOD5_MASK); + GdkModifierType ignored_mods = + (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | + GDK_MOD4_MASK | GDK_MOD5_MASK); ev = gtk_get_current_event(); if (ev->type != GDK_KEY_PRESS) return FALSE; kev = (GdkEventKey *)ev; + if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK))) + return FALSE; ifactory = gtk_item_factory_from_widget(compose->menubar); send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send"); list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu)); accel = (GtkAccelEntry *)list->data; if (accel->accelerator_key == kev->keyval && - (accel->accelerator_mods & ~ignored_mods) == + (accel->accelerator_mods & ~ignored_mods) == (kev->state & ~ignored_mods)) { compose_send_cb(compose, 0, NULL); return TRUE; diff --git a/src/mainwindow.c b/src/mainwindow.c index 2e6af4c39..24c6c4964 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -533,6 +533,28 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_View/Th_read view"), "T", thread_cb, 0, ""}, {N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, ""}, {N_("/_View/Set display _item..."), NULL, set_display_item_cb, 0, NULL}, + + {N_("/_View/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL}, + {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/P_rev unread message"), + "P", prev_unread_cb, 0, NULL}, + {N_("/_View/_Go to/N_ext unread message"), + "N", next_unread_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/Prev _marked message"), + NULL, prev_marked_cb, 0, NULL}, + {N_("/_View/_Go to/Next m_arked message"), + NULL, next_marked_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/Prev _labeled message"), + NULL, prev_labeled_cb, 0, NULL}, + {N_("/_View/_Go to/Next la_beled message"), + NULL, next_labeled_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/Other _folder..."), "G", goto_folder_cb, 0, NULL}, {N_("/_View/---"), NULL, NULL, 0, ""}, #define CODESET_SEPARATOR \ @@ -615,27 +637,6 @@ static GtkItemFactoryEntry mainwin_entries[] = #undef CODESET_SEPARATOR #undef CODESET_ACTION - {N_("/_View/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL}, - {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL}, - {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/P_rev unread message"), - "P", prev_unread_cb, 0, NULL}, - {N_("/_View/_Go to/N_ext unread message"), - "N", next_unread_cb, 0, NULL}, - {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/Prev _marked message"), - NULL, prev_marked_cb, 0, NULL}, - {N_("/_View/_Go to/Next m_arked message"), - NULL, next_marked_cb, 0, NULL}, - {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/Prev _labeled message"), - NULL, prev_labeled_cb, 0, NULL}, - {N_("/_View/_Go to/Next la_beled message"), - NULL, next_labeled_cb, 0, NULL}, - {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/Other _folder..."), "G", goto_folder_cb, 0, NULL}, {N_("/_View/---"), NULL, NULL, 0, ""}, {N_("/_View/Open in new _window"), "N", open_msg_cb, 0, NULL}, {N_("/_View/Mess_age source"), "U", view_source_cb, 0, NULL}, -- 2.25.1