2006-06-29 [colin] 2.3.1cvs39
authorColin Leroy <colin@colino.net>
Thu, 29 Jun 2006 16:26:13 +0000 (16:26 +0000)
committerColin Leroy <colin@colino.net>
Thu, 29 Jun 2006 16:26:13 +0000 (16:26 +0000)
* src/compose.c
Fix Spelling menu (discrepancy between context menu
and top menu when folder's dictionary isn't the
default one)
* src/plugins/pgpcore/sgpgme.c
More error reporting about why gpgme can fail

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/plugins/pgpcore/sgpgme.c

index 4ba0ec737337bf90f36bcc13cb41cabf7b2627bb..76bf20ce4029b8890db0003f3c21b59ec69efc04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-29 [colin]     2.3.1cvs39
+
+       * src/compose.c
+               Fix Spelling menu (discrepancy between context menu
+               and top menu when folder's dictionary isn't the 
+               default one)
+       * src/plugins/pgpcore/sgpgme.c
+               More error reporting about why gpgme can fail
+
 2006-06-29 [wwp]       2.3.1cvs38
 
        * src/mainwindow.c
        * src/exphtmldlg.c
        * src/gtk/gtkutils.c
        * src/gtk/gtkutils.h
-       Added second argument to gtkut_sc_combobox_create() to
-       control focus-on-click for the widget.
-       Migrated the only GtkOptionMenu in exphtmldlg.c to GtkComboBox.
+               Added second argument to gtkut_sc_combobox_create() to
+               control focus-on-click for the widget.
+               Migrated the only GtkOptionMenu in exphtmldlg.c to GtkComboBox.
 
 2006-06-25 [ticho]     2.3.1cvs19
 
index a8a8241e02b5fd84f394cb0b0ed67cb05b9c2dc7..6b5feaa0a54918e86ba98b51cb5b28133d137d0f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.179.2.123 -r 1.179.2.124 src/imap.c;  ) > 2.3.1cvs36.patchset
 ( cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/prefs_actions.c;  ) > 2.3.1cvs37.patchset
 ( cvs diff -u -r 1.274.2.119 -r 1.274.2.120 src/mainwindow.c;  ) > 2.3.1cvs38.patchset
+( cvs diff -u -r 1.382.2.288 -r 1.382.2.289 src/compose.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpcore/sgpgme.c;  ) > 2.3.1cvs39.patchset
index b55803273b3ca020605a756535ffb2fcbf23d8b4..797c058c1c8eab4d5370da289c391afe1bc22046 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 4f2ceab0bc84e25154939ec9a7960d81cfdb8ed9..d4b7bf04d8f038c3009c2279ad4fd6fe59b1d953 100644 (file)
@@ -325,7 +325,9 @@ static void compose_undo_state_changed              (UndoMain       *undostruct,
 static void compose_create_header_entry        (Compose *compose);
 static void compose_add_header_entry   (Compose *compose, gchar *header, gchar *text);
 static void compose_update_priority_menu_item(Compose * compose);
-
+#if USE_ASPELL
+static void compose_spell_menu_changed (void *data);
+#endif
 static void compose_add_field_list     ( Compose *compose,
                                          GList *listAddress );
 
@@ -958,6 +960,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
            compose->gtkaspell) 
                gtkaspell_change_dict(compose->gtkaspell, 
                    item->prefs->default_dictionary);
+       compose_spell_menu_changed(compose);
 #endif
 
        if (account->auto_sig)
index ccf87654b7858909afbbaddef85a1f63e0b358c8..37b5bd0d72c104459190654c1067be8b99cf4702 100644 (file)
@@ -520,9 +520,35 @@ void sgpgme_init()
 #endif
                if (!gpgme_get_engine_info(&engineInfo)) {
                        while (engineInfo) {
-                               debug_print("GpgME Protocol: %s\n      Version: %s\n",
+                               debug_print("GpgME Protocol: %s\n"
+                                           "Version: %s (req %s)\n"
+                                           "Executable: %s\n",
                                        gpgme_get_protocol_name(engineInfo->protocol),
-                                       engineInfo->version);
+                                       engineInfo->version ? engineInfo->version:"???",
+                                       engineInfo->req_version ? engineInfo->req_version:"???",
+                                       engineInfo->file_name ? engineInfo->file_name:"???");
+                               if (gpgme_engine_check_version(engineInfo->protocol) != 
+                                       GPG_ERR_NO_ERROR) {
+                                       if (engineInfo->file_name && !engineInfo->version) {
+                                               alertpanel_error(_("Gpgme protocol '%s' is unusable: "
+                                                                  "Engine '%s' isn't installed properly."),
+                                                                  gpgme_get_protocol_name(engineInfo->protocol),
+                                                                  engineInfo->file_name);
+                                       } else if (engineInfo->file_name && engineInfo->version
+                                         && engineInfo->req_version) {
+                                               alertpanel_error(_("Gpgme protocol '%s' is unusable: "
+                                                                  "Engine '%s' version %s is installed, "
+                                                                  "but version %s is required.\n"),
+                                                                  gpgme_get_protocol_name(engineInfo->protocol),
+                                                                  engineInfo->file_name,
+                                                                  engineInfo->version,
+                                                                  engineInfo->req_version);
+                                       } else {
+                                               alertpanel_error(_("Gpgme protocol '%s' is unusable "
+                                                                  "(unknown problem)"),
+                                                                  gpgme_get_protocol_name(engineInfo->protocol));
+                                       }
+                               }
                                engineInfo = engineInfo->next;
                        }
                }