Fix compilation warnings

8 files changed, 31 insertions, 85 deletions

diff --git a/tumblerd/main.c b/tumblerd/main.c
index c621acb..9c3be3f 100644
--- a/tumblerd/main.c
+++ b/tumblerd/main.c
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <glib-object.h>
 
 #include <tumbler/tumbler.h>
@@ -64,19 +63,6 @@ shutdown_tumbler (TumblerLifecycleManager *lifecycle_manager,
 
 
 
-static inline gboolean
-xfce_is_valid_tilde_prefix (const gchar *p)
-{
-  if (g_ascii_isspace (*p) /* thunar ~/music */
-      || *p == '=' /* terminal --working-directory=~/ */
-      || *p == '\'' || *p == '"') /* terminal --working-directory '~my music' */
-    return TRUE;
-
-  return FALSE;
-}
-
-
-
 static GSList *
 locations_from_strv (gchar **array)
 {
@@ -211,10 +197,8 @@ main (int    argc,
 
           /* cleanup */
           g_object_unref (tp->data);
-          g_slist_foreach (locations, (GFunc) g_object_unref, NULL);
-          g_slist_free (locations);
-          g_slist_foreach (excludes, (GFunc) g_object_unref, NULL);
-          g_slist_free (excludes);
+          g_slist_free_full (locations, g_object_unref);
+          g_slist_free_full (excludes, g_object_unref);
         }
 
       /* free the thumbnailer list */
@@ -224,8 +208,7 @@ main (int    argc,
   g_key_file_free (rc);
 
   /* release all providers and free the provider list */
-  g_list_foreach (providers, (GFunc) g_object_unref, NULL);
-  g_list_free (providers);
+  g_list_free_full (providers, g_object_unref);
 
   /* drop the reference on the provider factory */
   g_object_unref (provider_factory);
diff --git a/tumblerd/tumbler-group-scheduler.c b/tumblerd/tumbler-group-scheduler.c
index b1b9c61..e538d25 100644
--- a/tumblerd/tumbler-group-scheduler.c
+++ b/tumblerd/tumbler-group-scheduler.c
@@ -178,11 +178,8 @@ tumbler_group_scheduler_finalize (GObject *object)
   /* destroy both thread pools */
   g_thread_pool_free (scheduler->pool, TRUE, TRUE);
 
-  /* release all pending requests */
-  g_list_foreach (scheduler->requests, (GFunc) tumbler_scheduler_request_free, NULL);
-
-  /* destroy the request list */
-  g_list_free (scheduler->requests);
+  /* release all pending requests and destroy the request list */
+  g_list_free_full (scheduler->requests, tumbler_scheduler_request_free);
 
   /* free the scheduler name */
   g_free (scheduler->name);
@@ -392,8 +389,10 @@ uri_error_new (gint         code,
 
 
 static void
-uri_error_free (UriError *error)
+uri_error_free (gpointer data)
 {
+  UriError *error = data;
+
   g_free (error->message);
   g_free (error->failed_uri);
 
@@ -619,8 +618,7 @@ tumbler_group_scheduler_thread (gpointer data,
     }
 
   /* free all URI errors and the error URI list */
-  g_list_foreach (uri_errors, (GFunc) uri_error_free, NULL);
-  g_list_free (uri_errors);
+  g_list_free_full (uri_errors, uri_error_free);
 
   /* check if we have any successfully processed URIs */
   if (ready_uris != NULL)
@@ -644,8 +642,7 @@ tumbler_group_scheduler_thread (gpointer data,
     }
 
   /* free the ready URIs */
-  g_list_foreach (ready_uris, (GFunc) g_free, NULL);
-  g_list_free (ready_uris); 
+  g_list_free_full (ready_uris, g_free);
 
   /* notify others that we're finished processing the request */
   tumbler_group_scheduler_finish_request (scheduler, request);
diff --git a/tumblerd/tumbler-lifo-scheduler.c b/tumblerd/tumbler-lifo-scheduler.c
index 35d1be3..e856473 100644
--- a/tumblerd/tumbler-lifo-scheduler.c
+++ b/tumblerd/tumbler-lifo-scheduler.c
@@ -158,11 +158,8 @@ tumbler_lifo_scheduler_finalize (GObject *object)
   /* destroy both thread pools */
   g_thread_pool_free (scheduler->pool, TRUE, TRUE);
 
-  /* release all pending requests */
-  g_list_foreach (scheduler->requests, (GFunc) tumbler_scheduler_request_free, NULL);
-
-  /* destroy the request list */
-  g_list_free (scheduler->requests);
+  /* release all pending requests and destroy the request list */
+  g_list_free_full (scheduler->requests, tumbler_scheduler_request_free);
 
   /* free the scheduler name */
   g_free (scheduler->name);
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index 49763fa..a7d7982 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -248,8 +248,7 @@ tumbler_manager_finalize (GObject *object)
   g_list_free (manager->monitors);
 
   /* release all directory objects */
-  g_list_foreach (manager->directories, (GFunc) g_object_unref, NULL);
-  g_list_free (manager->directories);
+  g_list_free_full (manager->directories, g_object_unref);
 
   /* destroy the hash tables */
   g_hash_table_unref (manager->thumbnailers);
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index 317c853..4e5fad1 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -221,11 +221,8 @@ static void tumbler_registry_list_free (gpointer data)
 {
   GList **list = data;
 
-  /* make sure to release all thumbnailers */
-  g_list_foreach (*list, (GFunc) g_object_unref, NULL);
-
-  /* free the list and the pointer to it */
-  g_list_free (*list);
+  /* free the list, its contents and the pointer to it */
+  g_list_free_full (*list, g_object_unref);
   g_free (list);
 }
 
@@ -502,8 +499,7 @@ tumbler_registry_get_thumbnailer_array (TumblerRegistry    *registry,
       g_free (hash_key);
       g_free (scheme);
       g_object_unref (gfile);
-      g_list_foreach (list, (GFunc) g_object_unref, NULL);
-      g_list_free (list);
+      g_list_free_full (list, g_object_unref);
     }
 
   /* NULL-terminate the array */
@@ -568,7 +564,7 @@ tumbler_registry_update_supported (TumblerRegistry *registry)
                                         (GDestroyNotify) free_pair);
 
   /* prepare array */
-  used_strings = g_ptr_array_sized_new (150);
+  used_strings = g_ptr_array_new_full (150, g_free);
 
   /* iterate over all of them */
   for (lp = thumbnailers; lp != NULL; lp = lp->next)
@@ -623,8 +619,7 @@ tumbler_registry_update_supported (TumblerRegistry *registry)
     }
 
   /* relase the thumbnailer list */
-  g_list_foreach (thumbnailers, (GFunc) g_object_unref, NULL);
-  g_list_free (thumbnailers);
+  g_list_free_full (thumbnailers, g_object_unref);
 
   n = g_hash_table_size (unique_pairs);
 
@@ -656,7 +651,6 @@ tumbler_registry_update_supported (TumblerRegistry *registry)
   g_hash_table_unref (unique_pairs);
 
   /* free all strings we used but haven't freed yet */
-  g_ptr_array_foreach (used_strings, (GFunc) g_free, NULL);
   g_ptr_array_free (used_strings, TRUE);
 }
 
diff --git a/tumblerd/tumbler-scheduler.c b/tumblerd/tumbler-scheduler.c
index ac7fc31..d15dfa1 100644
--- a/tumblerd/tumbler-scheduler.c
+++ b/tumblerd/tumbler-scheduler.c
@@ -56,8 +56,6 @@ enum
   IOPRIO_CLASS_IDLE,
 };
 
-
-
 enum 
 {
   IOPRIO_WHO_PROCESS = 1,
@@ -75,39 +73,18 @@ enum
   LAST_SIGNAL,
 };
 
-
-static void tumbler_scheduler_class_init (TumblerSchedulerIface *klass);
 static guint tumbler_scheduler_signals[LAST_SIGNAL];
 
-GType
-tumbler_scheduler_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-  
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      GType g_define_type_id =
-        g_type_register_static_simple (G_TYPE_INTERFACE,
-                                       "TumblerScheduler",
-                                       sizeof (TumblerSchedulerIface),
-                                       (GClassInitFunc) tumbler_scheduler_class_init,
-                                       0,
-                                       NULL,
-                                       0);
-
-      g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_OBJECT);
-
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
+
+
+G_DEFINE_INTERFACE (TumblerScheduler, tumbler_scheduler, G_TYPE_OBJECT)
+
 
 
 static void
