2008-01-09 [colin] 3.2.0cvs34

	* po/pl.po
		Fix bug 1446, 'SC crashes frequently when staying
		in background'. Format string error in Polish
		translation
	* src/gtk/description_window.c
	* src/prefs_template.c
		Complete 3.2.0cvs9 (fix bug with gtk_main loop);
		patch by Pawel
	* src/wizard.c
		Maemo: Fix build

diff --git a/ChangeLog b/ChangeLog
index 52fbfbdae07204680024f403a0f64b062f27b119..e2062f80b5da75dc6ff79db7fc53e2fbfaa87fc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-09 [colin]     3.2.0cvs34
+
+       * po/pl.po
+               Fix bug 1446, 'SC crashes frequently when staying 
+               in background'. Format string error in Polish 
+               translation
+       * src/gtk/description_window.c
+       * src/prefs_template.c
+               Complete 3.2.0cvs9 (fix bug with gtk_main loop);
+               patch by Pawel
+       * src/wizard.c
+               Maemo: Fix build
+
 2008-01-08 [colin]     3.2.0cvs33
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 88357c2b30189e044a929bf11714a3e924e48cad..a84df28f0cacdcb9fa1718c97585dd24b8eb0b0a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3170,3 +3170,4 @@
 ( cvs diff -u -r 1.36.2.131 -r 1.36.2.132 src/common/utils.c;  ) > 3.2.0cvs31.patchset
 ( cvs diff -u -r 1.213.2.173 -r 1.213.2.174 src/folder.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/folder_item_prefs.h;  cvs diff -u -r 1.52.2.54 -r 1.52.2.55 src/prefs_folder_item.c;  ) > 3.2.0cvs32.patchset
 ( cvs diff -u -r 1.115.2.179 -r 1.115.2.180 src/main.c;  cvs diff -u -r 1.274.2.227 -r 1.274.2.228 src/mainwindow.c;  cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/wizard.c;  ) > 3.2.0cvs33.patchset
+( cvs diff -u -r 1.10.2.15 -r 1.10.2.16 po/pl.po;  cvs diff -u -r 1.12.2.53 -r 1.12.2.54 src/prefs_template.c;  cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/wizard.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/gtk/description_window.c;  ) > 3.2.0cvs34.patchset

diff --git a/configure.ac b/configure.ac
index 2a63cd466adee5c4f534e015f3b92ea79692ce0f..cc51b23f5e986278781de44497d9d3b1e402bdb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/po/pl.po b/po/pl.po
index a9c9c8c08fcdef54f861b6a90f9801c4ea96a191..544959c91f8423c055bec8c114d945bbdbb4c23e 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1019,7 +1019,7 @@ msgstr "Twoja wersja Claws Mail jest za stara aby u
 
 #: src/common/session.c:166 src/imap.c:1057
 msgid "SSL handshake failed\n"
-msgstr "B³±d po³±czenia SSL (%s)\n"
+msgstr "B³±d po³±czenia SSL\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"

diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index 2cb1d1ba0e959e116e72157c58578f9f66a2b417..20096034fc635fc5eed23f78e3a62eb358aec6fc 100644 (file)
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -57,13 +57,6 @@ void description_window_create(DescriptionWindow *dwindow)
                g_signal_connect(G_OBJECT(dwindow->window), "destroy",
                                GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dwindow->window);
 
-               gtk_main();
-
-               if (dwindow->window) {
-                       gtk_widget_hide(dwindow->window);
-                       gtk_widget_destroy(dwindow->window);
-                       dwindow->window = NULL; 
-               }
        } else g_print("windows exist\n");
 }
 
@@ -171,19 +164,19 @@ static void description_create(DescriptionWindow * dwindow)
        gtk_widget_grab_default(close_btn);
 
        g_signal_connect(G_OBJECT(close_btn), "clicked",
-                        G_CALLBACK(description_window_destroy), dwindow->parent);
+                        G_CALLBACK(description_window_destroy), dwindow);
        g_signal_connect(G_OBJECT(dwindow->window), "key_press_event",
-                        G_CALLBACK(description_window_key_pressed), dwindow->parent);
+                        G_CALLBACK(description_window_key_pressed), dwindow);
        g_signal_connect(G_OBJECT(dwindow->window), "focus_in_event",
                         G_CALLBACK(description_window_focus_in_event), NULL);
        g_signal_connect(G_OBJECT(dwindow->window), "focus_out_event",
                         G_CALLBACK(description_window_focus_out_event), NULL);
        g_signal_connect(G_OBJECT(dwindow->window), "delete_event",
-                        G_CALLBACK(description_window_destroy), dwindow->parent);
+                        G_CALLBACK(description_window_destroy), dwindow);
        
        if(dwindow->parent)
                g_signal_connect(G_OBJECT(dwindow->parent), "hide",
-                       G_CALLBACK(description_window_destroy), dwindow->parent);
+                       G_CALLBACK(description_window_destroy), dwindow);
 
        gtk_widget_show_all(vbox);
        gtk_widget_set_size_request(dwindow->window,
@@ -218,10 +211,17 @@ static gboolean description_window_focus_out_event (GtkWidget *widget,
        return FALSE;
 }
 
-static void description_window_destroy (GtkWidget *widget, gpointer parent)
+static void description_window_destroy (GtkWidget *widget, gpointer data)
 {
-       if(parent)
-               g_signal_handlers_disconnect_by_func(G_OBJECT(parent), 
-                                             description_window_destroy, parent);
-       gtk_main_quit();
+       DescriptionWindow *dwindow = (DescriptionWindow *) data;
+       
+       if(dwindow->window) {
+               gtk_widget_hide(dwindow->window);
+               gtk_widget_destroy(dwindow->window);
+               dwindow->window = NULL;
+       }
+       
+       if(dwindow->parent)
+               g_signal_handlers_disconnect_by_func(G_OBJECT(dwindow->parent), 
+                                       description_window_destroy, dwindow->parent);
 }

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 8990dea946cfc7a34e5cad96b39484abf11cad28..cc9f52c9982cc6e284c79a51cd04e428766b5dd2 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -331,7 +331,7 @@ static void prefs_template_window_create(void)
        gtk_widget_show(desc_btn);
        gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(desc_btn), "clicked",
-                        G_CALLBACK(quote_fmt_quote_description), NULL);
+                        G_CALLBACK(quote_fmt_quote_description), window);
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), desc_btn,
                        _("Click here to get further information "
                          "about templates format syntax"), NULL);

diff --git a/src/wizard.c b/src/wizard.c
index 97465473afc6bdc5406d67f76d9982cbbed5a866..1b4322975d3c83be35880a2da0ba5d3217a853b8 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1126,7 +1126,7 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        if (wizard->vol_mmc2 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc2)
            || strcmp(mount_path, MMC2_PATH)) {
                gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE);
-       } else
+       } else {
                gtk_toggle_button_set_active(wizard->data_root_mmc2_radiobtn, TRUE);
        }
        g_free(mount_path);