Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
This commit is contained in:
commit
9fb504b7f9
|
@ -56,7 +56,7 @@ namespace SparkleLib {
|
|||
|
||||
private void CreateInitialConfig ()
|
||||
{
|
||||
string user_name = "Unknown";
|
||||
string user_name = Environment.UserName;
|
||||
|
||||
if (SparkleBackend.Platform == PlatformID.Unix ||
|
||||
SparkleBackend.Platform == PlatformID.MacOSX) {
|
||||
|
@ -68,12 +68,10 @@ namespace SparkleLib {
|
|||
user_name = user_name.TrimEnd (",".ToCharArray());
|
||||
}
|
||||
|
||||
} else {
|
||||
user_name = Environment.UserName;
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty (user_name))
|
||||
user_name = "Unknown";
|
||||
user_name = Environment.UserName;
|
||||
|
||||
TextWriter writer = new StreamWriter (Path);
|
||||
string n = Environment.NewLine;
|
||||
|
|
|
@ -187,7 +187,7 @@ namespace SparkleLib {
|
|||
|
||||
private string GetHost (string url)
|
||||
{
|
||||
Regex regex = new Regex (@"(@|://)([a-z0-9\.]+)(/|:)");
|
||||
Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)");
|
||||
Match match = regex.Match (url);
|
||||
|
||||
if (match.Success)
|
||||
|
|
|
@ -56,10 +56,12 @@ namespace SparkleLib {
|
|||
};
|
||||
|
||||
this.client.OnDisconnected += delegate {
|
||||
base.is_connecting = false;
|
||||
OnDisconnected ();
|
||||
};
|
||||
|
||||
this.client.OnError += delegate {
|
||||
base.is_connecting = false;
|
||||
OnDisconnected ();
|
||||
};
|
||||
|
||||
|
@ -118,9 +120,12 @@ namespace SparkleLib {
|
|||
{
|
||||
string channel = "#" + folder_identifier;
|
||||
if (!base.channels.Contains (channel)) {
|
||||
SparkleHelpers.DebugInfo ("ListenerIrc", "Joining channel " + channel);
|
||||
base.channels.Add (channel);
|
||||
this.client.RfcJoin (channel);
|
||||
|
||||
if (IsConnected) {
|
||||
SparkleHelpers.DebugInfo ("ListenerIrc", "Joining channel " + channel);
|
||||
this.client.RfcJoin (channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ namespace SparkleLib {
|
|||
|
||||
public string Domain {
|
||||
get {
|
||||
Regex regex = new Regex (@"(@|://)([a-z0-9\.]+)(/|:)");
|
||||
Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)");
|
||||
Match match = regex.Match (SparkleConfig.DefaultConfig.GetUrlForFolder (Name));
|
||||
|
||||
if (match.Success)
|
||||
|
|
Loading…
Reference in a new issue