[Spambayes-checkins] spambayes/Outlook2000/dialogs/resources dialogs.h, 1.14, 1.15 rcparser.py, 1.8, 1.9

[Adam Walker]

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv28064/Outlook2000/dialogs/resources

Modified Files:
	dialogs.h rcparser.py 
Log Message:
Fix duped ids.

Index: dialogs.h
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dialogs.h	25 Aug 2003 17:05:35 -0000	1.14
--- dialogs.h	25 Aug 2003 17:28:09 -0000	1.15
***************
*** 87,103 ****
  #define IDC_USE_DELAY2                  1065
  #define IDC_TAB                         1068
- #define IDC_BUTTON1                     1069
  #define IDC_BACK_BTN                    1069
! #define IDC_BUT_WIZARD                  1069
! #define IDC_SHOW_DATA_FOLDER            1069
! #define IDC_ABOUT_BTN                   1070
! #define IDC_BUT_RESET                   1070
! #define IDC_DEL_SPAM_RS                 1071
! #define IDC_RECOVER_RS                  1072
  #define IDC_HIDDEN                      1076
  #define IDC_FORWARD_BTN                 1077
  #define IDC_PAGE_PLACEHOLDER            1078
- #define IDC_EDIT2                       1080
- #define IDC_EDIT3                       1081
  #define IDC_BUT_PREPARATION             1081
  #define IDC_FOLDER_HAM                  1083
--- 87,100 ----
  #define IDC_USE_DELAY2                  1065
  #define IDC_TAB                         1068
  #define IDC_BACK_BTN                    1069
! #define IDC_BUT_WIZARD                  1070
! #define IDC_SHOW_DATA_FOLDER            1071
! #define IDC_ABOUT_BTN                   1072
! #define IDC_BUT_RESET                   1073
! #define IDC_DEL_SPAM_RS                 1074
! #define IDC_RECOVER_RS                  1075
  #define IDC_HIDDEN                      1076
  #define IDC_FORWARD_BTN                 1077
  #define IDC_PAGE_PLACEHOLDER            1078
  #define IDC_BUT_PREPARATION             1081
  #define IDC_FOLDER_HAM                  1083
***************
*** 111,115 ****
  #define _APS_NEXT_RESOURCE_VALUE        124
  #define _APS_NEXT_COMMAND_VALUE         40001
! #define _APS_NEXT_CONTROL_VALUE         1089
  #define _APS_NEXT_SYMED_VALUE           101
  #endif
--- 108,112 ----
  #define _APS_NEXT_RESOURCE_VALUE        124
  #define _APS_NEXT_COMMAND_VALUE         40001
! #define _APS_NEXT_CONTROL_VALUE         1090
  #define _APS_NEXT_SYMED_VALUE           101
  #endif

Index: rcparser.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/rcparser.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rcparser.py	21 Aug 2003 13:09:37 -0000	1.8
--- rcparser.py	25 Aug 2003 17:28:09 -0000	1.9
***************
*** 157,161 ****
                      i = int(lex.get_token())
                      self.ids[n] = i
!                     self.names[i] = n
                      if self.next_id<=i:
                          self.next_id = i+1
--- 157,164 ----
                      i = int(lex.get_token())
                      self.ids[n] = i
!                     if self.names.has_key(i):
!                         print "Duplicate id",i,"for",n,"is", self.names[i]
!                     else:
!                         self.names[i] = n
                      if self.next_id<=i:
                          self.next_id = i+1