geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
smanojna 2006-03-09 04:45:36 +00:00
parent 92782922b9
commit 4b927ead3e
5 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c_adlib/ad_ff/FireFox.cs
View File

@ -260,7 +260,7 @@ public class HostElement
methodStatusCode = FPM_GetSignonData(profileName,out hostListIntPtr,LOAD_PROFILE_ALWAYSFROM_FILE); methodStatusCode = FPM_GetSignonData(profileName,out hostListIntPtr,LOAD_PROFILE_ALWAYSFROM_FILE);
if( 1 != methodStatusCode ) if( 1 != methodStatusCode )
{ {
Console.WriteLine("FireFox:Getting Data for profile Failed with error "+methodStatusCode); //Console.WriteLine("FireFox:Getting Data for profile Failed with error "+methodStatusCode);
hostList=null; hostList=null;
return hostList; return hostList;
} }

6
c_adlib/ad_ff/native/Common.cpp
View File

@ -17,8 +17,10 @@ void PrintMessage( int level, char *mesg , ...)
#ifdef DEBUG #ifdef DEBUG
printf("%s", lastErrorMesg ); printf("%s", lastErrorMesg );
#else #else
if( level != MESG_DEBUG ) if( level != MESG_DEBUG )
printf("%s", lastErrorMesg ); {
//printf("%s", lastErrorMesg );
}
#endif #endif
} }

16
c_adlib/ad_gk/native/ad_gk.c
View File

@ -578,7 +578,7 @@ OperationCompletedCb (GnomeKeyringResult result,
gpointer data) gpointer data)
{ {
OperationCompleted *cbData = (OperationCompleted *)data; OperationCompleted *cbData = (OperationCompleted *)data;
g_print ("ad_gk.c : Operation %s Completed %d\n", cbData->OperationName, result); //g_print ("ad_gk.c : Operation %s Completed %d\n", cbData->OperationName, result);
cbData->result = result; cbData->result = result;
g_main_loop_quit (loop); g_main_loop_quit (loop);
} }
@ -589,10 +589,10 @@ CreateItemCb (GnomeKeyringResult result,
gpointer data) gpointer data)
{ {
OperationCompleted *cbData = (OperationCompleted *)data; OperationCompleted *cbData = (OperationCompleted *)data;
g_print ("ad_gk.c : CreateItemCb : created item: res: %d id: %d\n", result, id); //g_print ("ad_gk.c : CreateItemCb : created item: res: %d id: %d\n", result, id);
if (result != GNOME_KEYRING_RESULT_OK) if (result != GNOME_KEYRING_RESULT_OK)
{ {
g_print ("ad_gk.c : CreateItemCb : Unable to create item : %d\n", result); //g_print ("ad_gk.c : CreateItemCb : Unable to create item : %d\n", result);
} }
cbData->result = result; cbData->result = result;
g_main_loop_quit (loop); g_main_loop_quit (loop);
@ -679,7 +679,7 @@ void ListKeyringsCb (GnomeKeyringResult result,
if (result != GNOME_KEYRING_RESULT_OK) if (result != GNOME_KEYRING_RESULT_OK)
{ {
g_print ("Unable to get keyring list - %d\n", result); //g_print ("Unable to get keyring list - %d\n", result);
} }
else else
{ {
@ -700,7 +700,7 @@ void KeyringGetInfoCb(GnomeKeyringResult result,
KeyringInfo *retInfo = cbData->info; KeyringInfo *retInfo = cbData->info;
if (result != GNOME_KEYRING_RESULT_OK) if (result != GNOME_KEYRING_RESULT_OK)
{ {
g_print ("Unable to get keyring info %d\n", result); //g_print ("Unable to get keyring info %d\n", result);
} }
else else
{ {
@ -724,7 +724,7 @@ void ListItemCb( GnomeKeyringResult result,
if (result != GNOME_KEYRING_RESULT_OK) if (result != GNOME_KEYRING_RESULT_OK)
{ {
g_print ("Unable to get list of items : %d\n", result); //g_print ("Unable to get list of items : %d\n", result);
} }
else else
{ {
@ -742,7 +742,7 @@ void ItemGetInfoCb( GnomeKeyringResult result,
ItemInfo *itemInfo = cbData->info; ItemInfo *itemInfo = cbData->info;
if (result != GNOME_KEYRING_RESULT_OK) if (result != GNOME_KEYRING_RESULT_OK)
{ {
g_print ("Unable to get Item info: %d\n", result); //g_print ("Unable to get Item info: %d\n", result);
} }
else else
{ {
@ -772,7 +772,7 @@ void ItemGetAttributesCb(GnomeKeyringResult result,
if( result != GNOME_KEYRING_RESULT_OK ) if( result != GNOME_KEYRING_RESULT_OK )
{ {
g_print("Unable to get the attributes of item\n"); //g_print("Unable to get the attributes of item\n");
} }
else else
{ {

13
c_gui/CasaMain.cs
View File

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

1
c_gui/images/casa.glade
View File

@ -10946,6 +10946,7 @@ password to view the secrets.</property>
<property name="has_frame">True</property> <property name="has_frame">True</property>
<property name="invisible_char">*</property> <property name="invisible_char">*</property>
<property name="activates_default">False</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> </widget>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>