aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-01-27 08:58:39 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-01-27 08:58:39 +0000
commit2de338ed5bf7738031e199bf9f25ba1132fc424d (patch)
tree416c1a361f6019befd5f38a09351ab7a970c7e21
parentf66f1acd680e2f3939e61bbf6bd3c36ad9b8448e (diff)
fixes wrong drag begin state after passphrase dialog appeared.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@937 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/summaryview.c19
3 files changed, 30 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e4654d3..aa2d1bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-27
+ * src/summaryview.c: summary_selection_changed(): display message in
+ idle function (fixes wrong drag begin state after passphrase dialog
+ appeared).
+
+2006-01-27
+
* src/passphrase.c: convert passphrase into locale encoding.
2006-01-27
diff --git a/ChangeLog.ja b/ChangeLog.ja
index bf0666c2..761dd22d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2006-01-27
+ * src/summaryview.c: summary_selection_changed(): idle 関数内で
+ メッセージを表示するようにした(パスフレーズダイアログを表示した後
+ 誤ってドラッグ開始状態になるのを修正)。
+
+2006-01-27
+
* src/passphrase.c: パスフレーズをロケールエンコーディングに変換する
ようにした。
diff --git a/src/summaryview.c b/src/summaryview.c
index df95a6f2..6cd7a325 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5338,6 +5338,23 @@ static gboolean summary_select_func(GtkTreeSelection *treeview,
return summaryview->can_toggle_selection;
}
+static gboolean summary_display_msg_idle_func(gpointer data)
+{
+ SummaryView *summaryview = (SummaryView *)data;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+
+ path = gtk_tree_row_reference_get_path(summaryview->selected);
+ if (path) {
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(summaryview->store),
+ &iter, path);
+ g_free(path);
+ summary_display_msg(summaryview, &iter);
+ }
+
+ return FALSE;
+}
+
static void summary_selection_changed(GtkTreeSelection *selection,
SummaryView *summaryview)
{
@@ -5381,7 +5398,7 @@ static void summary_selection_changed(GtkTreeSelection *selection,
summaryview->display_msg = FALSE;
if (!gtkut_tree_row_reference_equal(summaryview->displayed,
summaryview->selected)) {
- summary_display_msg(summaryview, &iter);
+ g_idle_add(summary_display_msg_idle_func, summaryview);
return;
}
}