Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2999
diff -u -r1.2999 ChangeLog
--- ChangeLog	15 Feb 2006 06:40:20 -0000	1.2999
+++ ChangeLog	22 Feb 2006 11:51:30 -0000
@@ -1,3 +1,12 @@
+2006-02-22  Boby Wang <boby.wang@sun.com>
+
+	** Fix for bug #268584
+	
+	* gui/dialogs/cal-attachment-select-file.c: (run_selector):
+	* gui/dialogs/cal-attachment.glade:
+	set the accelerate key for "Suggest Suggest automatic display of
+	attachment"
+
 2006-02-15  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
 
 	* gui/dialogs/memo-page.glade: Changed the layout spacing of memo 
Index: gui/dialogs/cal-attachment-select-file.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-attachment-select-file.c,v
retrieving revision 1.2
diff -u -r1.2 cal-attachment-select-file.c
--- gui/dialogs/cal-attachment-select-file.c	8 Feb 2006 13:06:24 -0000	1.2
+++ gui/dialogs/cal-attachment-select-file.c	22 Feb 2006 11:51:30 -0000
@@ -93,7 +93,7 @@
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path);
 	
         if (showinline_p) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
+		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
 		gtk_widget_show (showinline);
 		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
         }
@@ -112,7 +112,7 @@
 	}
 	
 	if (showinline_p) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
+		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
 		gtk_widget_show (showinline);
 		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
 	}
Index: gui/dialogs/cal-attachment.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-attachment.glade,v
retrieving revision 1.1
diff -u -r1.1 cal-attachment.glade
--- gui/dialogs/cal-attachment.glade	8 Jan 2005 10:47:59 -0000	1.1
+++ gui/dialogs/cal-attachment.glade	22 Feb 2006 11:51:30 -0000
@@ -207,7 +207,7 @@
 	    <widget class="GtkCheckButton" id="disposition_checkbox">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Suggest automatic display of attachment</property>
+	      <property name="label" translatable="yes">_Suggest automatic display of attachment</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="active">False</property>
? e-msg-composer-attachment.gladep
? mail-composer.error
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.735
diff -u -r1.735 ChangeLog
--- ChangeLog	15 Feb 2006 23:33:45 -0000	1.735
+++ ChangeLog	22 Feb 2006 11:56:43 -0000
@@ -1,3 +1,12 @@
+2006-02-22  Boby Wang <boby.wang@sun.com>
+
+	** Fix for bug #268584
+	
+	* e-msg-composer-attachment.glade:
+	* e-msg-composer-select-file.c: (get_selector):
+	set the accelerate key for "Suggest Suggest automatic display of
+	attachment"
+
 2006-02-16  Tor Lillqvist  <tml@novell.com>
 
 	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to)
Index: e-msg-composer-attachment.glade
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-attachment.glade,v
retrieving revision 1.10
diff -u -r1.10 e-msg-composer-attachment.glade
--- e-msg-composer-attachment.glade	21 Apr 2003 17:45:52 -0000	1.10
+++ e-msg-composer-attachment.glade	22 Feb 2006 11:56:43 -0000
@@ -12,6 +12,12 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -34,6 +40,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -46,6 +53,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -76,7 +84,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
+	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -98,7 +106,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
+	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -123,6 +131,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -147,6 +159,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -171,6 +187,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -191,7 +211,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
+	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -207,9 +227,10 @@
 	    <widget class="GtkCheckButton" id="disposition_checkbox">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Suggest automatic display of attachment</property>
+	      <property name="label" translatable="yes">_Suggest automatic display of attachment</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
Index: e-msg-composer-select-file.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-select-file.c,v
retrieving revision 1.39
diff -u -r1.39 e-msg-composer-select-file.c
--- e-msg-composer-select-file.c	14 Dec 2005 14:04:50 -0000	1.39
+++ e-msg-composer-select-file.c	22 Feb 2006 11:56:43 -0000
@@ -94,7 +94,7 @@
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path);
 	
         if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
+		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
 		gtk_widget_show (showinline);
 		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
 		g_object_set_data((GObject *)selection, "show-inline", showinline);
@@ -114,7 +114,7 @@
 	}
 	
         if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
+		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
 		gtk_widget_show (showinline);
 		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
 		g_object_set_data((GObject *)selection, "show-inline", showinline);
