From 06c4d898e1cb4440fcca673a65d5f68de35abe4c Mon Sep 17 00:00:00 2001 From: "raman%netscape.com" Date: Wed, 2 Sep 1998 19:05:33 +0000 Subject: [PATCH] Merging 4.5 SmartUpdate changes --- cmd/winfe/prefs.cpp | 7 ------- cmd/winfe/prefs/brpref/public/ibrprefs.h | 1 - cmd/winfe/prefs/brpref/src/advpages.cpp | 19 ------------------- 3 files changed, 27 deletions(-) diff --git a/cmd/winfe/prefs.cpp b/cmd/winfe/prefs.cpp index b7ead87dafed..49497a02f052 100644 --- a/cmd/winfe/prefs.cpp +++ b/cmd/winfe/prefs.cpp @@ -1862,7 +1862,6 @@ class CSmartUpdatePrefs : public ISmartUpdatePrefs { STDMETHODIMP_(ULONG) Release(); // ISmartUpdatePrefs methods - STDMETHODIMP_(LONG) RegPack(); STDMETHODIMP_(LONG) Uninstall(char* regPackageName); STDMETHODIMP_(LONG) EnumUninstall(void** context, char* packageName, LONG len1, char*regPackageName, LONG len2); @@ -1911,12 +1910,6 @@ CSmartUpdatePrefs::Release() return m_uRef; } -STDMETHODIMP_(LONG) -CSmartUpdatePrefs::RegPack() -{ - return VR_PackRegistry(); -} - STDMETHODIMP_(LONG) CSmartUpdatePrefs::Uninstall(char* regPackageName) { diff --git a/cmd/winfe/prefs/brpref/public/ibrprefs.h b/cmd/winfe/prefs/brpref/public/ibrprefs.h index a2b469075187..a3b1ac90f11b 100644 --- a/cmd/winfe/prefs/brpref/public/ibrprefs.h +++ b/cmd/winfe/prefs/brpref/public/ibrprefs.h @@ -146,7 +146,6 @@ DECLARE_INTERFACE_(ISmartUpdatePrefs, IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; // IBrowserPrefs methods - STDMETHOD_(LONG,RegPack)(THIS) PURE; STDMETHOD_(LONG,Uninstall)(THIS_ char* regPackageName) PURE; STDMETHOD_(LONG,EnumUninstall)(THIS_ void** context, char* packageName, LONG len1, char*regPackageName, LONG len2) PURE; diff --git a/cmd/winfe/prefs/brpref/src/advpages.cpp b/cmd/winfe/prefs/brpref/src/advpages.cpp index 46e1ce61a089..15995ab87869 100644 --- a/cmd/winfe/prefs/brpref/src/advpages.cpp +++ b/cmd/winfe/prefs/brpref/src/advpages.cpp @@ -663,25 +663,6 @@ BOOL CSmartUpdatePrefs::OnCommand(int id, HWND hwndCtl, UINT notifyCode) { if (id == IDC_BUTTON1 && notifyCode == BN_CLICKED) { - assert(m_pObject); - if (m_pObject) { - LPADVANCEDPREFS lpAdvancedPrefs; - - if (SUCCEEDED(m_pObject->QueryInterface(IID_IAdvancedPrefs, (void **)&lpAdvancedPrefs))) { - - LPSMARTUPDATEPREFS lpSmartUpdatePrefs; - - if (SUCCEEDED(lpAdvancedPrefs->QueryInterface(IID_ISmartUpdatePrefs, (void **)&lpSmartUpdatePrefs))) { - - lpSmartUpdatePrefs->RegPack(); - lpSmartUpdatePrefs->Release(); - } - } - } - - return TRUE; - - } else if (id == IDC_BUTTON2 && notifyCode == BN_CLICKED) { LPSU_PACKAGEINFO packageInfo = NULL; HWND hList = GetDlgItem(m_hwndDlg, IDC_LIST1); int nIndex = 0;