Gerald Pfeifer : wrc: Fix eight conditions in compare_menuex_item.
Alexandre Julliard
julliard at winehq.org
Wed Sep 16 16:01:05 CDT 2009
Module: wine
Branch: master
Commit: bdb73f5c72261362b0a163b0d9e35df02f582718
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb73f5c72261362b0a163b0d9e35df02f582718
Author: Gerald Pfeifer <gerald at pfeifer.com>
Date: Sat Sep 12 20:24:16 2009 +0200
wrc: Fix eight conditions in compare_menuex_item.
---
tools/wrc/translation.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c
index 7262a65..5932ccf 100644
--- a/tools/wrc/translation.c
+++ b/tools/wrc/translation.c
@@ -539,28 +539,28 @@ static int compare_menuex_item(menuex_item_t *menuex_item1, menuex_item_t *menue
different = 1;
} else if(!different &&
((menuex_item1->gotid && !menuex_item2->gotid) ||
- (!menuex_item2->gotid && menuex_item2->gotid)))
+ (!menuex_item1->gotid && menuex_item2->gotid)))
different = 1;
if(!different && menuex_item1->gottype && menuex_item2->gottype) {
if(menuex_item1->type != menuex_item2->type)
different = 1;
} else if(!different &&
((menuex_item1->gottype && !menuex_item2->gottype) ||
- (!menuex_item2->gottype && menuex_item2->gottype)))
+ (!menuex_item1->gottype && menuex_item2->gottype)))
different = 1;
if(!different && menuex_item1->gotstate && menuex_item2->gotstate) {
if(menuex_item1->state != menuex_item2->state)
different = 1;
} else if(!different &&
((menuex_item1->gotstate && !menuex_item2->gotstate) ||
- (!menuex_item2->gotstate && menuex_item2->gotstate)))
+ (!menuex_item1->gotstate && menuex_item2->gotstate)))
different = 1;
if(!different && menuex_item1->gothelpid && menuex_item2->gothelpid) {
if(menuex_item1->helpid != menuex_item2->helpid)
different = 1;
} else if(!different &&
((menuex_item1->gothelpid && !menuex_item2->gothelpid) ||
- (!menuex_item2->gothelpid && menuex_item2->gothelpid)))
+ (!menuex_item1->gothelpid && menuex_item2->gothelpid)))
different = 1;
if(!different)
different = compare_menuex_item(menuex_item1->popup, menuex_item2->popup);
@@ -571,28 +571,28 @@ static int compare_menuex_item(menuex_item_t *menuex_item1, menuex_item_t *menue
different = 1;
} else if(!different &&
((menuex_item1->gotid && !menuex_item2->gotid) ||
- (!menuex_item2->gotid && menuex_item2->gotid)))
+ (!menuex_item1->gotid && menuex_item2->gotid)))
different = 1;
if(!different && menuex_item1->gottype && menuex_item2->gottype) {
if(menuex_item1->type != menuex_item2->type)
different = 1;
} else if(!different &&
((menuex_item1->gottype && !menuex_item2->gottype) ||
- (!menuex_item2->gottype && menuex_item2->gottype)))
+ (!menuex_item1->gottype && menuex_item2->gottype)))
different = 1;
if(!different && menuex_item1->gotstate && menuex_item2->gotstate) {
if(menuex_item1->state != menuex_item2->state)
different = 1;
} else if(!different &&
((menuex_item1->gotstate && !menuex_item2->gotstate) ||
- (!menuex_item2->gotstate && menuex_item2->gotstate)))
+ (!menuex_item1->gotstate && menuex_item2->gotstate)))
different = 1;
if(!different && menuex_item1->gothelpid && menuex_item2->gothelpid) {
if(menuex_item1->helpid != menuex_item2->helpid)
different = 1;
} else if(!different &&
((menuex_item1->gothelpid && !menuex_item2->gothelpid) ||
- (!menuex_item2->gothelpid && menuex_item2->gothelpid)))
+ (!menuex_item1->gothelpid && menuex_item2->gothelpid)))
different = 1;
} else if((menuex_item1->name && !menuex_item2->name) ||
(!menuex_item1->name && menuex_item2->name))
More information about the wine-cvs
mailing list