2005-07-06 [colin] 1.9.12cvs23

	* src/alertpanel.c
		Fix a minimum size for alertpanels
	* src/compose.c
		Show 'No space left on device' type errors
		when queuing/sending
	* src/imap_gtk.c
	* src/mh_gtk.c
		Rework folder's deletion message (remove
		extra \n)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5e0df22e8e7af2e91d5487ecee8bd3b401dbc75c..d5539a0760dcf5032e40af5d17945b378fdc1e25 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,15 @@
+2005-07-06 [colin]     1.9.12cvs23
+
+       * src/alertpanel.c
+               Fix a minimum size for alertpanels
+       * src/compose.c
+               Show 'No space left on device' type errors
+               when queuing/sending
+       * src/imap_gtk.c
+       * src/mh_gtk.c
+               Rework folder's deletion message (remove 
+               extra \n)
+
 2005-07-05 [colin]     1.9.12cvs22
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 20beea0f7f8e41c6fae32886c8e29a260419b2df..e1249cd4da2537a84fa5afdcc700b07f8774c249 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -617,3 +617,4 @@
 ( cvs diff -u -r 1.8 -r 1.9 .cvsignore;  cvs diff -u -r 1.105.2.26 -r 1.105.2.27 src/prefs_account.c;  cvs diff -u -r 1.49.2.12 -r 1.49.2.13 src/prefs_account.h;  diff -u /dev/null src/etpan/.cvsignore;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/gtk/filesel.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/filesel.h;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/prefs_gpg.c;  cvs diff -u -r 1.1 -r 1.2 src/plugins/spamassassin/.cvsignore;  ) > 1.9.12cvs20.patchset
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 1.9.12cvs21.patchset
 ( cvs diff -u -r 1.179.2.46 -r 1.179.2.47 src/imap.c;  ) > 1.9.12cvs22.patchset
+( cvs diff -u -r 1.17.2.15 -r 1.17.2.16 src/alertpanel.c;  cvs diff -u -r 1.382.2.140 -r 1.382.2.141 src/compose.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/imap_gtk.c;  cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/mh_gtk.c;  ) > 1.9.12cvs23.patchset

diff --git a/configure.ac b/configure.ac
index b2bd29830038b60a927f9d29d05eaa50561ebfae..341f823fa8cc2a445ae036069c9b04c54fa88a20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index c3e40bed2d5979e5081a4f2e831be6eb0fd1acc3..30a6dd1ea69f1c7c69d21fa4ce01342ab0d35746 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -247,6 +247,8 @@ static void alertpanel_create(const gchar *title,
        GtkWidget *icon;
        const gchar *label2;
        const gchar *label3;
+       GdkGeometry geometry;
+       
        gchar *title_full = g_strdup_printf("<span weight=\"bold\" "
                                "size=\"larger\">%s</span>",
                                title?title:"");
@@ -261,6 +263,12 @@ static void alertpanel_create(const gchar *title,
        dialog = gtk_dialog_new();
        gtk_window_set_title(GTK_WINDOW(dialog), title);
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+       
+       geometry.min_width = 300;
+       geometry.min_height = 100;
+       
+       gtk_window_set_geometry_hints(GTK_WINDOW(dialog), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);

diff --git a/src/compose.c b/src/compose.c
index c7709f015ffc490f77d6f89f88502583e9be75f8..1d3e26e67f39de8a4678d10ef5f60054ecd8acb9 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3255,7 +3255,11 @@ gint compose_send(Compose *compose)
        val = compose_queue(compose, &msgnum, &folder);
 
        if (val) {
-               alertpanel_error(_("Could not queue message for sending."));
+               if (val == -2) {
+                       alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
+               } else {
+                       alertpanel_error(_("Could not queue message for sending."));
+               }
                goto bail;
        }
 
@@ -3835,7 +3839,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
        if ((fp = fopen(tmp, "wb")) == NULL) {
                FILE_OP_ERROR(tmp, "fopen");
                g_free(tmp);
-               return -1;
+               return -2;
        }
 
        if (change_file_mode_rw(fp, tmp) < 0) {
@@ -3936,7 +3940,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                        fclose(fp);
                        unlink(tmp);
                        g_free(tmp);
-                       return -1;
+                       return -2;
                }
        } else {
                if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND) < 0) {
@@ -3944,7 +3948,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                        fclose(fp);
                        unlink(tmp);
                        g_free(tmp);
-                       return -1;
+                       return -2;
                }
        }
 
@@ -3952,7 +3956,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                FILE_OP_ERROR(tmp, "fclose");
                unlink(tmp);
                g_free(tmp);
-               return -1;
+               return -2;
        }
 
        queue = account_get_special_folder(compose->account, F_QUEUE);
@@ -6391,6 +6395,9 @@ static void compose_send_later_cb(gpointer data, guint action,
        val = compose_queue_sub(compose, NULL, NULL, TRUE);
        if (!val) 
                compose_close(compose);
+       else if (val == -2) {
+               alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
+       }
 }
 
 void compose_draft (gpointer data) 

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index de7b19dd42cf60f709bc40b1f7afc81ad210f356..6485728f8506448ad7fa34bd10279242fd789d40 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -312,7 +312,8 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
        message = g_strdup_printf
-               (_("All folders and messages under `%s' will be deleted.\n"
+               (_("All folders and messages under `%s' will be permanently deleted. "
+                  "Recovery will not be possible.\n\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel(_("Delete folder"), message,
                            _("Yes"), _("+No"), NULL);

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index d8ea20a5d5f383e1535281e8062e3a2d1a1b8570..c6f917a96e6d7c0e2f68fc8815b7da48bac8b676 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -164,7 +164,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
        message = g_strdup_printf
-               (_("All folders and messages under `%s' will be permanently deleted.\n"
+               (_("All folders and messages under `%s' will be permanently deleted. "
                   "Recovery will not be possible.\n\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel_with_type(_("Delete folder"), message,