[tomboy] [Cleanup] Replace obsolete .Log() method calls with .Debug/.Info/.Warn/.Error
- From: Benjamin Podszun <bpodszun src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tomboy] [Cleanup] Replace obsolete .Log() method calls with .Debug/.Info/.Warn/.Error
- Date: Mon, 16 Aug 2010 14:49:37 +0000 (UTC)
commit 4c56f3469cf3f1b0f73eb73620b4ad551e843a7a
Author: Benjamin Podszun <benjamin podszun topimagesystems com>
Date: Mon Aug 16 16:48:50 2010 +0200
[Cleanup] Replace obsolete .Log() method calls with .Debug/.Info/.Warn/.Error
Tomboy/Addins/Bugzilla/BugzillaLink.cs | 2 +-
Tomboy/Addins/Evolution/EvolutionNoteAddin.cs | 16 ++++++++--------
.../Addins/ExportToHtml/ExportToHtmlNoteAddin.cs | 12 ++++++------
Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs | 2 +-
.../StickyNoteImport/StickyNoteImportNoteAddin.cs | 12 ++++++------
Tomboy/Applet.cs | 4 ++--
Tomboy/Note.cs | 14 +++++++-------
Tomboy/NoteBuffer.cs | 10 +++++-----
Tomboy/NoteEditor.cs | 8 ++++----
Tomboy/NoteManager.cs | 8 ++++----
Tomboy/NoteTag.cs | 6 +++---
Tomboy/NoteWindow.cs | 6 +++---
Tomboy/PrefsKeybinder.cs | 18 +++++++++---------
Tomboy/Synchronization/FileSystemSyncServer.cs | 4 ++--
Tomboy/Synchronization/SyncManager.cs | 4 ++--
Tomboy/Tomboy.cs | 14 +++++++-------
Tomboy/Utils.cs | 2 +-
Tomboy/Watchers.cs | 10 +++++-----
18 files changed, 76 insertions(+), 76 deletions(-)
---
diff --git a/Tomboy/Addins/Bugzilla/BugzillaLink.cs b/Tomboy/Addins/Bugzilla/BugzillaLink.cs
index 152c979..842a175 100644
--- a/Tomboy/Addins/Bugzilla/BugzillaLink.cs
+++ b/Tomboy/Addins/Bugzilla/BugzillaLink.cs
@@ -75,7 +75,7 @@ namespace Tomboy.Bugzilla
protected override bool OnActivate (NoteEditor editor, Gtk.TextIter start, Gtk.TextIter end)
{
if (BugUrl != string.Empty) {
- Logger.Log ("Opening url '{0}'...", BugUrl);
+ Logger.Debug ("Opening url '{0}'...", BugUrl);
try {
Services.NativeApplication.OpenUrl (BugUrl, editor.Screen);
diff --git a/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs b/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
index 5d18e5a..3d4472a 100644
--- a/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
+++ b/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
@@ -38,7 +38,7 @@ namespace Tomboy.Evolution
SetupAccountUrlToUidMap ();
}
catch (Exception e) {
- Logger.Log ("Evolution: Error reading accounts: {0}", e);
+ Logger.Error ("Evolution: Error reading accounts: {0}", e);
}
}
@@ -82,7 +82,7 @@ namespace Tomboy.Evolution
Uri uri = new Uri (source_url.InnerText);
source_url_to_uid [uri] = uid;
} catch (System.UriFormatException) {
- Logger.Log (
+ Logger.Error (
"Evolution: Unable to parse account source URI \"{0}\"",
source_url.InnerText);
}
@@ -139,7 +139,7 @@ namespace Tomboy.Evolution
if (match) {
account_uid = source_url_to_uid [source_uri];
- Logger.Log ("Evolution: Matching account '{0}'...",
+ Logger.Info ("Evolution: Matching account '{0}'...",
account_uid);
break;
}
@@ -264,7 +264,7 @@ namespace Tomboy.Evolution
} catch (Exception e) {
string message = String.Format ("Error running Evolution: {0}",
e.Message);
- Logger.Log (message);
+ Logger.Error (message);
HIGMessageDialog dialog =
new HIGMessageDialog (editor.Toplevel as Gtk.Window,
Gtk.DialogFlags.DestroyWithParent,
@@ -379,7 +379,7 @@ namespace Tomboy.Evolution
UriList uri_list = new UriList (uri_string);
foreach (Uri uri in uri_list) {
- Logger.Log ("Evolution: Dropped URI: {0}", uri.LocalPath);
+ Logger.Debug ("Evolution: Dropped URI: {0}", uri.LocalPath);
int mail_fd = Syscall.open (uri.LocalPath, OpenFlags.O_RDONLY);
if (mail_fd == -1)
@@ -397,7 +397,7 @@ namespace Tomboy.Evolution
if (message == null)
break;
- Logger.Log ("Evolution: Message Subject: {0}", message.Subject);
+ Logger.Debug ("Evolution: Message Subject: {0}", message.Subject);
subject_list.Add (message.Subject);
message.Dispose ();
};
@@ -422,7 +422,7 @@ namespace Tomboy.Evolution
xuid_list = new List<string> ();
- Logger.Log ("Evolution: Dropped XUid: uri = '{0}'", list [0]);
+ Logger.Debug ("Evolution: Dropped XUid: uri = '{0}'", list [0]);
for (int i = 1; i < list.Length; i++) {
if (list [i] == string.Empty)
@@ -432,7 +432,7 @@ namespace Tomboy.Evolution
EvoUtils.EmailUriFromDropUri (list [0] /* evo account uri */,
list [i] /* message uid */);
- Logger.Log ("Evolution: Translating XUid uid='{0}' to uri='{1}'",
+ Logger.Debug ("Evolution: Translating XUid uid='{0}' to uri='{1}'",
list [i],
launch_uri);
diff --git a/Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs b/Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs
index 3dd0c44..f799c12 100644
--- a/Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs
+++ b/Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs
@@ -30,7 +30,7 @@ namespace Tomboy.ExportToHtml
xsl = new XslTransform ();
if (File.Exists (stylesheet_file)) {
- Logger.Log ("ExportToHTML: Using user-custom {0} file.",
+ Logger.Info ("ExportToHTML: Using user-custom {0} file.",
stylesheet_name);
xsl.Load (stylesheet_file);
} else {
@@ -40,7 +40,7 @@ namespace Tomboy.ExportToHtml
xsl.Load (reader, null, null);
resource.Close ();
} else {
- Logger.Log ("Unable to find HTML export template '{0}'.",
+ Logger.Error ("Unable to find HTML export template '{0}'.",
stylesheet_name);
}
}
@@ -82,7 +82,7 @@ namespace Tomboy.ExportToHtml
return;
}
- Logger.Log ("Exporting Note '{0}' to '{1}'...", Note.Title, output_path);
+ Logger.Debug ("Exporting Note '{0}' to '{1}'...", Note.Title, output_path);
StreamWriter writer = null;
string error_message = null;
@@ -108,7 +108,7 @@ namespace Tomboy.ExportToHtml
Services.NativeApplication.OpenUrl (output_uri.AbsoluteUri,
Note.Window.Screen);
} catch (Exception ex) {
- Logger.Log ("Could not open exported note in a web browser: {0}",
+ Logger.Error ("Could not open exported note in a web browser: {0}",
ex);
string detail = String.Format (
@@ -133,7 +133,7 @@ namespace Tomboy.ExportToHtml
} catch (DirectoryNotFoundException) {
error_message = Catalog.GetString ("Folder does not exist.");
} catch (Exception e) {
- Logger.Log ("Could not export: {0}", e);
+ Logger.Error ("Could not export: {0}", e);
error_message = e.Message;
} finally {
@@ -143,7 +143,7 @@ namespace Tomboy.ExportToHtml
if (error_message != null)
{
- Logger.Log ("Could not export: {0}", error_message);
+ Logger.Error ("Could not export: {0}", error_message);
string msg = String.Format (
Catalog.GetString ("Could not save the file \"{0}\""),
diff --git a/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs b/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs
index 83ac70f..5c6923c 100644
--- a/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs
+++ b/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs
@@ -103,7 +103,7 @@ namespace Tomboy.NoteOfTheDay
}
foreach (Note note in kill_list) {
- Logger.Log ("NoteOfTheDay: Deleting old unmodified '{0}'",
+ Logger.Debug ("NoteOfTheDay: Deleting old unmodified '{0}'",
note.Title);
manager.Delete (note);
}
diff --git a/Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs b/Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs
index 959ecdf..705f574 100644
--- a/Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs
+++ b/Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs
@@ -57,7 +57,7 @@ namespace Tomboy.StickyNoteImport
CheckForFirstRun ();
} else {
sticky_file_might_exist = false;
- Logger.Log (debug_no_sticky_file);
+ Logger.Debug (debug_no_sticky_file);
}
}
}
@@ -84,7 +84,7 @@ namespace Tomboy.StickyNoteImport
try {
Preferences.Set (Preferences.STICKYNOTEIMPORTER_FIRST_RUN, false);
} catch (Exception e) {
- Logger.Log (debug_gconf_set_error_base, e);
+ Logger.Debug (debug_gconf_set_error_base, e);
}
Logger.Log (debug_first_run_detected);
@@ -104,12 +104,12 @@ namespace Tomboy.StickyNoteImport
xmlDoc.Load (sticky_xml_path);
return xmlDoc;
} catch {
- Logger.Log (debug_no_sticky_file);
+ Logger.Debug (debug_no_sticky_file);
return null;
}
}
else {
- Logger.Log (debug_no_sticky_file);
+ Logger.Debug (debug_no_sticky_file);
return null;
}
@@ -176,7 +176,7 @@ namespace Tomboy.StickyNoteImport
// TODO: Report the error in the results dialog
// (this error should only happen if somebody has messed with the XML file)
if (content.IndexOf ('>') != -1 || content.IndexOf ('<') != -1) {
- Logger.Log (string.Format (debug_create_error_base,
+ Logger.Error (string.Format (debug_create_error_base,
stickyTitle,
"Invalid characters in note XML"));
return false;
@@ -197,7 +197,7 @@ namespace Tomboy.StickyNoteImport
newNote.Save ();
return true;
} catch (Exception e) {
- Logger.Log (string.Format (debug_create_error_base, title, e.Message));
+ Logger.Error (string.Format (debug_create_error_base, title, e.Message));
return false;
}
}
diff --git a/Tomboy/Applet.cs b/Tomboy/Applet.cs
index 41e2e41..03753b0 100644
--- a/Tomboy/Applet.cs
+++ b/Tomboy/Applet.cs
@@ -14,7 +14,6 @@ namespace Tomboy
{
NoteManager manager;
TomboyPanelAppletEventBox applet_event_box;
- TomboyPrefsKeybinder keybinder;
// Keep referenced so our callbacks don't get reaped.
static BonoboUIVerb [] menu_verbs;
@@ -44,7 +43,8 @@ namespace Tomboy
manager = Tomboy.DefaultNoteManager;
applet_event_box = new TomboyPanelAppletEventBox (manager);
- keybinder = new TomboyPrefsKeybinder (manager, applet_event_box);
+ // No need to keep the reference
+ new TomboyPrefsKeybinder (manager, applet_event_box);
Flags |= PanelAppletFlags.ExpandMinor;
diff --git a/Tomboy/Note.cs b/Tomboy/Note.cs
index bda7823..86002e3 100644
--- a/Tomboy/Note.cs
+++ b/Tomboy/Note.cs
@@ -494,7 +494,7 @@ namespace Tomboy
if (!save_needed)
return;
- Logger.Log ("Saving '{0}'...", data.Data.Title);
+ Logger.Debug ("Saving '{0}'...", data.Data.Title);
try {
NoteArchiver.Write (filepath, data.GetDataSynchronized ());
@@ -628,7 +628,7 @@ namespace Tomboy
} catch (Exception e) {
// FIXME: Present a nice dialog here that interprets the
// error message correctly.
- Logger.Log ("Error while saving: {0}", e);
+ Logger.Error ("Error while saving: {0}", e);
}
}
@@ -864,7 +864,7 @@ namespace Tomboy
}
set {
if (buffer != null) {
- buffer.SetText("");
+ buffer.Text = string.Empty;
NoteBufferArchiver.Deserialize (buffer, value);
} else
data.Text = value;
@@ -985,9 +985,9 @@ namespace Tomboy
}
set {
if (buffer != null)
- buffer.SetText (value);
+ buffer.Text = value;
else
- Logger.Log ("Setting text content for closed notes not supported");
+ Logger.Error ("Setting text content for closed notes not supported");
}
}
@@ -1062,7 +1062,7 @@ namespace Tomboy
{
get {
if (buffer == null) {
- Logger.Log ("Creating Buffer for '{0}'...",
+ Logger.Debug ("Creating Buffer for '{0}'...",
data.Data.Title);
buffer = new NoteBuffer (TagTable, this);
@@ -1272,7 +1272,7 @@ namespace Tomboy
if (version != NoteArchiver.CURRENT_VERSION) {
// Note has old format, so rewrite it. No need
// to reread, since we are not adding anything.
- Logger.Log ("Updating note XML to newest format...");
+ Logger.Info ("Updating note XML to newest format...");
NoteArchiver.Write (read_file, data);
}
diff --git a/Tomboy/NoteBuffer.cs b/Tomboy/NoteBuffer.cs
index 201f8e6..096a9ea 100644
--- a/Tomboy/NoteBuffer.cs
+++ b/Tomboy/NoteBuffer.cs
@@ -131,7 +131,7 @@ namespace Tomboy
public void ToggleActiveTag (string tag_name)
{
- Logger.Log ("ToggleTag called for '{0}'", tag_name);
+ Logger.Debug ("ToggleTag called for '{0}'", tag_name);
Gtk.TextTag tag = TagTable.Lookup (tag_name);
Gtk.TextIter select_start, select_end;
@@ -155,7 +155,7 @@ namespace Tomboy
public void SetActiveTag (string tag_name)
{
- Logger.Log ("SetTag called for '{0}'", tag_name);
+ Logger.Debug ("SetTag called for '{0}'", tag_name);
Gtk.TextTag tag = TagTable.Lookup (tag_name);
Gtk.TextIter select_start, select_end;
@@ -169,7 +169,7 @@ namespace Tomboy
public void RemoveActiveTag (string tag_name)
{
- Logger.Log ("RemoveTag called for '{0}'", tag_name);
+ Logger.Debug ("RemoveTag called for '{0}'", tag_name);
Gtk.TextTag tag = TagTable.Lookup (tag_name);
Gtk.TextIter select_start, select_end;
@@ -1336,7 +1336,7 @@ namespace Tomboy
// Hidden character representing an anchor
if (iter.Char[0] == (char) 0xFFFC) {
- Logger.Log ("Got child anchor!!!");
+ Logger.Info ("Got child anchor!");
if (iter.ChildAnchor != null) {
string serialize =
(string) iter.ChildAnchor.Data ["serialize"];
@@ -1571,7 +1571,7 @@ namespace Tomboy
break;
default:
- Logger.Log ("Unhandled element {0}. Value: '{1}'",
+ Logger.Warn ("Unhandled element {0}. Value: '{1}'",
xml.NodeType,
xml.Value);
break;
diff --git a/Tomboy/NoteEditor.cs b/Tomboy/NoteEditor.cs
index 123f86c..9e75910 100644
--- a/Tomboy/NoteEditor.cs
+++ b/Tomboy/NoteEditor.cs
@@ -93,17 +93,17 @@ namespace Tomboy
{
if ((bool) Preferences.Get(Preferences.ENABLE_CUSTOM_FONT)) {
string fontString = (string) Preferences.Get(Preferences.CUSTOM_FONT_FACE);
- Logger.Log( "Switching note font to '{0}'...", fontString);
+ Logger.Debug( "Switching note font to '{0}'...", fontString);
ModifyFontFromString (fontString);
} else {
- Logger.Log ("Switching back to the default font");
+ Logger.Debug ("Switching back to the default font");
ModifyFont (GetGnomeDocumentFontDescription());
}
}
void ModifyFontFromString (string fontString)
{
- Logger.Log ("Switching note font to '{0}'...", fontString);
+ Logger.Debug ("Switching note font to '{0}'...", fontString);
ModifyFont (Pango.FontDescription.FromString (fontString));
}
@@ -142,7 +142,7 @@ namespace Tomboy
Gtk.TextTag link_tag = Buffer.TagTable.Lookup ("link:url");
foreach (Uri uri in uri_list) {
- Logger.Log ("Got Dropped URI: {0}", uri);
+ Logger.Debug ("Got Dropped URI: {0}", uri);
string insert;
if (uri.IsFile) {
// URL-escape the path in case
diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
index be9f6d8..1895a5f 100644
--- a/Tomboy/NoteManager.cs
+++ b/Tomboy/NoteManager.cs
@@ -38,7 +38,7 @@ namespace Tomboy
public NoteManager (string directory, string backup_directory)
{
- Logger.Log ("NoteManager created with note path \"{0}\".", directory);
+ Logger.Debug ("NoteManager created with note path \"{0}\".", directory);
notes_dir = directory;
backup_dir = backup_directory;
@@ -327,7 +327,7 @@ Ciao!");
notes.Add (note);
}
} catch (System.Xml.XmlException e) {
- Logger.Log ("Error parsing note XML, skipping \"{0}\": {1}",
+ Logger.Error ("Error parsing note XML, skipping \"{0}\": {1}",
file_path,
e.Message);
}
@@ -383,7 +383,7 @@ Ciao!");
}
}
- Logger.Log ("Saving unsaved notes...");
+ Logger.Debug ("Saving unsaved notes...");
// Use a copy of the notes to prevent bug #510442 (crash on exit
// when iterating the notes to save them.
@@ -419,7 +419,7 @@ Ciao!");
notes.Remove (note);
note.Delete ();
- Logger.Log ("Deleting note '{0}'.", note.Title);
+ Logger.Debug ("Deleting note '{0}'.", note.Title);
if (NoteDeleted != null)
NoteDeleted (this, note);
diff --git a/Tomboy/NoteTag.cs b/Tomboy/NoteTag.cs
index 97fd45a..1982382 100644
--- a/Tomboy/NoteTag.cs
+++ b/Tomboy/NoteTag.cs
@@ -53,8 +53,8 @@ namespace Tomboy
public NoteTag (IntPtr raw)
: base (raw)
{
- Logger.Log ("{0} IntPtr initializer called!", GetType());
- Logger.Log ((new System.Diagnostics.StackTrace()).ToString());
+ Logger.Info ("{0} IntPtr initializer called!", GetType());
+ Logger.Info ((new System.Diagnostics.StackTrace()).ToString());
}
public virtual void Initialize (string element_name)
@@ -415,7 +415,7 @@ namespace Tomboy
Attributes [name] = xml.Value;
OnAttributeRead (name);
- Logger.Log (
+ Logger.Debug (
"NoteTag: {0} read attribute {1}='{2}'",
ElementName,
name,
diff --git a/Tomboy/NoteWindow.cs b/Tomboy/NoteWindow.cs
index 0f931c0..c058731 100644
--- a/Tomboy/NoteWindow.cs
+++ b/Tomboy/NoteWindow.cs
@@ -333,7 +333,7 @@ namespace Tomboy
{
args.Menu.AccelGroup = accel_group;
- Logger.Log ("Populating context menu...");
+ Logger.Debug ("Populating context menu...");
// Remove the lame-o gigantic Insert Unicode Control
// Characters menu item.
@@ -1584,7 +1584,7 @@ namespace Tomboy
void UndoClicked (object sender, EventArgs args)
{
if (undo_manager.CanUndo) {
- Logger.Log ("Running undo...");
+ Logger.Debug ("Running undo...");
undo_manager.Undo ();
}
}
@@ -1592,7 +1592,7 @@ namespace Tomboy
void RedoClicked (object sender, EventArgs args)
{
if (undo_manager.CanRedo) {
- Logger.Log ("Running redo...");
+ Logger.Debug ("Running redo...");
undo_manager.Redo ();
}
}
diff --git a/Tomboy/PrefsKeybinder.cs b/Tomboy/PrefsKeybinder.cs
index 57b09ab..8dfdf18 100644
--- a/Tomboy/PrefsKeybinder.cs
+++ b/Tomboy/PrefsKeybinder.cs
@@ -25,8 +25,8 @@ namespace Tomboy
native_keybinder);
bindings.Add (binding);
} catch (Exception e) {
- Logger.Log ("Error Adding global keybinding:");
- Logger.Log (e.ToString ());
+ Logger.Error ("Error Adding global keybinding:");
+ Logger.Error (e.ToString ());
}
}
@@ -38,8 +38,8 @@ namespace Tomboy
bindings.Clear ();
native_keybinder.UnbindAll ();
} catch (Exception e) {
- Logger.Log ("Error Removing global keybinding:");
- Logger.Log (e.ToString ());
+ Logger.Error ("Error Removing global keybinding:");
+ Logger.Error (e.ToString ());
}
}
@@ -63,7 +63,7 @@ namespace Tomboy
try {
key_sequence = (string) Preferences.Client.Get (pref_path);
} catch {
- Logger.Log ("Preference key '{0}' does not exist, using default.",
+ Logger.Warn ("Preference key '{0}' does not exist, using default.",
pref_path);
}
@@ -84,7 +84,7 @@ namespace Tomboy
void BindingChanged (object sender, NotifyEventArgs args)
{
if (args.Key == pref_path) {
- Logger.Log ("Binding for '{0}' changed to '{1}'!",
+ Logger.Debug ("Binding for '{0}' changed to '{1}'!",
pref_path,
args.Value);
@@ -102,7 +102,7 @@ namespace Tomboy
key_sequence == "disabled")
return;
- Logger.Log ("Binding key '{0}' for '{1}'",
+ Logger.Debug ("Binding key '{0}' for '{1}'",
key_sequence,
pref_path);
@@ -114,7 +114,7 @@ namespace Tomboy
if (key_sequence == null)
return;
- Logger.Log ("Unbinding key '{0}' for '{1}'",
+ Logger.Debug ("Unbinding key '{0}' for '{1}'",
key_sequence,
pref_path);
@@ -149,7 +149,7 @@ namespace Tomboy
void EnableDisable (bool enable)
{
- Logger.Log ("EnableDisable Called: enabling... {0}", enable);
+ Logger.Debug ("EnableDisable Called: enabling... {0}", enable);
if (enable) {
BindPreference (Preferences.KEYBINDING_SHOW_NOTE_MENU,
new EventHandler (KeyShowMenu));
diff --git a/Tomboy/Synchronization/FileSystemSyncServer.cs b/Tomboy/Synchronization/FileSystemSyncServer.cs
index 9aa29cb..378ba74 100644
--- a/Tomboy/Synchronization/FileSystemSyncServer.cs
+++ b/Tomboy/Synchronization/FileSystemSyncServer.cs
@@ -59,7 +59,7 @@ namespace Tomboy.Sync
AdjustPermissions (serverNotePath);
updatedNotes.Add (Path.GetFileNameWithoutExtension (note.FilePath));
} catch (Exception e) {
- Logger.Log ("Sync: Error uploading note \"{0}\": {1}", note.Title, e.Message);
+ Logger.Error ("Sync: Error uploading note \"{0}\": {1}", note.Title, e.Message);
}
}
}
@@ -70,7 +70,7 @@ namespace Tomboy.Sync
try {
deletedNotes.Add (uuid);
} catch (Exception e) {
- Logger.Log ("Sync: Error deleting note: " + e.Message);
+ Logger.Error ("Sync: Error deleting note: " + e.Message);
}
}
}
diff --git a/Tomboy/Synchronization/SyncManager.cs b/Tomboy/Synchronization/SyncManager.cs
index 0f6d1cc..f90ed67 100644
--- a/Tomboy/Synchronization/SyncManager.cs
+++ b/Tomboy/Synchronization/SyncManager.cs
@@ -392,7 +392,7 @@ namespace Tomboy.Sync
throw new Exception ("addin.CreateSyncServer () returned null");
} catch (Exception e) {
SetState (SyncState.SyncServerCreationFailed);
- Logger.Log ("Exception while creating SyncServer: {0}\n{1}", e.Message, e.StackTrace);
+ Logger.Error ("Exception while creating SyncServer: {0}\n{1}", e.Message, e.StackTrace);
SetState (SyncState.Idle);
syncThread = null;
addin.PostSyncCleanup ();// TODO: Needed?
@@ -407,7 +407,7 @@ namespace Tomboy.Sync
// TODO: We should really throw exceptions from BeginSyncTransaction ()
if (!server.BeginSyncTransaction ()) {
SetState (SyncState.Locked);
- Logger.Log ("PerformSynchronization: Server locked, try again later");
+ Logger.Warn ("PerformSynchronization: Server locked, try again later");
SetState (SyncState.Idle);
syncThread = null;
addin.PostSyncCleanup ();
diff --git a/Tomboy/Tomboy.cs b/Tomboy/Tomboy.cs
index 037d772..b607775 100644
--- a/Tomboy/Tomboy.cs
+++ b/Tomboy/Tomboy.cs
@@ -143,7 +143,7 @@ namespace Tomboy
am ["QuitTomboyAction"].Visible = false;
RegisterPanelAppletFactory ();
- Logger.Log ("All done. Ciao!");
+ Logger.Debug ("All done. Ciao!");
Exit (0);
}
#endif
@@ -153,7 +153,7 @@ namespace Tomboy
new string [] { "TOMBOY_PATH=" + note_path }); // TODO: Pass along XDG_*?
StartTrayIcon ();
- Logger.Log ("All done. Ciao!");
+ Logger.Debug ("All done. Ciao!");
}
public static bool Debugging
@@ -202,7 +202,7 @@ namespace Tomboy
try {
remote_control = RemoteControlProxy.Register (manager);
if (remote_control != null) {
- Logger.Log ("Tomboy remote control active.");
+ Logger.Debug ("Tomboy remote control active.");
} else {
// If Tomboy is already running, open the search window
// so the user gets some sort of feedback when they
@@ -213,11 +213,11 @@ namespace Tomboy
remote.DisplaySearch ();
} catch {}
- Logger.Info ("Tomboy is already running. Exiting...");
+ Logger.Error ("Tomboy is already running. Exiting...");
System.Environment.Exit (-1);
}
} catch (Exception e) {
- Logger.Log ("Tomboy remote control disabled (DBus exception): {0}",
+ Logger.Warn ("Tomboy remote control disabled (DBus exception): {0}",
e.Message);
}
}
@@ -276,7 +276,7 @@ namespace Tomboy
if (Tomboy.IsPanelApplet)
return; // Ignore the quit action
- Logger.Log ("Quitting Tomboy. Ciao!");
+ Logger.Debug ("Quitting Tomboy. Ciao!");
Exit (0);
}
@@ -694,7 +694,7 @@ namespace Tomboy
try {
remote = RemoteControlProxy.GetInstance ();
} catch (Exception e) {
- Logger.Log ("Unable to connect to Tomboy remote control: {0}",
+ Logger.Error ("Unable to connect to Tomboy remote control: {0}",
e.Message);
}
diff --git a/Tomboy/Utils.cs b/Tomboy/Utils.cs
index 026df23..1ccae6a 100644
--- a/Tomboy/Utils.cs
+++ b/Tomboy/Utils.cs
@@ -560,7 +560,7 @@ namespace Tomboy
if (s.StartsWith ("file:////"))
s = s.Replace ("file:////", "file:///");
- Logger.Log ("uri = {0}", s);
+ Logger.Debug ("uri = {0}", s);
try {
Uri uri = new Uri (s);
if (uri != null)
diff --git a/Tomboy/Watchers.cs b/Tomboy/Watchers.cs
index b77f767..87e040c 100644
--- a/Tomboy/Watchers.cs
+++ b/Tomboy/Watchers.cs
@@ -452,7 +452,7 @@ namespace Tomboy
void OpenUrl (string url)
{
if (url != string.Empty) {
- Logger.Log ("Opening url '{0}'...", url);
+ Logger.Debug ("Opening url '{0}'...", url);
Services.NativeApplication.OpenUrl (url, Note.Window.Screen);
}
}
@@ -720,7 +720,7 @@ namespace Tomboy
if (title_start.HasTag (Note.TagTable.UrlTag))
return;
- Logger.Log ("Matching Note title '{0}' at {1}-{2}...",
+ Logger.Debug ("Matching Note title '{0}' at {1}-{2}...",
hit.Key,
hit.Start,
hit.End);
@@ -799,7 +799,7 @@ namespace Tomboy
Note link = Manager.Find (link_name);
if (link == null) {
- Logger.Log ("Creating note '{0}'...", link_name);
+ Logger.Debug ("Creating note '{0}'...", link_name);
try {
link = Manager.Create (link_name);
} catch {
@@ -814,7 +814,7 @@ namespace Tomboy
// as the current note's title, it's safe to omit this check and
// also works around the bug.
if (link != null) {
- Logger.Log ("Opening note '{0}' on click...", link_name);
+ Logger.Debug ("Opening note '{0}' on click...", link_name);
link.Window.Present ();
return true;
}
@@ -892,7 +892,7 @@ namespace Tomboy
match = match.NextMatch ()) {
System.Text.RegularExpressions.Group group = match.Groups [1];
- Logger.Log ("Highlighting wikiword: '{0}' at offset {1}",
+ Logger.Debug ("Highlighting wikiword: '{0}' at offset {1}",
group,
group.Index);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
