From c8c8514d83270aa7b3762670cd281509e90fda9b Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 15 Jul 2011 02:10:36 +0100 Subject: [PATCH] cleanup unused code --- SparkleShare/Makefile.am | 1 - SparkleShare/SparkleAbout.cs | 4 ++-- SparkleShare/SparkleEntry.cs | 2 +- SparkleShare/SparkleInvitation.cs | 5 ----- SparkleShare/SparkleShare.csproj | 9 ++++----- SparkleShare/SparkleUI.cs | 26 +------------------------- 6 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 SparkleShare/SparkleInvitation.cs diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index 69135075..15dee260 100644 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -20,7 +20,6 @@ SOURCES = \ SparkleEntry.cs \ SparkleEventLog.cs \ SparkleEventLogController.cs \ - SparkleInvitation.cs \ SparkleLinController.cs \ SparkleSetup.cs \ SparkleSetupController.cs \ diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index ffa5b000..3d2e401b 100644 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -68,8 +68,8 @@ namespace SparkleShare { Controller.NewVersionEvent += delegate (string new_version) { Application.Invoke (delegate { - this.updates.Markup = String.Format ("{0}: {1}", - _("A newer version is available!"), new_version); + this.updates.Markup = String.Format ("{0}", + String.Format (_("A newer version ({0}) is available!"), new_version)); this.updates.ShowAll (); }); }; diff --git a/SparkleShare/SparkleEntry.cs b/SparkleShare/SparkleEntry.cs index 96ac5bef..3d0f846c 100644 --- a/SparkleShare/SparkleEntry.cs +++ b/SparkleShare/SparkleEntry.cs @@ -17,6 +17,7 @@ using Gtk; +// TODO: Remove with Gtk3 namespace SparkleShare { public class SparkleEntry : Entry { @@ -33,7 +34,6 @@ namespace SparkleShare { ClipboardPasted += delegate { OnEntered (); }; FocusOutEvent += delegate { - if (Text.Equals ("") || Text == null) ExampleTextActive = true; diff --git a/SparkleShare/SparkleInvitation.cs b/SparkleShare/SparkleInvitation.cs deleted file mode 100644 index 3f2ff2d6..00000000 --- a/SparkleShare/SparkleInvitation.cs +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/SparkleShare/SparkleShare.csproj b/SparkleShare/SparkleShare.csproj index 2e60021d..079ec8de 100644 --- a/SparkleShare/SparkleShare.csproj +++ b/SparkleShare/SparkleShare.csproj @@ -59,15 +59,10 @@ - - - - - @@ -78,5 +73,9 @@ + + + + diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index 1a298c1e..af53c843 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -66,7 +66,6 @@ namespace SparkleShare { }; - // Show a bubble when there are new changes SparkleShare.Controller.NotificationRaised += delegate (string user_name, string user_email, string message, string repository_path) { @@ -98,30 +97,7 @@ namespace SparkleShare { // TODO new SparkleBubble (title, subtext).Show (); }); }; - - SparkleShare.Controller.AvatarFetched += delegate { - Application.Invoke (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - }); - }; - - SparkleShare.Controller.OnIdle += delegate { - Application.Invoke (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - }); - }; - - SparkleShare.Controller.FolderListChanged += delegate { - Application.Invoke (delegate { - if (EventLog != null) { - EventLog.UpdateChooser (); - EventLog.UpdateEvents (); - } - }); - }; - } + } // Runs the application public void Run ()