2008-08-07 [mones] 3.5.0cvs53

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index eed1bb4517db3cc654971ed759e8354d3028c7a7..d589412905ed028e5baa35d8d389e8056a3d2468 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -670,7 +670,7 @@ static GtkRadioActionEntry compose_radio_prio_entries[] =
        {"Options/Priority/High",       NULL, N_("Hi_gh"), NULL, NULL, PRIORITY_HIGH }, /* RADIO compose_set_priority_cb */
        {"Options/Priority/Normal",     NULL, N_("_Normal"), NULL, NULL, PRIORITY_NORMAL }, /* RADIO compose_set_priority_cb */
        {"Options/Priority/Low",        NULL, N_("Lo_w"), NULL, NULL, PRIORITY_LOW }, /* RADIO compose_set_priority_cb */
-       {"Options/Priority/Lowest",     NULL, N_("Lowest"), NULL, NULL, PRIORITY_LOWEST }, /* RADIO compose_set_priority_cb */
+       {"Options/Priority/Lowest",     NULL, N_("_Lowest"), NULL, NULL, PRIORITY_LOWEST }, /* RADIO compose_set_priority_cb */
 };
 
 static GtkRadioActionEntry compose_radio_enc_entries[] =
@@ -7440,7 +7440,8 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
 
                        systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
                        if (systemid != NULL) {
-                               if (strcmp(systemid, compose->privacy_system) == 0) {
+                               if (strcmp(systemid, compose->privacy_system) == 0 &&
+                                   GTK_IS_CHECK_MENU_ITEM(amenu->data)) {
                                        menuitem = GTK_WIDGET(amenu->data);
 
                                        can_sign = privacy_system_can_sign(systemid);
@@ -7448,7 +7449,8 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
                                        found = TRUE;
                                        break;
                                } 
-                       } else if (strlen(compose->privacy_system) == 0) {
+                       } else if (strlen(compose->privacy_system) == 0 && 
+                                  GTK_IS_CHECK_MENU_ITEM(amenu->data)) {
                                        menuitem = GTK_WIDGET(amenu->data);
 
                                        can_sign = FALSE;
@@ -9308,12 +9310,11 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
 
                if (contents == NULL)
                        return;
-
-               undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
-
+       
                /* we shouldn't delete the selection when middle-click-pasting, or we
                 * can't mid-click-paste our own selection */
                if (clip != GDK_SELECTION_PRIMARY) {
+                       undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
                        gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
                }