sync with 0.7.4cvs39

diff --git a/ChangeLog b/ChangeLog
index 33844e911168118168f5a8b7f538b7e0302de8b1..56ed8cd465a62285eb047040b2d2d91b73c09268 100644 (file)
--- 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
 2002-04-11
 
        * src/compose.c: compose_create(): set geometry hints to restrict

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 19c370832dbafde0b0fa8e0d228a00e57a1a2df4..ed9af0714b88102c9f16f480ffc34dfa5d2ba39e 100644 (file)
--- 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
 2002-04-11 [paul]      0.7.4claws77
 
        * sync with 0.7.4cvs37

diff --git a/ChangeLog.jp b/ChangeLog.jp
index e02a727c354dc6839346cb5249c9521363403315..940e4abe9da8e6dec59cb582d66cbc6d2882f297 100644 (file)
--- 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(): ¥¸¥ª¥á¥È¥ê¥Ò¥ó¥È¤òÀßÄꤷ¤Æ
 2002-04-11
 
        * src/compose.c: compose_create(): ¥¸¥ª¥á¥È¥ê¥Ò¥ó¥È¤òÀßÄꤷ¤Æ

diff --git a/configure.in b/configure.in
index b3f01be2b78cbdb9e56e5df1d54954dca684c987..42e79ca566380d6d2cf1552535fb01a987a00107 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 6c724ebc3ee20704a755d80d678bf9091aa5c98b..34b73df000b538888ed2d1e3039fe90685918c56 100644 (file)
--- 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;
        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;
 
        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 &&
 
        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;
            (kev->state & ~ignored_mods)) {
                compose_send_cb(compose, 0, NULL);
                return TRUE;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 2e6af4c393225cc704735ff8bb5efc17f829d9f1..24c6c49646da0c7f2b213e72be1589c9c584ade2 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -533,6 +533,28 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Th_read view"),             "<control>T",        thread_cb, 0, "<ToggleItem>"},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
        {N_("/_View/Set display _item..."),     NULL, set_display_item_cb, 0, NULL},
        {N_("/_View/Th_read view"),             "<control>T",        thread_cb, 0, "<ToggleItem>"},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
        {N_("/_View/Set display _item..."),     NULL, set_display_item_cb, 0, NULL},

+
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
+       {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, "<Separator>"},
+       {N_("/_View/_Go to/P_rev unread message"),
+                                               "<shift>P", prev_unread_cb, 0, NULL},
+       {N_("/_View/_Go to/N_ext unread message"),
+                                               "<shift>N", next_unread_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {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, "<Separator>"},
+       {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, "<Separator>"},
+       {N_("/_View/_Go to/Other _folder..."),  "G", goto_folder_cb, 0, NULL},

        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
 
 #define CODESET_SEPARATOR \
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
 
 #define CODESET_SEPARATOR \


@@ -615,27 +637,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #undef CODESET_SEPARATOR
 #undef CODESET_ACTION
 
 #undef CODESET_SEPARATOR
 #undef CODESET_ACTION
 

-       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
-       {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, "<Separator>"},
-       {N_("/_View/_Go to/P_rev unread message"),
-                                               "<shift>P", prev_unread_cb, 0, NULL},
-       {N_("/_View/_Go to/N_ext unread message"),
-                                               "<shift>N", next_unread_cb, 0, NULL},
-       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
-       {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, "<Separator>"},
-       {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, "<Separator>"},
-       {N_("/_View/_Go to/Other _folder..."),  "G", goto_folder_cb, 0, NULL},

        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},