Tweak irc notifications

This commit is contained in:
Hylke Bons 2011-02-27 00:53:14 +00:00
parent 34717cdd9b
commit 28d06b4eeb
5 changed files with 16 additions and 8 deletions

View file

@ -41,7 +41,7 @@ namespace SparkleLib {
{ {
Server = server; Server = server;
//Channel = GetSHA1 (folder_name); //Channel = GetSHA1 (server + folder_name);
Channel = folder_name; Channel = folder_name;
if (!user_email.Equals ("") && user_email != null) if (!user_email.Equals ("") && user_email != null)

View file

@ -380,7 +380,8 @@ namespace SparkleLib {
} }
} else { } else {
// Not really needed as we won't be notified about our own messages
SparkleHelpers.DebugInfo ("Irc", SparkleHelpers.DebugInfo ("Irc",
"[" + Name + "] False alarm, already up to date. (" + _CurrentHash + ")"); "[" + Name + "] False alarm, already up to date. (" + _CurrentHash + ")");
@ -541,7 +542,6 @@ namespace SparkleLib {
string message = FormatCommitMessage (); string message = FormatCommitMessage ();
Commit (message); Commit (message);
CheckForRemoteChanges ();
Push (); Push ();
} else { } else {
@ -611,8 +611,9 @@ namespace SparkleLib {
return; return;
base.Commit (message); base.Commit (message);
_CurrentHash = Head.CurrentCommit.Hash;
SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message);
SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message + " (" + _CurrentHash);
SparkleEventArgs args = new SparkleEventArgs ("Commited") { SparkleEventArgs args = new SparkleEventArgs ("Commited") {
Message = message Message = message
@ -807,7 +808,9 @@ namespace SparkleLib {
args = new SparkleEventArgs ("PushingFailed"); args = new SparkleEventArgs ("PushingFailed");
if (PushingFailed != null) if (PushingFailed != null)
PushingFailed (this, args); PushingFailed (this, args);
CheckForChanges ();
} else { } else {
@ -825,6 +828,9 @@ namespace SparkleLib {
if (PushingFinished != null) if (PushingFinished != null)
PushingFinished (this, args); PushingFinished (this, args);
if (!_IsPolling)
Listener.Client.SendMessage (SendType.Message, Listener.Channel, _CurrentHash);
} }

View file

@ -2,14 +2,14 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleExecutable</key>
<string></string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>sparkleshare</string> <string>sparkleshare</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.sparkleshare.sparkleshare</string> <string>org.sparkleshare.sparkleshare</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>SparkleShare</string> <string>SparkleShare</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.6</string> <string>10.6</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>

View file

@ -11,6 +11,7 @@
<RootNamespace>SparkleShare</RootNamespace> <RootNamespace>SparkleShare</RootNamespace>
<AssemblyName>SparkleShare</AssemblyName> <AssemblyName>SparkleShare</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<ReleaseVersion>0.2</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

View file

@ -16,5 +16,6 @@ Global
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = SparkleShare.csproj StartupItem = SparkleShare.csproj
version = 0.2
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal