Index: ChangeLog
===================================================================
RCS file: /export/src/cvs/hydrogen/ChangeLog,v
retrieving revision 1.54.2.7.2.6
diff -u -r1.54.2.7.2.6 ChangeLog
--- ChangeLog	2003/11/14 07:36:39	1.54.2.7.2.6
+++ ChangeLog	2003/12/09 07:52:14
@@ -1,3 +1,14 @@
+2003-12-09  Carl Sun  <carl.sun@sun.com>
+
+	Fixes bugtraq #4899171.
+                                                                                                  
+       * storage/sunone-config-control.glade:
+       the widget "config-control-table" should be set as the GTK_CAN_FOCUS,
+	and the button "add_button" should not use the GTK_STOCK_BUTTON,and at
+	the same time,modifies the AccessKey to "Alt+d" to avoid the confliction
+	with other AccessKey.
+
+
 2003-11-14  Harry Lu  <harry.lu@sun.com>
 
 	reviewed by: Jack Jia
Index: storage/sunone-config-control.glade
===================================================================
RCS file: /export/src/cvs/hydrogen/storage/sunone-config-control.glade,v
retrieving revision 1.5
diff -u -r1.5 sunone-config-control.glade
--- storage/sunone-config-control.glade	2003/05/07 10:02:29	1.5
+++ storage/sunone-config-control.glade	2003/12/09 07:52:14
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="config-control-window">
   <property name="visible">True</property>
@@ -15,6 +16,7 @@
   <child>
     <widget class="GtkTable" id="config-control-table">
       <property name="visible">True</property>
+      <property name="can_focus">True</property>
       <property name="n_rows">3</property>
       <property name="n_columns">2</property>
       <property name="homogeneous">False</property>
@@ -25,9 +27,63 @@
 	<widget class="GtkButton" id="add-button">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
-	  <property name="label">gtk-add</property>
-	  <property name="use_stock">True</property>
 	  <property name="relief">GTK_RELIEF_NORMAL</property>
+
+	  <child>
+	    <widget class="GtkAlignment" id="alignment2">
+	      <property name="visible">True</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">0</property>
+	      <property name="yscale">0</property>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox2">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">2</property>
+
+		  <child>
+		    <widget class="GtkImage" id="image2">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-add</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label9">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">A_dd</property>
+		      <property name="use_underline">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="left_attach">1</property>
