STABLE14-windows-icons-20050919

Associate the OpenAFS icon with the Control Panel and Service and
the installers

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

Update icon to OpenAFS logo

(cherry picked from commit cc8cfd47bc506396501c9bd2225dd907567e36b7)

diff --git a/src/WINNT/afsd/OpenAFS.ico b/src/WINNT/afsd/OpenAFS.ico
new file mode 100644 (file)
index 0000000..40810ae
Binary files /dev/null and b/src/WINNT/afsd/OpenAFS.ico differ

diff --git a/src/WINNT/afsd/afsd.rc b/src/WINNT/afsd/afsd.rc
index de954d0e199d10807682851329718e7f06b9abbd..58d567432a698aa552286b5d7d6c346d8d44b7d0 100644 (file)
--- a/src/WINNT/afsd/afsd.rc
+++ b/src/WINNT/afsd/afsd.rc
@@ -18,7 +18,7 @@ BEGIN
        END
 END
 
-AFSDIcon       ICON    afsd.ico
+AFSDIcon       ICON    OpenAFS.ico
 /* Define VERSIONINFO resource */
 
 #define  AFS_VERINFO_FILE_DESCRIPTION "AFS Client Driver Application"

diff --git a/src/WINNT/afsd/afsd_service.rc b/src/WINNT/afsd/afsd_service.rc
index c9c8a065c9b22998b8fdd5e6bfb2b77c6055a99b..b2443e90f3aaaedd9db18d72e3484aa4c823b2a5 100644 (file)
--- a/src/WINNT/afsd/afsd_service.rc
+++ b/src/WINNT/afsd/afsd_service.rc
@@ -16,5 +16,5 @@
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
 
-1       ICON    afsd.ico
+1       ICON    OpenAFS.ico
 

diff --git a/src/WINNT/client_config/OpenAFS.ico b/src/WINNT/client_config/OpenAFS.ico
new file mode 100644 (file)
index 0000000..40810ae
Binary files /dev/null and b/src/WINNT/client_config/OpenAFS.ico differ

diff --git a/src/WINNT/client_config/afs_config_stub.rc b/src/WINNT/client_config/afs_config_stub.rc
index 14a5a5902155384bf2baddaa38f225f2a7cfcd86..8e1d89e59fc291fe0512c8549eed5bcbbdc90949 100644 (file)
--- a/src/WINNT/client_config/afs_config_stub.rc
+++ b/src/WINNT/client_config/afs_config_stub.rc
@@ -15,4 +15,4 @@
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
 
-IDI_MAIN                ICON    DISCARDABLE     "afs_config.ico"
+IDI_MAIN                ICON    DISCARDABLE     "OpenAFS.ico"

diff --git a/src/WINNT/client_cpa/OpenAFS.ico b/src/WINNT/client_cpa/OpenAFS.ico
new file mode 100644 (file)
index 0000000..40810ae
Binary files /dev/null and b/src/WINNT/client_cpa/OpenAFS.ico differ

diff --git a/src/WINNT/client_cpa/afs_cpa_stub.rc b/src/WINNT/client_cpa/afs_cpa_stub.rc
index e8ca29bb6732beb2841d57a9246fd8c024a70762..a74552d5bfa716ff6badfa868607287d9a9ae668 100644 (file)
--- a/src/WINNT/client_cpa/afs_cpa_stub.rc
+++ b/src/WINNT/client_cpa/afs_cpa_stub.rc
@@ -15,5 +15,5 @@
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
 
-IDI_AFSD                ICON    DISCARDABLE     "afs_conf.ico"
-IDI_CCENTER                    ICON    DISCARDABLE         "afs_ccenter.ico"
+IDI_AFSD                ICON    DISCARDABLE     "OpenAFS.ico"
+IDI_CCENTER            ICON    DISCARDABLE     "afs_ccenter.ico"

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 00388e7816f804b6366a3d13e0cc78c6fa7681a0..b3d0c5d0b87a2629e4426d0e039abb392ecb1d71 100644 (file)
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -71,8 +71,8 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug"
 !endif
   SilentInstall normal
   SetCompressor /solid lzma
-  !define MUI_ICON "..\..\client_config\afs_config.ico"
-  !define MUI_UNICON "..\..\client_config\afs_config.ico"
+  !define MUI_ICON "..\..\client_config\OpenAFS.ico"
+  !define MUI_UNICON "..\..\client_config\OpenAFS.ico"
   !define AFS_COMPANY_NAME "OpenAFS"
   !define AFS_PRODUCT_NAME "OpenAFS"
   !define AFS_REGKEY_ROOT "Software\TransarcCorporation"
@@ -1293,6 +1293,8 @@ contInstall:
    StrCmp $R0 "rpcrt4.dll" contInstall2
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncadg_ip_udp"
    StrCmp $R0 "rpcrt4.dll" contInstall2
+   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http"
+   StrCmp $R0 "rpcrt4.dll" contInstall2
    
    MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST "An error was detected with your Windows RPC installation. Please make sure Windows RPC is installed before installing OpenAFS."
    Abort

diff --git a/src/WINNT/install/wix/Icon/ico_OpenAFS.ico b/src/WINNT/install/wix/Icon/ico_OpenAFS.ico
index 3c434f1ea0db90955a7f6a2a7940cb6522dbf7b1..40810ae0909e5d634fa69f2a35591de48072f65f 100644 (file)
Binary files a/src/WINNT/install/wix/Icon/ico_OpenAFS.ico and b/src/WINNT/install/wix/Icon/ico_OpenAFS.ico differ