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

Merge branch 'master' into about

Browse source
This commit is contained in:
Hylke Bons 2012-07-13 14:20:10 +02:00
parent 0a9061f6fb 17951d6536
commit ce3ddd919e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SparkleLib/SparkleConfig.cs
View file

@ -277,8 +277,13 @@ namespace SparkleLib {
public bool IdentifierExists (string identifier)
{
if (identifier == null)
throw new ArgumentNullException ();
foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) {
if (node_folder ["identifier"].InnerText.Equals (identifier))
XmlElement folder_id = node_folder ["identifier"];
if (folder_id != null && identifier.Equals (folder_id.InnerText))
return true;
}

2
SparkleShare/Windows/SparkleEventLog.cs
View file

@ -178,7 +178,7 @@ namespace SparkleShare {
});
};
Controller.UpdateChooserEvent += delegate (SparkleFolder [] folders) {
Controller.UpdateChooserEvent += delegate (string [] folders) {
Dispatcher.BeginInvoke ((Action) delegate {
UpdateChooser (folders);
});