c_gui/CasaMain.cs

@@ -659,7 +659,7 @@ namespace Novell.CASA.GUI
 				case Common.STORE_MICASA: 				 
 					break;
     										
-				case Common.STORE_FIREFOX:	
+				case Common.STORE_FIREFOX:
 					if( false == objFirefox.IS_STORE_AGGREGATED )
 					{
 						if( StoreDataInterface.IsMasterPasswordSet(Common.STORE_FIREFOX) )
@@ -697,7 +697,12 @@ namespace Novell.CASA.GUI
 					break;
 			}
 		}
-	
+		
+		public void on_entryFirefoxMP_activate(object obj, EventArgs args)
+		{
+			on_buttonFirefoxMPok_clicked(obj, args);
+		}
+		
 		public void on_buttonFirefoxMPok_clicked(object obj, EventArgs args)
 		{
 			if( "" != entryFirefoxMP.Text )
@@ -956,7 +961,7 @@ namespace Novell.CASA.GUI
     	
 			if( Common.IS_FIREFOX )
 			{
-				if( false == objFirefox.IS_STORE_AGGREGATED )
+				if( false == objFirefox.IS_STORE_AGGREGATED && notebookStores.CurrentPage == Common.STORE_FIREFOX )
 				{
 					if( StoreDataInterface.IsMasterPasswordSet(Common.STORE_FIREFOX) )
 					{
@@ -968,6 +973,8 @@ namespace Novell.CASA.GUI
 				}
 				else
 					objFirefox.AggregateStore();
+				//if( true == objFirefox.IS_STORE_AGGREGATED )
+				//	objFirefox.AggregateStore();
 			}
 			
 			if( Common.IS_MOZILLA )

c_gui/images/casa.glade

@@ -10946,6 +10946,7 @@ password to view the secrets.</property>
 			  <property name="has_frame">True</property>
 			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
+			  <signal name="activate" handler="on_entryFirefoxMP_activate" last_modification_time="Thu, 09 Mar 2006 04:22:28 GMT"/>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>