Changeset 2460

Timestamp:

09/18/08 09:56:54 (4 months ago)

Author:

ahodgkinson

Message:

digitalme: Fixed Linux compile errors.

Location:

trunk/digitalme/ui/gtk/src

Files:

• gtkcs.cpp (modified) (1 diff)
• gtkcsmain.cpp (modified) (5 diffs)

trunk/digitalme/ui/gtk/src/gtkcs.cpp

@@ -6136 +6136 @@
         }
         
+        // Request a display token
+        
+        if( pDisplayTokenBuf)
+        {
+                if( RC_BAD( rc = pRSTTemplate->setRequestDisplayToken( TRUE)))
+                {
+                        goto Exit;
+                }
+        }
+        
         // Set the request template
         

trunk/digitalme/ui/gtk/src/gtkcsmain.cpp

@@ -94 +94 @@
         // If requested, disable the secure desktop
         
-        if( pArgSet->argIsPresent( DM_NON_SECURE_DESKTOP_ARG_STR))
+        if( pArgSet->argIsPresent( ISS_NON_SECURE_DESKTOP_ARG_STR))
         {
                 if( RC_BAD( rc = pUserInterface->enableSecureDesktop( FALSE)))
@@ -104 +104 @@
         // Determine the selector mode based on command-line parameters
         
-        if( pArgSet->argIsPresent( DM_VERSION_ARG_STR))
+        if( pArgSet->argIsPresent( ISS_VERSION_ARG_STR))
         {
                 F_StackDynaBuf<64>              verBuf;
@@ -116 +116 @@
                 goto Exit;
         }
-        else if( pArgSet->argIsPresent( DM_GET_TOKEN_ARG_STR))
+        else if( pArgSet->argIsPresent( ISS_GET_TOKEN_ARG_STR))
         {
                 if( pArgSet->argIsPresent( ISS_NON_INTERACTIVE_ARG_STR))
@@ -134 +134 @@
                         F_DynaBuf                               tokenBuf;       
                         
-                        if( pArgSet->argIsPresent( DM_TRUSTED_ISSUER_URIS_ARG_STR))
+                        if( pArgSet->argIsPresent( ISS_TRUSTED_ISSUER_URIS_ARG_STR))
                         {
                                 pszIssuerList = pArgSet->getString( 
-                                        DM_TRUSTED_ISSUER_URIS_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_RECIPIENT_ARG_STR))
-                        {
-                                pszRecipient = pArgSet->getString( DM_RECIPIENT_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_REQUIRED_CLAIMS_ARG_STR))
+                                        ISS_TRUSTED_ISSUER_URIS_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_RECIPIENT_ARG_STR))
+                        {
+                                pszRecipient = pArgSet->getString( ISS_RECIPIENT_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_REQUIRED_CLAIMS_ARG_STR))
                         {
                                 pszRequiredClaims = pArgSet->getString( 
-                                        DM_REQUIRED_CLAIMS_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_OPTIONAL_CLAIMS_ARG_STR))
+                                        ISS_REQUIRED_CLAIMS_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_OPTIONAL_CLAIMS_ARG_STR))
                         {
                                 pszOptionalClaims = pArgSet->getString( 
-                                        DM_OPTIONAL_CLAIMS_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_TOKEN_TYPE_ARG_STR))
+                                        ISS_OPTIONAL_CLAIMS_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_TOKEN_TYPE_ARG_STR))
                         {
                                 pszTokenType = pArgSet->getString( 
-                                        DM_TOKEN_TYPE_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_PRIVACY_URL_ARG_STR))
+                                        ISS_TOKEN_TYPE_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_PRIVACY_POLICY_URL_ARG_STR))
                         {
                                 pszPrivacyPolicyURL = pArgSet->getString( 
-                                        DM_PRIVACY_URL_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_CERT_FILE_ARG_STR))
+                                        ISS_PRIVACY_POLICY_URL_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_CERT_FILE_ARG_STR))
                         {
                                 pszCertFile = pArgSet->getString( 
-                                        DM_CERT_FILE_ARG_STR);
-                        }
-                        
-                        if( pArgSet->argIsPresent( DM_TOKEN_OUTPUT_FILE_ARG_STR))
+                                        ISS_CERT_FILE_ARG_STR);
+                        }
+                        
+                        if( pArgSet->argIsPresent( ISS_TOKEN_OUTPUT_FILE_ARG_STR))
                         {
                                 pszTokenOutputFile = pArgSet->getString( 
-                                        DM_TOKEN_OUTPUT_FILE_ARG_STR);
+                                        ISS_TOKEN_OUTPUT_FILE_ARG_STR);
                         }
                         
@@ -259 +259 @@
                         // Security token flags
                         
-                        if( pArgSet->argIsPresent( DM_MAP_TO_SIMPLE_ARG_STR))
+                        if( pArgSet->argIsPresent( ISS_MAP_TO_SIMPLE_ARG_STR))
                         {
                                 uiSecTokenFlags |= ISS_GST_MAP_TO_SIMPLE_FLAG;