Fix building with latest alertpanel API changes

https://git.claws-mail.org/?p=claws.git;a=commit;h=81707142

diff --git a/configure.ac b/configure.ac
index 4378000abe3563d0c0d2461552c8793663409a7a..c7499a931a0552a14e98964f4784ceaeb9f26915 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ PKG_PROG_PKG_CONFIG
 #
 # Check for claws-mail
 #
-PKG_CHECK_MODULES(CLAWS_MAIL, claws-mail >= 3.99)
+PKG_CHECK_MODULES(CLAWS_MAIL, claws-mail >= 4.0.0.405)
 if test -z $prefix || test "${prefix}" = "NONE" ; then
   prefix=$( $PKG_CONFIG --variable=prefix claws-mail )
   CLAWS_MAIL_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir claws-mail )

diff --git a/doc/README.xml b/doc/README.xml
index c0404dd90fd6cc6b4a570a286e2eda63e3a495c4..1243b4a1854e5fffa6f352ad00f5be718fef7621 100644 (file)
--- a/doc/README.xml
+++ b/doc/README.xml
@@ -41,7 +41,7 @@
     <para>
       <itemizedlist mark='opencircle'>
         <listitem>
-          <para>Claws Mail 3.99</para>
+          <para>Claws Mail 4.0.0.405</para>
         </listitem>
         <listitem>
           <para>Berkeley DB 4.1</para>

diff --git a/src/maildir_gtk.c b/src/maildir_gtk.c
index c1a5b96c3a8d95d07f6006e4f994d46ee108f963..0900f58ebfe004ef49946346f475e33d132559a5 100644 (file)
--- a/src/maildir_gtk.c
+++ b/src/maildir_gtk.c
@@ -285,7 +285,10 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
                (_("Really remove the mailbox `%s' ?\n"
                   "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel_full(_("Remove mailbox"), message,
-                                GTK_STOCK_CANCEL, _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE,
+                                NULL, _("_Cancel"),
+                                "edit-delete", _("_Remove"),
+                                NULL, NULL,
+                                ALERTFOCUS_FIRST, FALSE,
                                 NULL, ALERT_WARNING);
        g_free(message);
        g_free(name);
@@ -317,8 +320,11 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
                (_("All folder(s) and message(s) under `%s' will be deleted.\n"
                   "Do you really want to delete?"), name);
        avalue= alertpanel_full(_("Delete folder"), message,
-                                GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
-                                ALERTFOCUS_FIRST, FALSE, NULL, ALERT_NOTICE);
+                                NULL, _("_Cancel"),
+                                "edit-delete", _("_Delete"),
+                                NULL, NULL,
+                                ALERTFOCUS_FIRST, FALSE,
+                                NULL, ALERT_NOTICE);
        g_free(message);
        if (avalue != G_ALERTALTERNATE) return;