beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes

Browse source
This commit is contained in:
Travis Glenn Hansen 2011-06-07 19:39:34 -06:00
parent b54ac8b259 f658ea2b86
commit 1704d86b2f
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SparkleLib/SparkleConfig.cs
View file

@ -56,7 +56,7 @@ namespace SparkleLib {
private void CreateInitialConfig () private void CreateInitialConfig ()
{ {
string user_name = "Unknown"; string user_name = Environment.UserName;
if (SparkleBackend.Platform == PlatformID.Unix || if (SparkleBackend.Platform == PlatformID.Unix ||
SparkleBackend.Platform == PlatformID.MacOSX) { SparkleBackend.Platform == PlatformID.MacOSX) {
@ -68,12 +68,10 @@ namespace SparkleLib {
user_name = user_name.TrimEnd (",".ToCharArray()); user_name = user_name.TrimEnd (",".ToCharArray());
} }
} else {
user_name = Environment.UserName;
} }
if (string.IsNullOrEmpty (user_name)) if (string.IsNullOrEmpty (user_name))
user_name = "Unknown"; user_name = Environment.UserName;
TextWriter writer = new StreamWriter (Path); TextWriter writer = new StreamWriter (Path);
string n = Environment.NewLine; string n = Environment.NewLine;

2
SparkleLib/SparkleFetcherBase.cs
View file

@ -187,7 +187,7 @@ namespace SparkleLib {
private string GetHost (string url) private string GetHost (string url)
{ {
Regex regex = new Regex (@"(@|://)([a-z0-9\.]+)(/|:)"); Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)");
Match match = regex.Match (url); Match match = regex.Match (url);
if (match.Success) if (match.Success)

7
SparkleLib/SparkleListenerIrc.cs
View file

@ -56,10 +56,12 @@ namespace SparkleLib {
}; };
this.client.OnDisconnected += delegate { this.client.OnDisconnected += delegate {
base.is_connecting = false;
OnDisconnected (); OnDisconnected ();
}; };
this.client.OnError += delegate { this.client.OnError += delegate {
base.is_connecting = false;
OnDisconnected (); OnDisconnected ();
}; };
@ -118,11 +120,14 @@ namespace SparkleLib {
{ {
string channel = "#" + folder_identifier; string channel = "#" + folder_identifier;
if (!base.channels.Contains (channel)) { if (!base.channels.Contains (channel)) {
SparkleHelpers.DebugInfo ("ListenerIrc", "Joining channel " + channel);
base.channels.Add (channel); base.channels.Add (channel);
if (IsConnected) {
SparkleHelpers.DebugInfo ("ListenerIrc", "Joining channel " + channel);
this.client.RfcJoin (channel); this.client.RfcJoin (channel);
} }
} }
}
public override void Announce (SparkleAnnouncement announcement) public override void Announce (SparkleAnnouncement announcement)

2
SparkleLib/SparkleRepoBase.cs
View file

@ -139,7 +139,7 @@ namespace SparkleLib {
public string Domain { public string Domain {
get { get {
Regex regex = new Regex (@"(@|://)([a-z0-9\.]+)(/|:)"); Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)");
Match match = regex.Match (SparkleConfig.DefaultConfig.GetUrlForFolder (Name)); Match match = regex.Match (SparkleConfig.DefaultConfig.GetUrlForFolder (Name));
if (match.Success) if (match.Success)