Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main/src/addins/VersionControl
diff options
context:
space:
mode:
authorMarius Ungureanu <teromario@yahoo.com>2017-06-25 14:30:35 +0300
committerGitHub <noreply@github.com>2017-06-25 14:30:35 +0300
commit9e327cc667fec776b44231ab5bb2fa1a8e5ac34b (patch)
treefc80bbbdacf8604850b79b34b861235d8aa51761 /main/src/addins/VersionControl
parentd6e5ec6dc6bea3595919bb15b90a6948e5bf5d5f (diff)
[Gtk#] Update to match newest API (#2682)
The Invoke API now can take both an Action and an EventHandler. delegate {} causes ambiguous results.
Diffstat (limited to 'main/src/addins/VersionControl')
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs8
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs4
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs4
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs8
15 files changed, 23 insertions, 23 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
index 2913adac75..f6252c446a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
@@ -153,7 +153,7 @@ namespace MonoDevelop.VersionControl.Git
bool RefreshFile (string path, CheckoutNotifyFlags flags)
{
FilePath fp = RootRepository.FromGitPath (path);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
if (IdeApp.IsInitialized) {
MonoDevelop.Ide.Gui.Document doc = IdeApp.Workbench.GetDocument (fp);
if (doc != null)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
index 963c7bb25f..8ad5a5e087 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
@@ -279,7 +279,7 @@ namespace MonoDevelop.VersionControl.Dialogs
ex = e;
}
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
if (ex != null) {
LoggingService.LogError ("Failed to load connected repositories.", ex.ToString ());
}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
index 168ffb5194..0df03a9b53 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
@@ -339,7 +339,7 @@ namespace MonoDevelop.VersionControl.Views
ddata.diffRequested = true;
ddata.diffRunning = false;
if (null != DiffDataLoaded) {
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
DiffDataLoaded (ddata);
DiffDataLoaded = null;
});
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
index f828b3039e..3c1d3e50ab 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
@@ -188,7 +188,7 @@ namespace MonoDevelop.VersionControl.Views
};
worker.RunWorkerCompleted += delegate(object sender, RunWorkerCompletedEventArgs e) {
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
var result = (KeyValuePair<Revision, string>)e.Result;
var box = toEditor == editors[0] ? diffComboBox : originalComboBox;
RemoveLocal (toEditor.GetTextEditorData ());
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
index 0fa3659950..b08562fa3d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
@@ -404,7 +404,7 @@ namespace MonoDevelop.VersionControl.Views
try {
text = info.Repository.GetTextAtRevision (path, rev);
} catch (Exception e) {
- Application.Invoke (delegate {
+ Application.Invoke ((o2, a2) => {
LoggingService.LogError ("Error while getting revision text", e);
MessageService.ShowError (
GettextCatalog.GetString ("Error while getting revision text."),
@@ -417,7 +417,7 @@ namespace MonoDevelop.VersionControl.Views
try {
prevRev = rev.GetPrevious ();
} catch (Exception e) {
- Application.Invoke (delegate {
+ Application.Invoke ((o2, a2) => {
MessageService.ShowError (GettextCatalog.GetString ("Error while getting previous revision."), e);
});
return;
@@ -438,7 +438,7 @@ namespace MonoDevelop.VersionControl.Views
try {
prevRevisionText = info.Repository.GetTextAtRevision (path, prevRev);
} catch (Exception e) {
- Application.Invoke (delegate {
+ Application.Invoke ((o2, a2) => {
LoggingService.LogError ("Error while getting revision text", e);
MessageService.ShowError (
GettextCatalog.GetString ("Error while getting revision text."),
@@ -463,7 +463,7 @@ namespace MonoDevelop.VersionControl.Views
lines = Mono.TextEditor.Utils.Diff.GetDiffString (originalDocument, changedDocument).Split ('\n');
}
}
- Application.Invoke (delegate {
+ Application.Invoke ((o2, a2) => {
changedpathstore.SetValue (iter, colDiff, lines);
});
});
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
index 0a03810fe5..cf634cff82 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
@@ -1081,7 +1081,7 @@ namespace MonoDevelop.VersionControl.Views
// the value. Do not capture the TreeIter as it may invalidate
// before the diff data has asyncronously loaded.
GC.KeepAlive (info.Diff.Value);
- Gtk.Application.Invoke (delegate { if (!disposed) FillDifs (); });
+ Gtk.Application.Invoke ((o, args) => { if (!disposed) FillDifs (); });
});
} else if (info.Exception != null) {
text = new [] { GettextCatalog.GetString ("Could not get diff information. ") };
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
index be9da672f5..ba5a42e0fc 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
@@ -37,7 +37,7 @@ namespace MonoDevelop.VersionControl
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Add (list.Paths, true, monitor);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
VersionControlService.NotifyFileStatusChanged (items);
});
monitor.ReportSuccess (GettextCatalog.GetString ("Add operation completed."));
@@ -131,7 +131,7 @@ namespace MonoDevelop.VersionControl
dirs[0].Repository.DeleteDirectories (dirs.Paths, true, Monitor, true);
}
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
VersionControlService.NotifyFileStatusChanged (items);
});
Monitor.ReportSuccess (GettextCatalog.GetString ("Remove operation completed."));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
index 2e035e90ce..e6690818c4 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
@@ -81,7 +81,7 @@ namespace MonoDevelop.VersionControl
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Ignore (list.Paths);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
foreach (VersionControlItem item in items)
if (!item.IsDirectory)
FileService.NotifyFileChanged (item.Path);
@@ -144,7 +144,7 @@ namespace MonoDevelop.VersionControl
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Unignore (list.Paths);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
foreach (VersionControlItem item in items)
if (!item.IsDirectory)
FileService.NotifyFileChanged (item.Path);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
index 684ded981b..a8f4eaf134 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
@@ -61,7 +61,7 @@ namespace MonoDevelop.VersionControl
list[0].Repository.Lock (Monitor, list.Paths);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
VersionControlService.NotifyFileStatusChanged (items);
});
Monitor.ReportSuccess (GettextCatalog.GetString ("Lock operation completed."));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
index b7a27f5535..59f86a78a8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
@@ -101,7 +101,7 @@ namespace MonoDevelop.VersionControl
return;
}
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
});
Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
index 2e053bb10b..40532a1b4c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
@@ -59,7 +59,7 @@ namespace MonoDevelop.VersionControl
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
foreach (VersionControlItem item in items) {
if (!item.IsDirectory) {
FileService.NotifyFileChanged (item.Path);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
index 293d5b7295..33fa40909f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
@@ -115,7 +115,7 @@ namespace MonoDevelop.VersionControl
if (!(isDir || Directory.Exists (path)))
isDir = false;
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
if (!isDir) {
// Reload reverted files
Document doc = IdeApp.Workbench.GetDocument (path);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
index 0fb3740224..787101fbac 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
@@ -62,7 +62,7 @@ namespace MonoDevelop.VersionControl
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Unlock (Monitor, list.Paths);
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
VersionControlService.NotifyFileStatusChanged (items);
});
Monitor.ReportSuccess (GettextCatalog.GetString ("Unlock operation completed."));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
index 18ab6a7713..b839c4b9cb 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
foreach (VersionControlItemList list in items.SplitByRepository ()) {
list[0].Repository.Update (list.Paths, true, Monitor);
}
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
VersionControlService.NotifyFileStatusChanged (items);
});
Monitor.ReportSuccess (GettextCatalog.GetString ("Update operation completed."));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
index b05f6ea56d..71dfc48d81 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
@@ -387,7 +387,7 @@ namespace MonoDevelop.VersionControl
internal static void NotifyPrepareCommit (Repository repo, ChangeSet changeSet)
{
if (!Runtime.IsMainThread) {
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
NotifyPrepareCommit (repo, changeSet);
});
return;
@@ -403,7 +403,7 @@ namespace MonoDevelop.VersionControl
internal static void NotifyBeforeCommit (Repository repo, ChangeSet changeSet)
{
if (!Runtime.IsMainThread) {
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
NotifyBeforeCommit (repo, changeSet);
});
return;
@@ -419,7 +419,7 @@ namespace MonoDevelop.VersionControl
internal static void NotifyAfterCommit (Repository repo, ChangeSet changeSet, bool success)
{
if (!Runtime.IsMainThread) {
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o, args) => {
NotifyAfterCommit (repo, changeSet, success);
});
return;
@@ -449,7 +449,7 @@ namespace MonoDevelop.VersionControl
public static void NotifyFileStatusChanged (FileUpdateEventArgs args)
{
if (!Runtime.IsMainThread)
- Gtk.Application.Invoke (delegate {
+ Gtk.Application.Invoke ((o2, a2) => {
NotifyFileStatusChanged (args);
});
else {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 13:08:15 +0300