From 8757aeb1bbaaeaaba607a26f454c7c4441a3166d Mon Sep 17 00:00:00 2001 From: Jasmin Dizdarevic Date: Mon, 4 Jul 2011 23:41:14 +0200 Subject: [PATCH 2/2] Doubletrimmed string in frmMain::GetNodePath and wrong CheckEnable in searchObjectFactory --- pgadmin/dlg/dlgSearchObject.cpp | 2 +- pgadmin/frm/frmMain.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pgadmin/dlg/dlgSearchObject.cpp b/pgadmin/dlg/dlgSearchObject.cpp index b315e0c..06fe5fd 100644 --- a/pgadmin/dlg/dlgSearchObject.cpp +++ b/pgadmin/dlg/dlgSearchObject.cpp @@ -524,7 +524,7 @@ wxWindow *searchObjectFactory::StartDialog(frmMain *form, pgObject *obj) bool searchObjectFactory::CheckEnable(pgObject *obj) { if (obj && obj->IsCreatedBy(databaseFactory)) - return ((pgDatabase *)obj)->GetConnected() && (((pgDatabase *)obj)->GetName() != ((pgDatabase *)obj)->GetServer()->GetDatabaseName()); + return ((pgDatabase *)obj)->GetConnected(); return false; } diff --git a/pgadmin/frm/frmMain.cpp b/pgadmin/frm/frmMain.cpp index 35857f4..2b66242 100644 --- a/pgadmin/frm/frmMain.cpp +++ b/pgadmin/frm/frmMain.cpp @@ -662,7 +662,7 @@ wxString frmMain::GetNodePath(wxTreeItemId node) while (parent.IsOk()) { browser->GetItemData(parent); - path = browser->GetItemText(parent).BeforeFirst('(').Trim().Trim(false) + wxT("/") + path; + path = browser->GetItemText(parent).BeforeFirst('(').Trim() + wxT("/") + path; parent = browser->GetItemParent(parent); } -- 1.7.3.1.msysgit.0