PS_GETNAME: another old atavism removed

3 files changed, 1 insertions, 11 deletions

diff --git a/protocols/Weather/src/stdafx.h b/protocols/Weather/src/stdafx.h
index d61a64e71a..64993c86ef 100644
--- a/protocols/Weather/src/stdafx.h
+++ b/protocols/Weather/src/stdafx.h
@@ -67,7 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 // name

 #define MODULENAME         "Weather"

-#define WEATHERPROTOTEXT   "Weather"

 #define DEFCURRENTWEATHER  "WeatherCondition"

 #define WEATHERCONDITION   "Current"

 

diff --git a/protocols/Weather/src/weather_opt.cpp b/protocols/Weather/src/weather_opt.cpp
index c4b42ede5c..1d92f20191 100644
--- a/protocols/Weather/src/weather_opt.cpp
+++ b/protocols/Weather/src/weather_opt.cpp
@@ -487,7 +487,7 @@ int OptInit(WPARAM wParam, LPARAM)
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
 	odp.pfnDlgProc = OptionsProc;
 	odp.szGroup.a = LPGEN("Network");
-	odp.szTitle.a = WEATHERPROTOTEXT;
+	odp.szTitle.a = MODULENAME;
 	odp.szTab.a = LPGEN("General");
 	odp.flags = ODPF_BOLDGROUPS;
 	g_plugin.addOptions(wParam, &odp);
diff --git a/protocols/Weather/src/weather_svcs.cpp b/protocols/Weather/src/weather_svcs.cpp
index 3c4c775347..ced1ce5c71 100644
--- a/protocols/Weather/src/weather_svcs.cpp
+++ b/protocols/Weather/src/weather_svcs.cpp
@@ -81,14 +81,6 @@ INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM)
 	return ret;
 }
 
-// protocol service function to get weather protocol name
-INT_PTR WeatherGetName(WPARAM wParam, LPARAM lParam)
-{
-	strncpy((char*)lParam, WEATHERPROTOTEXT, wParam - 1);
-	*((char*)lParam + wParam - 1) = 0;
-	return 0;
-}
-
 // protocol service function to get the current status of the protocol
 INT_PTR WeatherGetStatus(WPARAM, LPARAM)
 {
@@ -264,7 +256,6 @@ static INT_PTR WeatherAdvancedStatusIcon(WPARAM hContact, LPARAM)
 void InitServices(void)
 {
 	CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, WeatherGetCaps);
-	CreateProtoServiceFunction(MODULENAME, PS_GETNAME, WeatherGetName);
 	CreateProtoServiceFunction(MODULENAME, PS_LOADICON, WeatherLoadIcon);
 	CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, WeatherSetStatus);
 	CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, WeatherGetStatus);