[gnote] Fixed some internal inconsistencies with the "TagTable" that is now shared.



commit 6498b4f200763c359b98a6c4f18a685304c90a03
Author: Hubert Figuiere <hub figuiere net>
Date:   Thu Jul 16 16:45:30 2009 -0400

    Fixed some internal inconsistencies with the "TagTable" that is now shared.
    (tb-backport)

 src/watchers.cpp |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/src/watchers.cpp b/src/watchers.cpp
index 91d4fc5..d86f69b 100644
--- a/src/watchers.cpp
+++ b/src/watchers.cpp
@@ -413,9 +413,8 @@ namespace gnote {
 
   void NoteUrlWatcher::on_note_opened ()
   {
-#if FIXED_GTKSPELL
-    // NOTE: This hack helps avoid multiple URL opens for
-    // cases where the GtkSpell version is fixed to allow
+    // NOTE: This hack helps avoid multiple URL opens
+    // now that Notes always perform
     // TagTable sharing.  This is because if the TagTable is
     // shared, we will connect to the same Tag's event
     // source each time a note is opened, and get called
@@ -426,10 +425,6 @@ namespace gnote {
         sigc::mem_fun(*this, &NoteUrlWatcher::on_url_tag_activated));
       s_text_event_connected = true;
     }
-#else
-    m_url_tag->signal_activate().connect(
-      sigc::mem_fun(*this, &NoteUrlWatcher::on_url_tag_activated));
-#endif
 
     m_click_mark = get_buffer()->create_mark(get_buffer()->begin(), true);
 
@@ -662,9 +657,8 @@ namespace gnote {
 
   void NoteLinkWatcher::on_note_opened ()
   {
-#if FIXED_GTKSPELL
-    // NOTE: This avoid multiple link opens for cases where
-    // the GtkSpell version is fixed to allow TagTable
+    // NOTE: This avoid multiple link opens
+    // now that notes always perform TagTable
     // sharing.  This is because if the TagTable is shared,
     // we will connect to the same Tag's event source each
     // time a note is opened, and get called multiple times
@@ -676,12 +670,6 @@ namespace gnote {
         sigc::mem_fun(*this, &NoteLinkWatcher::on_link_tag_activated));
       s_text_event_connected = true;
     }
-#else
-    m_link_tag->signal_activate().connect(
-      sigc::mem_fun(*this, &NoteLinkWatcher::on_link_tag_activated));
-    m_broken_link_tag->signal_activate().connect(
-      sigc::mem_fun(*this, &NoteLinkWatcher::on_link_tag_activated));
-#endif
     get_buffer()->signal_insert().connect(
       sigc::mem_fun(*this, &NoteLinkWatcher::on_insert_text));
     get_buffer()->signal_erase().connect(



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]