search

enaess / network-manager-sstp

Secure Socket Tunneling Protocol Extention for Network Manager
1 stars 0 forks source link

Two cosmetic fixes #14

Closed lkundrak closed 8 years ago

lkundrak commented 8 years ago

Should not change functionality (not tested, since I don't have a SSTP server set up). The former one makes GNOME Software happier; the other makes one a better person in the eyes of Thomas (of the NetworkManager crowd).

enaess commented 8 years ago

Thanks, I am in the midst of porting the reminder of the changes from the pptp client. I'll look these over and hand merge them. You could try to connect to ca.freesstpvpn.com user:vpn, pass: freesstp. If that doesn't work, they may have a different access point, just Google freesstpvpn  I expect to have the changes done by the weekend. Regards,Eivind 

Sent from my Verizon Wireless 4G LTE smartphone

-------- Original message -------- From: Lubomir Rintel notifications@github.com Date: 04/28/2016 6:33 AM (GMT-08:00) To: enaess/network-manager-sstp network-manager-sstp@noreply.github.com Subject: [enaess/network-manager-sstp] Two cosmetic fixes (#14)

Should not change functionality (not tested, since I don't have a SSTP server set up). The former one makes GNOME Software happier; the other makes one a better person in the eyes of Thomas (of the NetworkManager crowd).

You can view, comment on, or merge this pull request online at:   https://github.com/enaess/network-manager-sstp/pull/14

Commit Summary

appdata: rename the xml file service: initialize the object in initializer, not constructor

File Changes

M
Makefile.am
(2)

R
appdata/network-manager-sstp.metainfo.xml.in
(0)

M
po/POTFILES.in
(2)

M
src/nm-sstp-service.c
(77)

Patch Links:

https://github.com/enaess/network-manager-sstp/pull/14.patch https://github.com/enaess/network-manager-sstp/pull/14.diff

— You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub

enaess commented 8 years ago

Hi Lubomir! Are you able to have a second look at the nm-sstp-service.c file, there's some conflicts and am not sure how to merge these (or if these are even needed now as I took most of the recent changes from network-manager-pptp).

Regards,

enaess commented 8 years ago

@lkundrak Do you have an update for me? Is the merge for nm-sstp-service.c still needed?

lkundrak commented 8 years ago

Ouch; 581bb16af (Adding in recent changes from the network-manager-pptp project to keep the projects similar) does not look good.

For the service you actually reverted the changes that were done to the service. Introducing back broken stuff (such as the separate ppp bus service) that was fixed in both pptp and sstp :(

Perhaps you diffed against a wrong version?

enaess commented 8 years ago

@lkundrak You are probably right, what branch / tag version should I be using instead?

lkundrak commented 8 years ago

master

enaess commented 8 years ago

@lkundrak I merged the changes from mainline. Looks like ubuntu is on the NM 1.2 release in which doesn't have all the changes in master (and I am not able to call the new dbus interface for VPN). I created a release-1.2 branch for this prior to committing the merge from pptp to master.

enaess commented 8 years ago

I am going to close this merge request, I think it's served it purpose.

lkundrak commented 8 years ago

It indeed looks good to me now. Thanks!

I'm wondering if you could tag a release? That would make things easier for packagers.