Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1ZepW4-00021t-Gn for pgadmin-hackers@arkaria.postgresql.org; Wed, 23 Sep 2015 19:15:44 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1ZepW3-00056l-VP for pgadmin-hackers@arkaria.postgresql.org; Wed, 23 Sep 2015 19:15:44 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1ZepW3-00056c-5O for pgadmin-hackers@postgresql.org; Wed, 23 Sep 2015 19:15:43 +0000 Received: from mail-yk0-x236.google.com ([2607:f8b0:4002:c07::236]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84) (envelope-from ) id 1ZepW0-0000xM-3d for pgadmin-hackers@postgresql.org; Wed, 23 Sep 2015 19:15:41 +0000 Received: by ykdg206 with SMTP id g206so51786288ykd.1 for ; Wed, 23 Sep 2015 12:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=/wTaDDS+QHI8lDjZC6N6GSnd/jQyfOqdYWEdImKt9oc=; b=X+GA7ppPjIGFTCzQjIIbcrDs4vPL7xxfQVhuFzwbCPRiDuXGN/FvWo+wzJIe4bgJPi BTTx4KFHAVLPAjN4fV8gBrdfOc2vLSbid2xseXbkGOa6kviW2tHV+V+y4cdUqCEIX9e3 ICMK5Pg5m85xOagsvsEJslpPgp1F8UtO7NNDdaE9LlshwnZ7seD/iXvgmKoizf3/Ohfp oS3MxeOXle77Ff9BEynlV9rU3/OLzDRg6jnUaO3NE6GebSZoUhxV2imp1NYBfynnYcIg UjP4DC2Fd+6tvSBdTcw5Jc6uvacakRQ/ODz2eS6Or96h7MWggr2xkDUmQ8gJ3sbMw0JM 3p9A== MIME-Version: 1.0 X-Received: by 10.170.154.212 with SMTP id v203mr27760737ykc.125.1443035738937; Wed, 23 Sep 2015 12:15:38 -0700 (PDT) Received: by 10.129.115.134 with HTTP; Wed, 23 Sep 2015 12:15:38 -0700 (PDT) In-Reply-To: References: Date: Wed, 23 Sep 2015 13:15:38 -0600 Message-ID: Subject: Re: Patch: New field in frmMain statusbar From: Adam Scott To: Dave Page Cc: Magnus Hagander , pgadmin-hackers Content-Type: multipart/mixed; boundary=001a1139d5a49e574805206ef05d X-Pg-Spam-Score: -2.7 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a1139d5a49e574805206ef05d Content-Type: multipart/alternative; boundary=001a1139d5a49e574305206ef05b --001a1139d5a49e574305206ef05b Content-Type: text/plain; charset=UTF-8 Thank you Dave! I rebased from master. To get it to build is going to take some research. It looks like it wants openssl, which I grabbed and configured for WIN32, but it's not happy. First error is below. But this patch is so straightforward, I'm sharing anyway for the sake of time, as it was working before. 2>c:\pgadmin3\pgadmin\libssh2\openssl.c(71): error C2037: left of 'e' specifies undefined struct/union 'rsa_st' Thanks again! Adam On Wed, Sep 23, 2015 at 8:35 AM, Dave Page wrote: > On Wed, Sep 23, 2015 at 2:55 PM, Adam Scott > wrote: > > Is the last patch okay? If there's something more required or anything > > please let me know. > > Hi > > The patch does not apply for me. Can you rebase it against master please? > > Thanks. > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a1139d5a49e574305206ef05b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Thank you Dave!=C2=A0 I rebased from master. =C2= =A0 =C2=A0 To get it to build is going to take some research. It looks like= it wants openssl, which I grabbed and configured for WIN32, but it's n= ot happy.=C2=A0 First error is below.=C2=A0 But this patch is so straightfo= rward, I'm sharing anyway for the sake of time, as it was working befor= e.

2>c:\pgadmin3\pgadmin\libssh2\openssl.c(71): error C2037: left= of 'e' specifies undefined struct/union 'rsa_st'

Thanks again!

Adam


On Wed, Sep 23, 2015 at 8:35 AM, Dave Page = <dpage@pgadmin.org> wrote:
On Wed, Sep 23, 2015 at 2:55 PM, Adam Scott <adam.c.scott@gmail.com> wrote:
> Is the last patch okay?=C2=A0 If there's something more required o= r anything
> please let me know.

Hi