-tumbler_scheduler_class_init (TumblerSchedulerIface *klass)
+tumbler_scheduler_default_init (TumblerSchedulerIface *klass)
 {
-  g_object_interface_install_property (klass, 
+  g_object_interface_install_property (klass,
                                        g_param_spec_string ("name",
                                                             "name",
                                                             "name",
@@ -292,9 +269,10 @@ tumbler_scheduler_request_new (TumblerFileInfo    **infos,
 
 
 void
-tumbler_scheduler_request_free (TumblerSchedulerRequest *request)
+tumbler_scheduler_request_free (gpointer data)
 {
-  gint n;
+  TumblerSchedulerRequest *request = data;
+  gint                     n;
 
   g_return_if_fail (request != NULL);
 
diff --git a/tumblerd/tumbler-scheduler.h b/tumblerd/tumbler-scheduler.h
index 3ea812f..6f50a00 100644
--- a/tumblerd/tumbler-scheduler.h
+++ b/tumblerd/tumbler-scheduler.h
@@ -35,7 +35,8 @@ typedef struct _TumblerSchedulerRequest TumblerSchedulerRequest;
 #define TUMBLER_SCHEDULER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TUMBLER_TYPE_SCHEDULER, TumblerSchedulerIface))
 
 typedef struct _TumblerScheduler      TumblerScheduler;
-typedef struct _TumblerSchedulerIface TumblerSchedulerIface;
+typedef struct _TumblerSchedulerIface TumblerSchedulerInterface;
+typedef TumblerSchedulerInterface     TumblerSchedulerIface;
 
 struct _TumblerSchedulerIface
 {
@@ -82,7 +83,7 @@ TumblerSchedulerRequest *tumbler_scheduler_request_new           (TumblerFileInf
                                                                   TumblerThumbnailer     **thumbnailers,
                                                                   guint                    length,
                                                                   const gchar             *origin);
-void                     tumbler_scheduler_request_free          (TumblerSchedulerRequest *request);
+void                     tumbler_scheduler_request_free          (gpointer                 data);
 gint                     tumbler_scheduler_request_compare       (gconstpointer            a,
                                                                   gconstpointer            b,
                                                                   gpointer                 user_data);
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 017967c..108f0eb 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -928,10 +928,7 @@ tumbler_service_get_flavors_cb  (TumblerExportedService  *skeleton,
       tumbler_exported_service_complete_get_flavors (skeleton, invocation, flavor_strings);
       
       g_free (flavor_strings);
-
-      g_list_foreach (flavors, (GFunc) g_object_unref, NULL);
-      g_list_free (flavors);
-
+      g_list_free_full (flavors, g_object_unref);
       g_object_unref (cache);
     }
   else