modified menu item text change logic

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@287 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 10 insertions, 13 deletions

diff --git a/yapp/services.cpp b/yapp/services.cpp
index 3708a35..c867620 100644
--- a/yapp/services.cpp
+++ b/yapp/services.cpp
@@ -205,6 +205,14 @@ int IsSecondLineShown(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
+void UpdateMenu() {
+	CLISTMENUITEM menu = {0};
+	menu.cbSize = sizeof(CLISTMENUITEM);
+	menu.pszName = (DBGetContactSettingByte(0, MODULE, "Enabled", 1) == 1 ? Translate("Disable Popups") : Translate("Enable Popups"));
+	menu.flags = CMIM_NAME;// | CMIM_ICON;
+	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuToggleOnOff, (LPARAM)&menu);
+}
+
 int PopupQuery(WPARAM wParam, LPARAM lParam) {
 	switch(wParam) {
 		case PUQS_ENABLEPOPUPS:
@@ -227,28 +235,17 @@ int PopupQuery(WPARAM wParam, LPARAM lParam) {
 		default:
 			return 1;
 	}
+	UpdateMenu();
 	return 0;
 }
 
 int TogglePopups(WPARAM wParam, LPARAM lParam) {
-	CLISTMENUITEM menu;
-	menu.cbSize = sizeof(CLISTMENUITEM);
-	// just write to db - the rest is handled in the Meta_SettingChanged function
 	if(DBGetContactSettingByte(0, MODULE, "Enabled", 1)) {
 		DBWriteContactSettingByte(0, MODULE, "Enabled", 0);
-		// modify main menu item
-		menu.flags = CMIM_NAME;// | CMIM_ICON;
-		menu.hIcon=0; //LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MCMENUOFF));
-		menu.pszName = (char *)Translate("Enable Popups");
-		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuToggleOnOff, (LPARAM)&menu);
 	} else {
 		DBWriteContactSettingByte(0, MODULE, "Enabled", 1);
-		// modify main menu item
-		menu.flags = CMIM_NAME;// | CMIM_ICON;
-		menu.hIcon=0;//LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MCMENU));
-		menu.pszName = (char *)Translate("Disable Popups");
-		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuToggleOnOff, (LPARAM)&menu);
 	}
+	UpdateMenu();
 	return 0;
 }