From 0447596e56ad9f8b7bdf94e1731d9b0feb41b8fd Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 6 Jan 2006 08:21:00 +0000
Subject: accept when name entry is activated on the save search dialog.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@876 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog            |  7 +++++++
 ChangeLog.ja         |  7 +++++++
 src/summary_search.c | 14 ++++++++++++++
 src/summaryview.c    |  2 +-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5cedbefe..1ba22dd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-06
+
+	* src/summary_search.c: accept when name entry is activated on the
+	  save dialog.
+	* src/summaryview.c: summary_status_show(): use gint64 for sel_size to
+	  avoid overflow on environments where sizeof(off_t) is 4.
+
 2006-01-06
 
 	* libsylph/virtual.c: don't compare temporary flags (fixes a bug that
diff --git a/ChangeLog.ja b/ChangeLog.ja
index c4dc1ca1..5a8bf2f1 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,10 @@
+2006-01-06
+
+	* src/summary_search.c: 保存ダイアログで名前エントリがアクティベート
+	  されたら受け付けるようにした。
+	* src/summaryview.c: summary_status_show(): sizeof(off_t) が 4 の環境
+	  でのオーバーフローを防ぐため sel_size に gint64 を使用。
+
 2006-01-06
 
 	* libsylph/virtual.c: 一時フラグを比較しないようにした(検索キャッシュ
diff --git a/src/summary_search.c b/src/summary_search.c
index d3f80022..e454510c 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -114,6 +114,9 @@ typedef struct {
 	GtkWidget *folder_entry;
 	GtkWidget *name_entry;
 
+	GtkWidget *ok_btn;
+	GtkWidget *cancel_btn;
+
 	gboolean cancelled;
 	gboolean finished;
 } SummarySearchSaveDialog;
@@ -776,6 +779,13 @@ static void summary_search_save_dialog_select_folder(GtkButton *button,
 	}
 }
 
+static void summary_search_save_activated(GtkEditable *editable, gpointer data)
+{
+	SummarySearchSaveDialog *dialog = (SummarySearchSaveDialog *)data;
+
+	gtk_button_clicked(GTK_BUTTON(dialog->ok_btn));
+}
+
 static void summary_search_save_ok(GtkButton *button, gpointer data)
 {
 	SummarySearchSaveDialog *dialog = (SummarySearchSaveDialog *)data;
@@ -851,6 +861,8 @@ static SummarySearchSaveDialog *summary_search_save_dialog_create(void)
 
 	name_entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(hbox), name_entry, TRUE, TRUE, 0);
+	g_signal_connect(G_OBJECT(name_entry), "activate",
+			 G_CALLBACK(summary_search_save_activated), dialog);
 
 	confirm_area = gtk_hbox_new(FALSE, 12);
 	gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -874,6 +886,8 @@ static SummarySearchSaveDialog *summary_search_save_dialog_create(void)
 	dialog->window = window;
 	dialog->folder_entry = folder_entry;
 	dialog->name_entry = name_entry;
+	dialog->ok_btn = ok_btn;
+	dialog->cancel_btn = cancel_btn;
 	dialog->cancelled = FALSE;
 	dialog->finished = FALSE;
 
diff --git a/src/summaryview.c b/src/summaryview.c
index bc7e2588..9bc86a14 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1730,7 +1730,7 @@ static void summary_status_show(SummaryView *summaryview)
 	gchar *spc;
 	GList *rowlist, *cur;
 	guint n_selected = 0;
-	off_t sel_size = 0;
+	gint64 sel_size = 0;
 	MsgInfo *msginfo;
 
 	if (!summaryview->folder_item) {
-- 
cgit v1.2.3