Add an optional callback to ObtLinkBase to hear about updates, and fix crash.

diff --git a/obt/linkbase.c b/obt/linkbase.c
index af4c29a6d4a8c660623bda26b31d1ec5cf24f76c..a6f7a9855d8b134c5b3cfe1945afb5f27dc1a954 100644 (file)
--- a/obt/linkbase.c
+++ b/obt/linkbase.c
@@ -54,6 +54,9 @@ struct _ObtLinkBase {
     /*! This holds the paths in which we look for links, and the data is an
       integer that is the priority of that directory. */
     GHashTable *path_to_priority;
+
+    ObtLinkBaseUpdateFunc update_func;
+    gpointer update_data;
 };
 
 static void base_entry_free(ObtLinkBaseEntry *e)
@@ -117,18 +120,27 @@ static void update(ObtWatch *w, const gchar *base_path,
         break;
     case OBT_WATCH_REMOVED:
         it = find_base_entry_path(list, full_path);
-        list = g_slist_delete_link(list, it);
-        base_entry_free(it->data);
+        if (it) {
+            /* it may be false if the link was skipped during the add because
+               it did not want to be displayed */
+            list = g_slist_delete_link(list, it);
+            base_entry_free(it->data);
 
-        /* this will free 'id' */
-        g_hash_table_insert(self->base, id, list);
-        id = NULL;
+            /* this will free 'id' */
+            g_hash_table_insert(self->base, id, list);
+            id = NULL;
+        }
         break;
     case OBT_WATCH_MODIFIED:
         it = find_base_entry_path(list, full_path);
-        list = g_slist_delete_link(list, it);
-        base_entry_free(it->data);
-        add = TRUE; /* this will put the modified list into the hash table */
+        if (it) {
+            /* it may be false if the link was skipped during the add because
+               it did not want to be displayed */
+            list = g_slist_delete_link(list, it);
+            base_entry_free(it->data);
+            /* this will put the modified list into the hash table */
+            add = TRUE;
+        }
         break;
     case OBT_WATCH_ADDED:
         priority = g_hash_table_lookup(self->path_to_priority, base_path);
@@ -151,22 +163,27 @@ static void update(ObtWatch *w, const gchar *base_path,
         link = obt_link_from_ddfile(full_path, self->paths,
                                     self->language, self->country,
                                     self->modifier);
-        if (!obt_link_display(link, self->environments)) {
-            obt_link_unref(link);
-        }
-        else {
-            ObtLinkBaseEntry *e = g_slice_new(ObtLinkBaseEntry);
-            e->priority = *priority;
-            e->link = link;
-            list = g_slist_insert_before(list, it, e);
+        if (link) {
+            if (!obt_link_display(link, self->environments)) {
+                obt_link_unref(link);
+            }
+            else {
+                ObtLinkBaseEntry *e = g_slice_new(ObtLinkBaseEntry);
+                e->priority = *priority;
+                e->link = link;
+                list = g_slist_insert_before(list, it, e);
 
-            /* this will free 'id' */
-            g_hash_table_insert(self->base, id, list);
-            id = NULL;
+                /* this will free 'id' */
+                g_hash_table_insert(self->base, id, list);
+                id = NULL;
+            }
         }
     }
 
     g_free(id);
+
+    if (self->update_func)
+        self->update_func(self, self->update_data);
 }
 
 ObtLinkBase* obt_linkbase_new(ObtPaths *paths, const gchar *locale,
@@ -271,3 +288,10 @@ void obt_linkbase_unref(ObtLinkBase *self)
         g_slice_free(ObtLinkBase, self);
     }
 }
+
+void obt_linkbase_set_update_func(ObtLinkBase *lb, ObtLinkBaseUpdateFunc func,
+                                  gpointer data)
+{
+    lb->update_func = func;
+    lb->update_data = data;
+}

diff --git a/obt/linkbase.h b/obt/linkbase.h
index 4d2b7c4433bd8dcc8824a4481735abdfdb19ebf3..386d3c2fe47f3419fd50753eec8056de8835f7fd 100644 (file)
--- a/obt/linkbase.h
+++ b/obt/linkbase.h
@@ -27,6 +27,8 @@ G_BEGIN_DECLS
 
 typedef struct _ObtLinkBase ObtLinkBase;
 
+typedef void (*ObtLinkBaseUpdateFunc)(ObtLinkBase *lb, gpointer data);
+
 /*! Create a new database of ObtLinks.
   @param paths An ObtPaths structure.
   @param locale The value of LC_MESSAGES.
@@ -38,6 +40,9 @@ ObtLinkBase* obt_linkbase_new(struct _ObtPaths *paths, const gchar *locale,
 void obt_linkbase_ref(ObtLinkBase *lb);
 void obt_linkbase_unref(ObtLinkBase *lb);
 
+void obt_linkbase_set_update_func(ObtLinkBase *lb, ObtLinkBaseUpdateFunc func,
+                                  gpointer data);
+
 G_END_DECLS
 
 #endif