aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-02-02 14:28:46 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-02-02 14:28:46 +0800
commit61f711d2548931f75eac2dd0e3a1e56d31e39b7e (patch)
tree39463678cb0f9d9994bf764441e831d416da6037
parent38d71c0a1563222ac3cd21592e9cf67cfad928d5 (diff)
downloadgsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.tar
gsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.tar.gz
gsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.tar.bz2
gsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.tar.lz
gsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.tar.xz
gsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.tar.zst
gsoc2013-evolution-61f711d2548931f75eac2dd0e3a1e56d31e39b7e.zip
god knows what else this'll break.
2004-02-02 Not Zed <NotZed@Ximian.com> ** See bug #53559. * em-folder-tree.c (folder_tree_new): set CAN_FOCUS flag on the folder tree content widget. * em-folder-selector.c (em_folder_selector_construct): Don't wrap the folder tree in a scrolled window. Its already in one ????. (em_folder_selector_construct): dont set can_focus on the folder tree. svn path=/trunk/; revision=24563
-rw-r--r--mail/ChangeLog12
-rw-r--r--mail/em-folder-selector.c13
-rw-r--r--mail/em-folder-tree.c1
3 files changed, 14 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d778870d84..1b90863d5a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-02 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #53559.
+
+ * em-folder-tree.c (folder_tree_new): set CAN_FOCUS flag on the
+ folder tree content widget.
+
+ * em-folder-selector.c (em_folder_selector_construct): Don't wrap
+ the folder tree in a scrolled window. Its already in one ????.
+ (em_folder_selector_construct): dont set can_focus on the folder
+ tree.
+
2004-02-01 Bill Zhu <bill.zhu@sun.com>
Fixes for bug #53530
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 843ed018cf..64f0b05da8 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -178,7 +178,6 @@ folder_selected_cb (EMFolderTree *emft, const char *path, const char *uri, EMFol
void
em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint32 flags, const char *title, const char *text)
{
- GtkWidget *scrolled_window;
GtkWidget *label;
gtk_window_set_default_size (GTK_WINDOW (emfs), 350, 300);
@@ -205,16 +204,7 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3
gtk_widget_show ((GtkWidget *) emft);
g_signal_connect (emfs->emft, "folder-selected", G_CALLBACK (folder_selected_cb), emfs);
-
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_widget_show (scrolled_window);
-
- gtk_container_add (GTK_CONTAINER (scrolled_window), (GtkWidget *) emft);
-
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (emfs)->vbox), scrolled_window, TRUE, TRUE, 6);
+ gtk_box_pack_end (GTK_BOX (GTK_DIALOG (emfs)->vbox), (GtkWidget *)emft, TRUE, TRUE, 6);
if (text != NULL) {
label = gtk_label_new (text);
@@ -224,7 +214,6 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (emfs)->vbox), label, FALSE, TRUE, 6);
}
- GTK_WIDGET_SET_FLAGS ((GtkWidget *) emfs->emft, GTK_CAN_FOCUS);
gtk_widget_grab_focus ((GtkWidget *) emfs->emft);
}
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index e691798e78..2aef2f7141 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -332,6 +332,7 @@ folder_tree_new (EMFolderTreeModel *model)
GtkWidget *tree;
tree = gtk_tree_view_new_with_model ((GtkTreeModel *) model);
+ GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
column = gtk_tree_view_column_new ();
gtk_tree_view_append_column ((GtkTreeView *) tree, column);