small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()

4 files changed, 8 insertions, 11 deletions

diff --git a/src/lib/animations.c b/src/lib/animations.c
index 0f217d1f..16fa883d 100644
--- a/src/lib/animations.c
+++ b/src/lib/animations.c
@@ -261,11 +261,9 @@ redraw_tree_view (struct GNUNET_GTK_AnimationTreeViewHandle *atv)
  * Task run periodically to advance all of our animations.
  *
  * @param cls closure, unused
- * @param tc scheduler context, unused
  */
 static void
-ticker (void *cls,
-        const struct GNUNET_SCHEDULER_TaskContext *tc)
+ticker (void *cls)
 {
   struct GNUNET_GTK_AnimationContext *pos;
   struct GNUNET_GTK_AnimationTreeViewHandle *atv;
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index e42d422d..50b294f8 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -323,10 +323,9 @@ GNUNET_GTK_main_loop_get_args (struct GNUNET_GTK_MainLoop * ml,
  * Task to run Gtk events (within a GNUnet scheduler task).
  *
  * @param cls the main loop handle
- * @param tc scheduler context
  */
 static void
-dispatch_gtk_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+dispatch_gtk_task (void *cls)
 {
   struct GNUNET_GTK_MainLoop *ml = cls;
 
@@ -355,7 +354,7 @@ resize_cached_poll_array (struct GNUNET_GTK_MainLoop *ml, guint new_size)
  * Dummy task to keep our scheduler running.
  */
 static void
-keepalive_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+keepalive_task (void *cls)
 {
   struct GNUNET_GTK_MainLoop *ml = cls;
 
@@ -854,8 +853,8 @@ run_main_loop (void *cls, char *const *args, const char *cfgfile,
   GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
   (void) GNUNET_CONFIGURATION_load_from (gcfg, baseconfig);
   GNUNET_free (baseconfig);
-
-  if (NULL == (ipath2 = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR)))
+  /* FIXME: this was supposed to search the GTK-IPK, so the logic here is badly broken now */
+  if (NULL == (ipath2 = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR)))
   {
     GNUNET_break (0);
     return;
diff --git a/src/lib/glade.c b/src/lib/glade.c
index 5b508a85..99a9910e 100644
--- a/src/lib/glade.c
+++ b/src/lib/glade.c
@@ -35,7 +35,7 @@ GNUNET_GTK_set_icon_search_path ()
 {
   char *buf;
 
-  buf = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_ICONDIR);
+  buf = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_ICONDIR);
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), buf);
   GNUNET_free (buf);
 }
@@ -53,7 +53,7 @@ GNUNET_GTK_get_data_dir ()
   static char *dd;
 
   if (dd == NULL)
-    dd = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR);
+    dd = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
   return dd;
 }
 
diff --git a/src/lib/os_installation.c b/src/lib/os_installation.c
index 274ba0ad..9b68b097 100644
--- a/src/lib/os_installation.c
+++ b/src/lib/os_installation.c
@@ -31,7 +31,7 @@
  */
 static const struct GNUNET_OS_ProjectData gtk_pd = {
   .libname = "libgnunetgtk",
-  .project_dirname = "gnunet-gtk",
+  .project_dirname = "gnunet",
   .binary_name = "gnunet-fs-gtk",
   .env_varname = "GNUNET_GTK_PREFIX",
   .env_varname_alt = "GNUNET_PREFIX",