cvs -z9 diff (in directory C:\frank\progetti\opensource\pgadmin2\pgadmin2\) cvs diff: Empty password used - try 'cvs login' with a real password ? pgAdmin2.vbw ? exporters/access/pgAccess.vbw ? exporters/excel/pgExcel.vbw cvs server: Diffing . Index: ScrollObjDb.ctl =================================================================== RCS file: /disk1/cvsroot/pgadmin2/ScrollObjDb.ctl,v retrieving revision 1.3 diff -r1.3 ScrollObjDb.ctl 4c4 < ClientHeight = 375 --- > ClientHeight = 372 8c8 < ScaleHeight = 375 --- > ScaleHeight = 372 17c17 < _ExtentY = 661 --- > _ExtentY = 656 90a91,92 > > If Len(Trim(szDatabase)) <= 0 Then Exit Sub Index: frmFind.frm =================================================================== RCS file: /disk1/cvsroot/pgadmin2/frmFind.frm,v retrieving revision 1.9 diff -r1.9 frmFind.frm 6,8c6,8 < ClientHeight = 7530 < ClientLeft = 4320 < ClientTop = 2040 --- > ClientHeight = 7524 > ClientLeft = 2232 > ClientTop = 1572 14c14 < ScaleHeight = 7530 --- > ScaleHeight = 7524 15a16,53 > Begin VB.CheckBox chkOnlyOid > Caption = "Find only for &Oid" > Height = 255 > Left = 4920 > TabIndex = 26 > ToolTipText = "Check to find only Oid." > Top = 3600 > Width = 2415 > End > Begin VB.Frame fraByOid > Caption = "Find only for Oid" > Enabled = 0 'False > Height = 612 > Left = 4920 > TabIndex = 23 > Top = 3960 > Width = 2412 > Begin VB.TextBox txtOid > Enabled = 0 'False > Height = 285 > Left = 1080 > TabIndex = 24 > ToolTipText = "Enter an object Oid." > Top = 240 > Width = 1212 > End > Begin VB.Label lblFind > AutoSize = -1 'True > Caption = "Oid" > Enabled = 0 'False > Height = 192 > Index = 8 > Left = 120 > TabIndex = 25 > Top = 240 > Width = 252 > End > End 18c56 < Height = 1215 --- > Height = 1212 24c62 < Height = 855 --- > Height = 852 29,31c67,69 < Width = 4455 < _ExtentX = 7858 < _ExtentY = 1508 --- > Width = 4452 > _ExtentX = 7853 > _ExtentY = 1503 85c123 < Height = 330 --- > Height = 300 89,92c127,130 < Top = 270 < Width = 3375 < _ExtentX = 5953 < _ExtentY = 582 --- > Top = 276 > Width = 3372 > _ExtentX = 5948 > _ExtentY = 529 100c138 < Height = 330 --- > Height = 300 105,107c143,145 < Width = 3375 < _ExtentX = 5953 < _ExtentY = 582 --- > Width = 3372 > _ExtentX = 5948 > _ExtentY = 529 122c160 < _ExtentY = 1508 --- > _ExtentY = 1503 156c194 < Height = 195 --- > Height = 192 160c198 < Top = 1980 --- > Top = 2040 224c262 < Height = 3510 --- > Height = 2892 230,231c268,269 < Height = 1530 < Left = 1155 --- > Height = 1176 > Left = 1200 235,237c273,275 < Width = 3510 < _ExtentX = 6191 < _ExtentY = 2699 --- > Width = 3516 > _ExtentX = 6202 > _ExtentY = 2074 260,261c298,299 < Height = 1530 < Left = 1170 --- > Height = 1176 > Left = 1200 264,267c302,305 < Top = 1845 < Width = 3510 < _ExtentX = 6191 < _ExtentY = 2699 --- > Top = 1560 > Width = 3516 > _ExtentX = 6202 > _ExtentY = 2074 304c342 < Height = 195 --- > Height = 192 308,309c346,347 < Top = 1890 < Width = 690 --- > Top = 1680 > Width = 696 315,316c353,354 < _ExtentX = 1005 < _ExtentY = 1005 --- > _ExtentX = 995 > _ExtentY = 995 447c485 < Height = 2775 --- > Height = 2772 454c492 < _ExtentY = 4895 --- > _ExtentY = 4890 538a577 > lvColResult.ListItems.Add , "OID", "Oid Object", "column", "column" 583a623,663 > Private Sub chkOnlyOid_Click() > If inIDE Then: On Error GoTo 0: Else: On Error GoTo Err_Handler > frmMain.svr.LogEvent "Entering " & App.Title & ":frmFind.chkOnlyOid_Click()", etFullDebug > > If chkOnlyOid.Value = 0 Then > lblFind(8).Enabled = False > fraByOid.Enabled = False > chkAdvOpt.Enabled = True > lblFind(3).Enabled = True > lblFind(6).Enabled = True > lblFind(7).Enabled = True > lblFind(0).Enabled = True > lblFind(2).Enabled = True > txtName.Enabled = True > txtComment.Enabled = True > txtSql.Enabled = True > cboSearchFor.Enabled = True > lvNameSpace.Enabled = True > txtOid.Enabled = False > ElseIf chkOnlyOid.Value = 1 Then > lblFind(8).Enabled = True > fraByOid.Enabled = True > chkAdvOpt.Value = 0 > chkAdvOpt.Enabled = False > lblFind(3).Enabled = False > lblFind(6).Enabled = False > lblFind(7).Enabled = False > lblFind(0).Enabled = False > lblFind(2).Enabled = False > txtName.Enabled = False > txtComment.Enabled = False > txtSql.Enabled = False > cboSearchFor.Enabled = False > lvNameSpace.Enabled = False > txtOid.Enabled = True > End If > > Exit Sub > Err_Handler: If Err.Number <> 0 Then LogError Err.Number, Err.Description, App.Title & ":frmFind.chkOnlyOid_Click" > End Sub > 604,605d683 < Dim szImg As String < Dim szKey As String 607d684 < Dim iCol As Integer 609a687 > Dim lOid As Long 627a706,756 > If lvColResult.ListItems("OID").Checked Then lvResult.ColumnHeaders.Add , , "Oid Object" > > 'find only oid > If chkOnlyOid.Value = 1 Then > If Not IsNumeric(txtOid.Text) Then > MsgBox "Oid is not numeric!", vbExclamation + vbSystemModal, "Error" > txtOid.SetFocus > EndMsg > Exit Sub > End If > > lOid = CLng(txtOid.Text) > bFound = False > > For Each lvItem In lvNameSpace.ListItems > 'Load object for find > Set colObj = New Collection > szNamespace = lvItem.Text > > colObj.Add objDatabase.Namespaces(szNamespace).Aggregates > If ctx.dbVer >= 7.3 Then > colObj.Add objDatabase.Casts > colObj.Add objDatabase.Namespaces(szNamespace).Domains > colObj.Add objDatabase.Namespaces(szNamespace).Conversions > End If > colObj.Add objDatabase.Namespaces(szNamespace).Functions > colObj.Add objDatabase.Languages > colObj.Add objDatabase.Namespaces > colObj.Add objDatabase.Namespaces(szNamespace).Operators > colObj.Add objDatabase.Namespaces(szNamespace).Sequences > colObj.Add objDatabase.Namespaces(szNamespace).Tables > colObj.Add objDatabase.Namespaces(szNamespace).Types > colObj.Add objDatabase.Namespaces(szNamespace).Views > > For Each objCol In colObj > For Each objTmp In objCol > If objTmp.Oid = lOid Then > bFound = True > Exit For > End If > Next > If bFound Then Exit For > Next > If bFound Then Exit For > Next > > 'object is found > If bFound Then AddResult objTmp, szNamespace > EndMsg > Exit Sub > End If 703c832 < If objTmp.ObjectType <> "Language" And objTmp.ObjectType <> "Cast" Then --- > If ObjcetHaveComment(objTmp.ObjectType) Then 749,802c878 < If bFound Then < Select Case objTmp.ObjectType < Case "Aggregate" < szImg = "aggregate" < szKey = "AGG" < Case "Cast" < szImg = "cast" < szKey = "CST" < Case "Domain" < szImg = "domain" < szKey = "DOM" < Case "Conversion" < szImg = "conversion" < szKey = "CNV" < Case "Function" < szImg = "function" < szKey = "FNC" < Case "Language" < szImg = "language" < szKey = "LNG" < Case "Operator" < szImg = "operator" < szKey = "OPR" < Case "Sequence" < szImg = "sequence" < szKey = "SEQ" < Case "Table" < szImg = "table" < szKey = "TBL" < Case "Type" < szImg = "type" < szKey = "TYP" < Case "View" < szImg = "view" < szKey = "VIE" < End Select < Set lvItem = lvResult.ListItems.Add(, szKey & "_" & GetID, objTmp.Identifier) < If Len(szImg) > 0 Then < lvItem.Icon = szImg < lvItem.SmallIcon = szImg < End If < If objTmp.ObjectType <> "Cast" And objTmp.ObjectType <> "Language" Then lvItem.SubItems(1) = szNamespace < iCol = 1 < < If lvColResult.ListItems("COM").Checked Then < iCol = iCol + 1 < If objTmp.ObjectType <> "Cast" And objTmp.ObjectType <> "Language" Then lvItem.SubItems(iCol) = objTmp.Comment < End If < < If lvColResult.ListItems("SQL").Checked Then < iCol = iCol + 1 < lvItem.SubItems(iCol) = objTmp.SQL < End If < End If --- > If bFound Then AddResult objTmp, szNamespace 829a906,911 > Case "NSP" > Dim objNamespaceForm As New frmNamespace > Load objNamespaceForm > objNamespaceForm.Initialise objDatabase.Name, objNamespace > objNamespaceForm.Show > 895c977 < --- > 913a996,1077 > > 'return if object have comment > Private Function ObjcetHaveComment(ByVal ObjectType As String) As Boolean > If inIDE Then: On Error GoTo 0: Else: On Error GoTo Err_Handler > frmMain.svr.LogEvent "Entering " & App.Title & ":frmFind.ObjcetHaveComment(" & ObjectType & ")", etFullDebug > > Select Case ObjectType > Case "Cast", "Language", "Conversion" > ObjcetHaveComment = False > Case Else > ObjcetHaveComment = True > End Select > > Exit Function > Err_Handler: If Err.Number <> 0 Then LogError Err.Number, Err.Description, App.Title & ":frmFind.ObjcetHaveComment" > End Function > > 'add element in result > Private Sub AddResult(ByVal ObjResult As Object, szNamespace As String) > If inIDE Then: On Error GoTo 0: Else: On Error GoTo Err_Handler > frmMain.svr.LogEvent "Entering " & App.Title & ":frmFind.AddResult(" & ObjResult.ObjectType & ",'" & szNamespace & "')", etFullDebug > > Dim iCol As Integer > Dim szImg As String > Dim szKey As String > Dim lvItem As ListItem > > szImg = NameImageByObjectType(ObjResult.ObjectType) > > Select Case ObjResult.ObjectType > Case "Aggregate" > szKey = "AGG" > Case "Cast" > szKey = "CST" > Case "Domain" > szKey = "DOM" > Case "Conversion" > szKey = "CNV" > Case "Function" > szKey = "FNC" > Case "Language" > szKey = "LNG" > Case "Operator" > szKey = "OPR" > Case "Sequence" > szKey = "SEQ" > Case "Table" > szKey = "TBL" > Case "Type" > szKey = "TYP" > Case "View" > szKey = "VIE" > Case "Schema" > szKey = "NSP" > End Select > Set lvItem = lvResult.ListItems.Add(, szKey & "_" & GetID, ObjResult.Identifier) > If Len(szImg) > 0 Then > lvItem.Icon = szImg > lvItem.SmallIcon = szImg > End If > If ObjResult.ObjectType <> "Cast" And ObjResult.ObjectType <> "Language" Then lvItem.SubItems(1) = szNamespace > iCol = 1 > > If lvColResult.ListItems("COM").Checked Then > iCol = iCol + 1 > If ObjcetHaveComment(ObjResult.ObjectType) Then lvItem.SubItems(iCol) = ObjResult.Comment > End If > > If lvColResult.ListItems("SQL").Checked Then > iCol = iCol + 1 > lvItem.SubItems(iCol) = ObjResult.SQL > End If > > If lvColResult.ListItems("OID").Checked Then > iCol = iCol + 1 > lvItem.SubItems(iCol) = ObjResult.Oid > End If > > Exit Sub > Err_Handler: If Err.Number <> 0 Then LogError Err.Number, Err.Description, App.Title & ":frmFind.AddResult" > End Sub > Index: pgAdmin2.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/pgAdmin2.vbp,v retrieving revision 1.154 diff -r1.154 pgAdmin2.vbp 2,4c2,4 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library < Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\..\WINDOWS\System32\msstdfmt.dll#Microsoft Data Formatting Object Library 6.0 (SP4) --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library > Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\..\WINDOWS\System32\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP4) 8,10c8,10 < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 12c12 < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 80a81,83 > <<<<<<< pgAdmin2.vbp > RevisionVer=37 > ======= 81a85 > >>>>>>> 1.154 cvs server: Diffing exporters cvs server: Diffing exporters/abstract Index: exporters/abstract/pgAbsExp.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/abstract/pgAbsExp.vbp,v retrieving revision 1.100 diff -r1.100 pgAbsExp.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 18a19,21 > <<<<<<< pgAbsExp.vbp > RevisionVer=26 > ======= 19a23 > >>>>>>> 1.100 cvs server: Diffing exporters/access Index: exporters/access/pgAccess.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/access/pgAccess.vbp,v retrieving revision 1.18 diff -r1.18 pgAccess.vbp 2c2 < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 4c4 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 8c8 < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 22a23,25 > <<<<<<< pgAccess.vbp > RevisionVer=26 > ======= 23a27 > >>>>>>> 1.18 cvs server: Diffing exporters/access/images cvs server: Diffing exporters/ascii Index: exporters/ascii/pgASCII.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/ascii/pgASCII.vbp,v retrieving revision 1.103 diff -r1.103 pgASCII.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 5,7c5,7 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 25a26,28 > <<<<<<< pgASCII.vbp > RevisionVer=26 > ======= 26a30 > >>>>>>> 1.103 cvs server: Diffing exporters/excel Index: exporters/excel/pgExcel.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/excel/pgExcel.vbp,v retrieving revision 1.102 diff -r1.102 pgExcel.vbp 2c2 < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 18a19,21 > <<<<<<< pgExcel.vbp > RevisionVer=26 > ======= 19a23 > >>>>>>> 1.102 cvs server: Diffing exporters/html Index: exporters/html/pgHTML.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/html/pgHTML.vbp,v retrieving revision 1.101 diff -r1.101 pgHTML.vbp 2c2 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation 4,5c4,5 < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 21a22,24 > <<<<<<< pgHTML.vbp > RevisionVer=26 > ======= 22a26 > >>>>>>> 1.101 cvs server: Diffing help cvs server: Diffing help/html cvs server: Diffing help/html/developerinfo cvs server: Diffing help/html/howtos cvs server: Diffing help/html/images cvs server: Diffing help/html/licenceinfo cvs server: Diffing images cvs server: Diffing installer cvs server: Diffing plugins cvs server: Diffing plugins/abstract Index: plugins/abstract/pgAbsPlg.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/abstract/pgAbsPlg.vbp,v retrieving revision 1.101 diff -r1.101 pgAbsPlg.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 19a20,22 > <<<<<<< pgAbsPlg.vbp > RevisionVer=27 > ======= 20a24 > >>>>>>> 1.101 cvs server: Diffing plugins/conndebug Index: plugins/conndebug/pgConnDebug.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/conndebug/pgConnDebug.vbp,v retrieving revision 1.89 diff -r1.89 pgConnDebug.vbp 2c2 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation 5,6c5,6 < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 26a27,29 > <<<<<<< pgConnDebug.vbp > RevisionVer=27 > ======= 27a31 > >>>>>>> 1.89 cvs server: Diffing plugins/hba Index: plugins/hba/pgHba.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/hba/pgHba.vbp,v retrieving revision 1.17 diff -r1.17 pgHba.vbp 2c2 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation 5,6c5,6 < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 12c12 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 27a28,30 > <<<<<<< pgHba.vbp > RevisionVer=28 > ======= 28a32 > >>>>>>> 1.17 cvs server: Diffing plugins/hba/images cvs server: Diffing plugins/import Index: plugins/import/pgImport.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/import/pgImport.vbp,v retrieving revision 1.102 diff -r1.102 pgImport.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 29a30,32 > <<<<<<< pgImport.vbp > RevisionVer=27 > ======= 30a34 > >>>>>>> 1.102 cvs server: Diffing plugins/import/images cvs server: Diffing plugins/migration Index: plugins/migration/pgMigration.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/migration/pgMigration.vbp,v retrieving revision 1.101 diff -r1.101 pgMigration.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 6,10c6,10 < Reference=*\G{00000600-0000-0010-8000-00AA006D2EA4}#2.7#0#..\..\..\..\..\..\..\Program Files\Common Files\System\ado\msadox.dll#Microsoft ADO Ext. 2.7 for DDL and Security < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Reference=*\G{00000600-0000-0010-8000-00AA006D2EA4}#2.7#0#..\..\..\..\..\..\..\Programmi\File comuni\System\ado\msadox.dll#Microsoft ADO Ext. 2.7 for DDL and Security > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 31a32,34 > <<<<<<< pgMigration.vbp > RevisionVer=25 > ======= 32a36 > >>>>>>> 1.101 cvs server: Diffing plugins/migration/images cvs server: Diffing plugins/msysconf Index: plugins/msysconf/pgMSysConf.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/msysconf/pgMSysConf.vbp,v retrieving revision 1.107 diff -r1.107 pgMSysConf.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 27a28,30 > <<<<<<< pgMSysConf.vbp > RevisionVer=27 > ======= 28a32 > >>>>>>> 1.107 cvs server: Diffing plugins/msysconf/images cvs server: Diffing plugins/publishing Index: plugins/publishing/pgPublishing.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/publishing/pgPublishing.vbp,v retrieving revision 1.94 diff -r1.94 pgPublishing.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 28a29,31 > <<<<<<< pgPublishing.vbp > RevisionVer=27 > ======= 29a33 > >>>>>>> 1.94 cvs server: Diffing plugins/publishing/images cvs server: Diffing plugins/security Index: plugins/security/pgSecurity.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/security/pgSecurity.vbp,v retrieving revision 1.102 diff -r1.102 pgSecurity.vbp 2,3c2,3 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation < Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 27a28,30 > <<<<<<< pgSecurity.vbp > RevisionVer=27 > ======= 28a32 > >>>>>>> 1.102 cvs server: Diffing plugins/security/images cvs server: Diffing plugins/template ***** CVS exited normally with code 1 *****