From cc29fd999a8ff3a0fd8508b89a1cf462f3afdb50 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 6 Jun 2003 08:12:43 +0000 Subject: [PATCH] sync with 0.9.2 release --- ChangeLog | 7 +++++++ ChangeLog.claws | 4 ++++ ChangeLog.jp | 7 +++++++ NEWS | 18 ++++++++++++++++++ configure.ac | 2 +- src/filesel.c | 12 ++++++++---- src/foldersel.c | 12 +++++++----- src/inputdialog.c | 20 ++++++++++++-------- 8 files changed, 64 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3770a7fd..26f550859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-06-06 + + * src/filesel.c + src/foldersel.c + src/inputdialog.c: use gtk_main_iteration() instead of gtk_main() + to prevent abort when a button is double-clicked. + 2003-06-02 * src/addr_compl.c: invalidate_address_completion(): check if diff --git a/ChangeLog.claws b/ChangeLog.claws index aeaeb7d53..b31b1ff8c 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,7 @@ +2003-06-06 [paul] 0.9.0claws12 + + * sync with 0.9.2 release + 2003-06-02 [paul] 0.9.0claws11 * sync with 0.9.1cvs1 diff --git a/ChangeLog.jp b/ChangeLog.jp index 80c7e5046..9615dda08 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,3 +1,10 @@ +2003-06-06 + + * src/filesel.c + src/foldersel.c + src/inputdialog.c: ¥Ü¥¿¥ó¤¬¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤µ¤ì¤¿¤È¤­¤Ë½ªÎ»¤·¤Æ¤·¤Þ¤¦ + ¤Î¤òËɤ°¤¿¤á¤Ë gtk_main() ¤ÎÂå¤ï¤ê¤Ë gtk_main_iteration() ¤ò»ÈÍÑ¡£ + 2003-06-02 * src/addr_compl.c: invalidate_address_completion(): g_completion_list diff --git a/NEWS b/NEWS index 20173216c..7655d446b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,23 @@ Changes of Sylpheed +* 0.9.2 + + * The bug that removed messages from server if "Don't receive" action is + specified by the filter rule has been fixed. + * The bug that caused abort when a button is double-clicked on some + dialogs has been fixed. + * A warning that was displayed when address book was empty has been fixed. + +* 0.9.1 + + * The bug in handling folder names which include '+' in IMAP4 modified + UTF-7 conversion has been fixed. + * The parsing of message/rfc822 parts in multipart messages has been + fixed. + * Several bugs of auto signature replacement has been fixed. + * A bug that didn't hide user string in the Action dialog has been fixed. + * Socket I/O timeout interval is now configurable. + * 0.9.0 * The multi-process network I/O has been implemented for POP3 and SMTP. diff --git a/configure.ac b/configure.ac index 58330adf5..28d2860ed 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws11 +EXTRA_VERSION=claws12 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/filesel.c b/src/filesel.c index 20978f310..840695d88 100644 --- a/src/filesel.c +++ b/src/filesel.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2002 Hiroyuki Yamamoto + * Copyright (C) 1999-2003 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ static GtkWidget *filesel; static gboolean filesel_ack; +static gboolean filesel_fin; static gchar *filesel_oldfilename; static void filesel_create(const gchar *title, gboolean multiple_files); @@ -83,7 +84,10 @@ gchar *filesel_select_file(const gchar *title, const gchar *file) gtk_widget_show(filesel); - gtk_main(); + filesel_ack = filesel_fin = FALSE; + + while (filesel_fin == FALSE) + gtk_main_iteration(); if (filesel_ack) { gchar *str; @@ -210,13 +214,13 @@ static void filesel_create(const gchar *title, gboolean multiple_files) static void filesel_ok_cb(GtkWidget *widget, gpointer data) { filesel_ack = TRUE; - gtk_main_quit(); + filesel_fin = TRUE; } static void filesel_cancel_cb(GtkWidget *widget, gpointer data) { filesel_ack = FALSE; - gtk_main_quit(); + filesel_fin = TRUE; } static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data) diff --git a/src/foldersel.c b/src/foldersel.c index 7f02cf09e..0c2639308 100644 --- a/src/foldersel.c +++ b/src/foldersel.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2002 Hiroyuki Yamamoto + * Copyright (C) 1999-2003 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -62,6 +62,7 @@ static GtkWidget *cancel_button; static FolderItem *folder_item; static gboolean cancelled; +static gboolean finished; static void foldersel_create (void); static void foldersel_init (void); @@ -122,9 +123,10 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, gtk_widget_grab_focus(ok_button); gtk_widget_grab_focus(ctree); - cancelled = FALSE; + cancelled = finished = FALSE; - gtk_main(); + while (finished == FALSE) + gtk_main_iteration(); gtk_widget_hide(window); gtk_entry_set_text(GTK_ENTRY(entry), ""); @@ -325,13 +327,13 @@ static void foldersel_ok(GtkButton *button, gpointer data) folder_item = gtk_ctree_node_get_row_data (GTK_CTREE(ctree), GTK_CTREE_NODE(list->data)); - gtk_main_quit(); + finished = TRUE; } static void foldersel_cancel(GtkButton *button, gpointer data) { cancelled = TRUE; - gtk_main_quit(); + finished = TRUE; } static void foldersel_activated(void) diff --git a/src/inputdialog.c b/src/inputdialog.c index 2966a439a..ed7e4b03d 100644 --- a/src/inputdialog.c +++ b/src/inputdialog.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2002 Hiroyuki Yamamoto + * Copyright (C) 1999-2003 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,6 +52,7 @@ typedef enum } InputDialogType; static gboolean ack; +static gboolean fin; static InputDialogType type; @@ -230,7 +231,10 @@ static gchar *input_dialog_open(const gchar *title, const gchar *message, gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); manage_window_set_transient(GTK_WINDOW(dialog)); - gtk_main(); + ack = fin = FALSE; + + while (fin == FALSE) + gtk_main_iteration(); manage_window_focus_out(dialog, NULL, NULL); gtk_widget_hide(dialog); @@ -283,19 +287,19 @@ static void input_dialog_set(const gchar *title, const gchar *message, static void ok_clicked(GtkWidget *widget, gpointer data) { ack = TRUE; - gtk_main_quit(); + fin = TRUE; } static void cancel_clicked(GtkWidget *widget, gpointer data) { ack = FALSE; - gtk_main_quit(); + fin = TRUE; } static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data) { ack = FALSE; - gtk_main_quit(); + fin = TRUE; return TRUE; } @@ -304,18 +308,18 @@ static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) { ack = FALSE; - gtk_main_quit(); + fin = TRUE; } } static void entry_activated(GtkEditable *editable) { ack = TRUE; - gtk_main_quit(); + fin = TRUE; } static void combo_activated(GtkEditable *editable) { ack = TRUE; - gtk_main_quit(); + fin = TRUE; } -- 2.25.1