The patch does not apply for me. Can you rebase it against master please?
Thanks.

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--001a1139d5a49e574305206ef05b-- --001a1139d5a49e574805206ef05d Content-Type: application/octet-stream; name="0001-Display-Connection-and-Database-in-Statusbar-Add-ano.patch" Content-Disposition: attachment; filename="0001-Display-Connection-and-Database-in-Statusbar-Add-ano.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iex5jtko0 RnJvbSAwZWE1NjM2N2M1MTQyMjMyOWVkNzYxZTA0ZjMxNDQ1MWQ2Nzc3YTQ4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIEMgU2NvdHQg PGFkYW0uYy5zY290dEBnbWFpbC5jb20+CkRhdGU6IE1vbiwgMTQgU2VwIDIw MTUgMTM6MTY6NDYgLTA2MDAKU3ViamVjdDogW1BBVENIXSBEaXNwbGF5IENv bm5lY3Rpb24gYW5kIERhdGFiYXNlIGluIFN0YXR1c2JhcjogQWRkIGFub3Ro ZXIKIGZpZWxkIGluIGZybU1haW4ncyBzdGF0dXNiYXIgdG8gZ2V0IHRoZSBj dXJyZW50IG9iamVjdCdzIGNvbm5lY3Rpb24gYW5kCiBkYXRhYmFzZSBhbmQg ZGlzcGxheSBpbiB0aGUgZmllbGQgaW4gdGhlIHN0YXR1cyBiYXIuCgotLS0K IHBnYWRtaW4vZnJtL2ZybU1haW4uY3BwIHwgMjEgKysrKysrKysrKysrKysr Ky0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgNSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9wZ2FkbWluL2ZybS9mcm1NYWlu LmNwcCBiL3BnYWRtaW4vZnJtL2ZybU1haW4uY3BwCmluZGV4IDg2MjlkZGEu LjU3MDcwMWIgMTAwNjQ0Ci0tLSBhL3BnYWRtaW4vZnJtL2ZybU1haW4uY3Bw CisrKyBiL3BnYWRtaW4vZnJtL2ZybU1haW4uY3BwCkBAIC01MTYsMTMgKzUx NiwxMyBAQCB2b2lkIGZybU1haW46OkNyZWF0ZU1lbnVzKCkKIAl0cmVlQ29u dGV4dE1lbnUgPSAwOwogCiAJLy8gU3RhdHVzIGJhcgotCXN0YXR1c0JhciA9 IENyZWF0ZVN0YXR1c0JhcigzKTsKLQlpbnQgaVdpZHRoc1szXSA9IHswLCAt MSwgMTAwfTsKLQlTZXRTdGF0dXNXaWR0aHMoMywgaVdpZHRocyk7CisJc3Rh dHVzQmFyID0gQ3JlYXRlU3RhdHVzQmFyKDQpOworCWludCBpV2lkdGhzWzRd ID0gezAsIC0xLCA0MDAsIDEwMH07CisJU2V0U3RhdHVzV2lkdGhzKDQsIGlX aWR0aHMpOwogCVNldFN0YXR1c0JhclBhbmUoLTEpOwogCXN0YXR1c0Jhci0+ U2V0U3RhdHVzVGV4dCh3eFQoIiIpLCAwKTsKIAlzdGF0dXNCYXItPlNldFN0 YXR1c1RleHQoXygiUmVhZHkuIiksIDEpOwotCXN0YXR1c0Jhci0+U2V0U3Rh dHVzVGV4dChfKCIwIFNlY3MiKSwgMik7CisJc3RhdHVzQmFyLT5TZXRTdGF0 dXNUZXh0KF8oIjAgU2VjcyIpLCAzKTsKIAogCXd4QWNjZWxlcmF0b3JFbnRy eSBlbnRyaWVzWzRdOwogCWVudHJpZXNbMF0uU2V0KHd4QUNDRUxfTk9STUFM LCBXWEtfRjUsIHJlZkZhY3QtPkdldElkKCkpOwpAQCAtMTM1NCw3ICsxMzU0 LDE4IEBAIHZvaWQgZnJtTWFpbjo6RW5kTXNnKGJvb2wgZG9uZSkKIAkJZmxv YXQgdGltZXZhbCA9IHN0b3B3YXRjaC5UaW1lKCk7CiAJCXd4U3RyaW5nIHRp bWU7CiAJCXRpbWUuUHJpbnRmKF8oIiUuMmYgc2VjcyIpLCAodGltZXZhbCAv IDEwMDApKTsKLQkJc3RhdHVzQmFyLT5TZXRTdGF0dXNUZXh0KHRpbWUsIDIp OworCQlzdGF0dXNCYXItPlNldFN0YXR1c1RleHQodGltZSwgMyk7CisKKwkJ Ly8gRGlzcGxheSB0aGUgbmFtZSBvZiB0aGUgY29ubmVjdGlvbiBmb3IgY3Vy cmVudGx5IHNlbGVjdGVkIG9iamVjdAorCQl3eFN0cmluZyBjb25uZWN0aW9u OworCQlpZiAoY3VycmVudE9iamVjdCkKKwkJeworCQkJcGdDb25uICpjb25u ID0gY3VycmVudE9iamVjdC0+R2V0Q29ubmVjdGlvbigpOworCSAgIAorCQkJ aWYgKGNvbm4pCisJCQkJY29ubmVjdGlvbiA9IGNvbm4tPkdldE5hbWUoKTsK KwkJfQorCQlzdGF0dXNCYXItPlNldFN0YXR1c1RleHQoY29ubmVjdGlvbiwy KTsKIAogCQkvLyBEaXNwbGF5IHRoZSAnRG9uZScgbWVzc2FnZQogCQlpZiAo ZG9uZSkKLS0gCjIuNS4yLndpbmRvd3MuMQoK --001a1139d5a49e574805206ef05d Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --001a1139d5a49e574805206ef05d--