gvfs: Use the new common logging macrosv0.6.79

4 files changed, 108 insertions, 124 deletions

diff --git a/gvfs/Makefile b/gvfs/Makefile
index d2b9584..0bbd4e9 100644
--- a/gvfs/Makefile
+++ b/gvfs/Makefile
@@ -7,12 +7,13 @@ INSTALL_DATA = ${INSTALL} -m 644
 CC = gcc
 CFLAGS = -I. -I/usr/include \
 	 -Wall -Wtype-limits -fPIC -O2 -g -ggdb \
-	 -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+	 -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
+	 -D__DEBUG_INTERNALx -D_LOG_DOMAIN="gvfs"
 
 
 LIB_SUFFIX = `if test \`uname -m\` = x86_64 -o \`uname -m\` = ppc64; then echo 64; fi`
 
-VFS_COMMON_OBJECTS =
+VFS_COMMON_OBJECTS = logutils.o
 
 VFS_OBJECTS = gvfs.o
 
@@ -27,6 +28,8 @@ all shared static: libgvfs_plugin.so
 libgvfs_plugin.so: $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS)
 	$(CC) -shared -o libgvfs_plugin.so $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS) $(CFLAGS) `pkg-config glib-2.0 gio-2.0 --libs`
 
+logutils.o: logutils.h logutils.c
+
 install::
 	$(INSTALL) ./libgvfs_plugin.so $(DESTDIR)/lib$(LIB_SUFFIX)/tuxcmd/
 
diff --git a/gvfs/gvfs.c b/gvfs/gvfs.c
index 69550b6..fc29800 100644
--- a/gvfs/gvfs.c
+++ b/gvfs/gvfs.c
@@ -1,5 +1,5 @@
 /* GVFS plugin for Tux Commander
- * Copyright (C) 2008-2009 Tomas Bzatek <tbzatek@users.sourceforge.net>
+ * Copyright (C) 2008-2024 Tomas Bzatek <tbzatek@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,11 +25,11 @@
 #include <gio/gio.h>
 
 #include "tuxcmd-vfs.h"
+#include "logutils.h"
 
 
-
-#define VERSION "0.2.1"
-#define BUILD_DATE "2009-12-09"
+#define VERSION "0.2.2"
+#define BUILD_DATE "2024-01-19"
 #define DEFAULT_BLOCK_SIZE 0x10000   /* 64kB */
 
 #define CONST_DEFAULT_QUERY_INFO_ATTRIBUTES     G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK "," \
@@ -89,7 +89,7 @@ ask_password_cb (GMountOperation  *op,
   /*  First pass, look if we have a password to supply  */
   if (globs->mount_try == 1) {
     if ((flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED) && globs->ftp_anonymous) {
-      printf ("(WW) ask_password_cb: mount_try = %d, trying FTP anonymous login...\n", globs->mount_try);
+      log_info ("ask_password_cb: mount_try = %d, trying FTP anonymous login...", globs->mount_try);
       g_mount_operation_set_anonymous (op, TRUE);
       g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
       return;
@@ -97,12 +97,12 @@ ask_password_cb (GMountOperation  *op,
   }
 
   /*  Ask user for password  */
-  g_print ("(WW) ask_password_cb: mount_try = %d, message = '%s'\n", globs->mount_try, message);
+  log_info ("ask_password_cb: mount_try = %d, message = '%s'", globs->mount_try, message);
 
   /*  Handle abort message from certain backends properly  */
   /*   - e.g. SMB backends use this to mask multiple auth callbacks from smbclient  */
   if (default_user && strcmp (default_user, "ABORT") == 0) {
-    g_print ("(WW) default_user == \"ABORT\", aborting\n");
+    log_info ("ask_password_cb: default_user == \"ABORT\", aborting");
     g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
     return;
   }
@@ -114,11 +114,11 @@ ask_password_cb (GMountOperation  *op,
   password_save = VFS_PASSWORD_SAVE_NEVER;
 
   if (globs->callback_ask_password) {
-    fprintf (stderr, "  (II) Spawning callback_ask_password (%p)...\n", globs->callback_ask_password);
+    log_debug ("ask_password_cb: spawning callback_ask_password (%p)...", globs->callback_ask_password);
     result = globs->callback_ask_password (message, default_user, default_domain, NULL, flags,
                                            &username, &password, &anonymous, &domain, &password_save,
                                            globs->callback_data);
-    fprintf (stderr, "    (II) Received result = %d\n", result);
+    log_debug ("ask_password_cb: received result %d", result);
     if (result) {
       if (flags & G_ASK_PASSWORD_NEED_USERNAME)
         g_mount_operation_set_username (op, username);
@@ -148,26 +148,24 @@ ask_question_cb (GMountOperation *op,
                  gpointer         user_data)
 {
   struct TVFSGlobs *globs;
-  int len;
+  int len = 0;
   int choice;
 
   globs = (struct TVFSGlobs*) user_data;
   g_assert (globs != NULL);
 
-  g_print ("(WW) ask_question_cb: message = '%s'\n", message);
-
-  len = 0;
+  log_info ("ask_question_cb: message = '%s'", message);
   while (choices[len] != NULL) {
-    g_print ("(WW) ask_question_cb: choice[%d] = '%s'\n", len, choices[len]);
+    log_info ("ask_question_cb: choice[%d] = '%s'", len, choices[len]);
     len++;
   }
 
   choice = -1;
   if (globs->callback_ask_question) {
-    fprintf (stderr, "  (II) Spawning callback_ask_question (%p)...\n", globs->callback_ask_question);
+    log_debug ("ask_question_cb: spawning callback_ask_question (%p)...", globs->callback_ask_question);
     /*  At this moment, only SFTP uses ask_question and the second button is cancellation  */
     globs->callback_ask_question (message, choices, &choice, 1, globs->callback_data);
-    fprintf (stderr, "    (II) Received choice = %d\n", choice);
+    log_info ("ask_question_cb: received choice %d", choice);
 
     if (choice >= 0) {
       g_mount_operation_set_choice (op, choice);
@@ -197,9 +195,9 @@ mount_done_cb (GObject      *object,
   succeeded = g_file_mount_enclosing_volume_finish (G_FILE (object), res, &globs->mount_error);
 
   if (! succeeded)
-    g_print ("(EE) Error mounting location: %s\n", globs->mount_error->message);
+    log_error ("Error mounting location: %s", globs->mount_error->message)
   else
-    g_print ("(II) Mount successful.\n");
+    log_notice ("Mount successful.");
 
   g_main_loop_quit (globs->mount_main_loop);
 }
@@ -210,7 +208,7 @@ vfs_handle_mount (struct TVFSGlobs *globs, GFile *file)
 {
   GMountOperation *op;
 
-  g_print ("(II) Mounting location...\n");
+  log_debug ("Mounting location...");
 
   op = g_mount_operation_new ();
   g_signal_connect (op, "ask-password", (GCallback)ask_password_cb, globs);
@@ -236,24 +234,12 @@ VFSNew (TVFSLogFunc log_func)
 {
   struct TVFSGlobs * globs;
 
-  globs = (struct TVFSGlobs *) malloc (sizeof (struct TVFSGlobs));
-  memset (globs, 0, sizeof (struct TVFSGlobs));
-
-  globs->log_func = log_func;
-  globs->log_func ("GVFS plugin: VFSInit");
+  log_init ();
 
-  globs->file = NULL;
-  globs->enumerator = NULL;
-  globs->enumerated_file = NULL;
-  globs->cancellable = NULL;
+  globs = g_malloc0 (sizeof (struct TVFSGlobs));
 
-  globs->break_get_dir_size = FALSE;
   globs->block_size = DEFAULT_BLOCK_SIZE;
-
-  globs->callback_data = NULL;
-  globs->callback_ask_question = NULL;
-  globs->callback_ask_password = NULL;
-  globs->callback_progress = NULL;
+  globs->log_func = log_func;
 
   return globs;
 }
@@ -276,7 +262,6 @@ VFSSetCallbacks (struct TVFSGlobs        *globs,
 void
 VFSFree (struct TVFSGlobs *globs)
 {
-  globs->log_func ("GVFS plugin: VFSDestroy");
   g_free (globs);
 }
 
@@ -296,7 +281,7 @@ VFSGetInfo ()
   module_info->ID = g_strdup ("gvfs_plugin");
   module_info->Name = g_strdup ("GVFS plugin");
   module_info->About = g_strdup_printf ("version %s, build date: %s", VERSION, BUILD_DATE);
-  module_info->Copyright = g_strdup ("Copyright (C) 2008-2009 Tomáš Bžatek");
+  module_info->Copyright = g_strdup ("Copyright (C) 2008-2024 Tomáš Bžatek");
 
   return module_info;
 }
@@ -327,7 +312,7 @@ VFSGetNetworkServices ()
   char *s;
 
   gvfs = g_vfs_get_default ();
-  g_print ("(II) GVFS: is_active = %d\n", g_vfs_is_active (gvfs));
+  log_debug ("g_vfs_is_active = %d", g_vfs_is_active (gvfs));
 
   schemes = g_vfs_get_supported_uri_schemes (gvfs);
   for (; *schemes; schemes++) {
@@ -340,7 +325,7 @@ VFSGetNetworkServices ()
       l = g_strdup (*schemes);
   }
 
-  g_print ("(II) GVFS: supported schemes: %s\n", l);
+  log_debug ("Supported schemes: %s", l);
   return l;
 }
 
@@ -360,7 +345,7 @@ VFSOpenURI (struct TVFSGlobs *globs, const char *sURI, GError **error)
     globs->ftp_anonymous = strcasestr (sURI, "ftp://") == sURI;
   }
 
-  g_print ("(II) VFSOpenURI: opening URI '%s'\n", sURI);
+  log_notice ("VFSOpenURI: opening URI '%s'", sURI);
   f = g_file_new_for_commandline_arg (sURI);
 
   while (1) {
@@ -396,7 +381,7 @@ VFSOpenURI (struct TVFSGlobs *globs, const char *sURI, GError **error)
     }
 
     /*  Any other error --> report  */
-    g_print ("(EE) VFSOpenURI: g_file_query_info() error: %s\n", local_error->message);
+    log_error ("VFSOpenURI: g_file_query_info() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     g_object_unref (f);
     return FALSE;
@@ -410,11 +395,9 @@ VFSOpenURI (struct TVFSGlobs *globs, const char *sURI, GError **error)
 gboolean
 VFSClose (struct TVFSGlobs *globs, GError **error)
 {
-  g_print ("(II) VFSClose\n");
+  log_debug ("VFSClose");
 
-  if (globs->file)
-    g_object_unref (globs->file);
-  globs->file = NULL;
+  g_clear_object (&globs->file);
 
   return TRUE;
 }
@@ -454,7 +437,7 @@ VFSGetPath (struct TVFSGlobs *globs)
   char *s;
 
   s = get_absolute_path (globs->file);
-  g_print ("(II) VFSGetPath: '%s'\n", s);
+  log_debug ("VFSGetPath: '%s'", s);
 
   return s;
 }
@@ -489,7 +472,7 @@ VFSGetFileSystemInfo (struct TVFSGlobs *globs, const char *APath, gint64 *FSSize
   error = NULL;
   info = g_file_query_filesystem_info (globs->file, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE "," G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, &error);
   if (error) {
-    g_print ("(EE) VFSGetFileSystemInfo: %s\n", error->message);
+    log_error ("VFSGetFileSystemInfo: %s", error->message);
     g_error_free (error);
   }
   else {
@@ -516,16 +499,16 @@ VFSChangeDir (struct TVFSGlobs *globs, const char *NewPath, GError **error)
   gchar *target_uri;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSChangeDir: globs->file == NULL !\n");
+    log_error ("VFSChangeDir: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
-  g_print ("(II) VFSChangeDir: changing dir to '%s'\n", NewPath);
+  log_notice ("VFSChangeDir: changing dir to '%s'", NewPath);
 
   f = g_file_resolve_relative_path (globs->file, NewPath);
   if (f == NULL) {
-    g_print ("(EE) VFSChangeDir: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSChangeDir: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -543,7 +526,7 @@ VFSChangeDir (struct TVFSGlobs *globs, const char *NewPath, GError **error)
         target_uri = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI));
         g_object_unref (info);
         if (target_uri) {
-          g_print ("(WW) VFSChangeDir: following shortcut, changing URI to '%s'\n", target_uri);
+          log_notice ("VFSChangeDir: following the link, changing URI to '%s'", target_uri);
           g_object_unref (f);
           f = g_file_new_for_uri (target_uri);
           g_free (target_uri);
@@ -566,7 +549,7 @@ VFSChangeDir (struct TVFSGlobs *globs, const char *NewPath, GError **error)
     }
     /*  Any other errors --> report  */
     if (local_error) {
-      g_print ("(EE) VFSChangeDir: g_file_enumerate_children() error: %s\n", local_error->message);
+      log_error ("VFSChangeDir: g_file_enumerate_children() error: %s", local_error->message);
       g_propagate_error (error, local_error);
       g_object_unref (f);
       return FALSE;
@@ -621,9 +604,6 @@ g_file_info_to_TVFSItem (GFileInfo *info, GFile *reference_file, gboolean follow
   Item->iGID = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_GID);
   Item->inode_no = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_UNIX_INODE);
 
-//  g_print ("(II) g_file_info_to_TVFSItem: type = %d\n", g_file_info_get_file_type (info));
-//  g_print ("(II) g_file_info_to_TVFSItem: UNIX_MODE = %d\n", Item->iMode);
-
   Item->IsLink = g_file_info_get_is_symlink (info);
   if (Item->IsLink && follow_symlinks) {
     error = NULL;
@@ -631,7 +611,7 @@ g_file_info_to_TVFSItem (GFileInfo *info, GFile *reference_file, gboolean follow
                                       G_FILE_QUERY_INFO_NONE, NULL, &error);
 
     if (error) {
-      g_print ("(EE) g_file_info_to_TVFSItem: g_file_query_info() error: %s\n", error->message);
+      log_error ("g_file_info_to_TVFSItem: g_file_query_info() error: %s", error->message);
       g_error_free (error);
     }
   }
@@ -680,12 +660,12 @@ VFSListNext (struct TVFSGlobs *globs, GError **error)
   struct TVFSItem *Item;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSListNext: globs->file == NULL !\n");
+    log_error ("VFSListNext: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return NULL;
   }
   if (globs->enumerator == NULL) {
-    g_print ("(EE) VFSListNext: globs->enumerator == NULL !\n");
+    log_error ("VFSListNext: globs->enumerator == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->enumerator == NULL");
     return NULL;
   }
@@ -693,7 +673,7 @@ VFSListNext (struct TVFSGlobs *globs, GError **error)
   local_error = NULL;
   info = g_file_enumerator_next_file (globs->enumerator, NULL, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSListNext: g_file_enumerator_next_file() error: %s\n", local_error->message);
+    log_error ("VFSListNext: g_file_enumerator_next_file() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     return FALSE;
   }
@@ -717,13 +697,13 @@ VFSListFirst (struct TVFSGlobs *globs, const char *sDir, gboolean FollowSymlinks
 
   list_file = g_file_resolve_relative_path (globs->file, sDir);
   if (! list_file) {
-    g_print ("(EE) VFSListFirst: list_file == NULL !\n");
+    log_error ("VFSListFirst: list_file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return NULL;
   }
 
   if (globs->enumerator == NULL || ! g_file_equal (globs->file, list_file)) {
-    g_print ("(WW) VFSListFirst: resetting enumerator\n");
+    log_debug ("VFSListFirst: resetting the enumerator");
     if (globs->enumerator) {
       g_file_enumerator_close (globs->enumerator, NULL, NULL);
       g_object_unref (globs->enumerator);
@@ -735,7 +715,7 @@ VFSListFirst (struct TVFSGlobs *globs, const char *sDir, gboolean FollowSymlinks
     globs->enumerator = g_file_enumerate_children (list_file, CONST_DEFAULT_QUERY_INFO_ATTRIBUTES,
                                                    G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &local_error);
     if (local_error) {
-      g_print ("(EE) VFSListFirst: g_file_enumerate_children() error: %s\n", local_error->message);
+      log_error ("VFSListFirst: g_file_enumerate_children() error: %s", local_error->message);
       g_propagate_error (error, local_error);
       g_object_unref (list_file);
       return NULL;
@@ -756,11 +736,11 @@ VFSListClose (struct TVFSGlobs *globs, GError **error)
   GError *local_error;
 
   if (globs->enumerator == NULL) {
-    g_print ("(EE) VFSListClose: globs->enumerator == NULL !\n");
+    log_error ("VFSListClose: globs->enumerator == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->enumerator == NULL");
     return FALSE;
   }
-  g_print ("(II) VFSListClose\n");
+  log_debug ("VFSListClose");
 
   local_error = NULL;
   g_file_enumerator_close (globs->enumerator, NULL, &local_error);
@@ -769,7 +749,7 @@ VFSListClose (struct TVFSGlobs *globs, GError **error)
   g_object_unref (globs->enumerated_file);
   globs->enumerated_file = NULL;
   if (local_error) {
-    g_print ("(EE) VFSListClose: g_file_enumerator_close() error: %s\n", local_error->message);
+    log_error ("VFSListClose: g_file_enumerator_close() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     return FALSE;
   }
@@ -788,14 +768,14 @@ VFSFileInfo (struct TVFSGlobs *globs, const char *AFileName, gboolean FollowSyml
   struct TVFSItem *Item;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSFileInfo: globs->file == NULL !\n");
+    log_error ("VFSFileInfo: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return NULL;
   }
 
   f = g_file_resolve_relative_path (globs->file, AFileName);
   if (f == NULL) {
-    g_print ("(EE) VFSMkDir: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSMkDir: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return NULL;
   }
@@ -804,7 +784,7 @@ VFSFileInfo (struct TVFSGlobs *globs, const char *AFileName, gboolean FollowSyml
   info = g_file_query_info (f, CONST_DEFAULT_QUERY_INFO_ATTRIBUTES,
                             G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSFileInfo: g_file_query_info() error: %s\n", local_error->message);
+    log_error ("VFSFileInfo: g_file_query_info() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     g_object_unref (f);
     return NULL;
@@ -824,14 +804,14 @@ VFSMkDir (struct TVFSGlobs *globs, const char *sDirName, GError **error)
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSMkDir: globs->file == NULL !\n");
+    log_error ("VFSMkDir: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   f = g_file_resolve_relative_path (globs->file, sDirName);
   if (f == NULL) {
-    g_print ("(EE) VFSMkDir: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSMkDir: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -840,7 +820,7 @@ VFSMkDir (struct TVFSGlobs *globs, const char *sDirName, GError **error)
   g_file_make_directory (f, NULL, &local_error);
   g_object_unref (f);
   if (local_error) {
-    g_print ("(EE) VFSMkDir: g_file_make_directory() error: %s\n", local_error->message);
+    log_error ("VFSMkDir: g_file_make_directory() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     return FALSE;
   }
@@ -855,14 +835,14 @@ VFSRemove (struct TVFSGlobs *globs, const char *APath, GError **error)
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSRemove: globs->file == NULL !\n");
+    log_error ("VFSRemove: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   f = g_file_resolve_relative_path (globs->file, APath);
   if (f == NULL) {
-    g_print ("(EE) VFSRemove: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSRemove: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -871,7 +851,7 @@ VFSRemove (struct TVFSGlobs *globs, const char *APath, GError **error)
   g_file_delete (f, NULL, &local_error);
   g_object_unref (f);
   if (local_error) {
-    g_print ("(EE) VFSRemove: g_file_delete() error: %s\n", local_error->message);
+    log_error ("VFSRemove: g_file_delete() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     return FALSE;
   }
@@ -886,29 +866,29 @@ VFSRename (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSRename: globs->file == NULL !\n");
+    log_error ("VFSRename: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   src = g_file_resolve_relative_path (globs->file, sSrcName);
   if (src == NULL) {
-    g_print ("(EE) VFSRename: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSRename: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
 
-  g_print ("VFSRename: '%s' --> '%s'\n", sSrcName, sDstName);
+  log_notice ("VFSRename: '%s' --> '%s'", sSrcName, sDstName);
 
   local_error = NULL;
   g_file_set_display_name (src, sDstName, NULL, &local_error);
   if (local_error) {
-    g_print ("(WW) VFSRename: g_file_set_display_name() failed (\"%s\"), using fallback g_file_move()\n", local_error->message);
+    log_warn ("VFSRename: g_file_set_display_name() failed (\"%s\"), using fallback g_file_move()", local_error->message);
     g_error_free (local_error);
 
     dst = g_file_resolve_relative_path (src, sDstName);
     if (dst == NULL) {
-      g_print ("(EE) VFSRename: g_file_resolve_relative_path() failed.\n");
+      log_error ("VFSRename: g_file_resolve_relative_path() failed.");
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path for target file.");
       g_object_unref (src);
       return FALSE;
@@ -917,7 +897,7 @@ VFSRename (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
     local_error = NULL;
     g_file_move (src, dst, G_FILE_COPY_NO_FALLBACK_FOR_MOVE, NULL, NULL, NULL, &local_error);
     if (local_error) {
-      g_print ("(EE) VFSRename: g_file_move() error: %s\n", local_error->message);
+      log_error ("VFSRename: g_file_move() error: %s", local_error->message);
       g_propagate_error (error, local_error);
       g_object_unref (src);
       g_object_unref (dst);
@@ -938,14 +918,14 @@ VFSMakeSymLink (struct TVFSGlobs *globs, const char *NewFileName, const char *Po
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSMakeSymLink: globs->file == NULL !\n");
+    log_error ("VFSMakeSymLink: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   f = g_file_resolve_relative_path (globs->file, NewFileName);
   if (f == NULL) {
-    g_print ("(EE) VFSMakeSymLink: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSMakeSymLink: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -954,7 +934,7 @@ VFSMakeSymLink (struct TVFSGlobs *globs, const char *NewFileName, const char *Po
   g_file_make_symbolic_link (f, PointTo, NULL, &local_error);
   g_object_unref (f);
   if (local_error) {
-    g_print ("(EE) VFSMakeSymLink: g_file_make_symbolic_link() error: %s\n", local_error->message);
+    log_error ("VFSMakeSymLink: g_file_make_symbolic_link() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     return FALSE;
   }
@@ -969,14 +949,14 @@ VFSChmod (struct TVFSGlobs *globs, const char *FileName, guint32 Mode, GError **
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSChmod: globs->file == NULL !\n");
+    log_error ("VFSChmod: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   f = g_file_resolve_relative_path (globs->file, FileName);
   if (f == NULL) {
-    g_print ("(EE) VFSChmod: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSChmod: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -985,7 +965,7 @@ VFSChmod (struct TVFSGlobs *globs, const char *FileName, guint32 Mode, GError **
   g_file_set_attribute_uint32 (f, G_FILE_ATTRIBUTE_UNIX_MODE, Mode, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
   g_object_unref (f);
   if (local_error) {
-    g_print ("(EE) VFSChmod: g_file_set_attribute_uint32() error: %s\n", local_error->message);
+    log_error ("VFSChmod: g_file_set_attribute_uint32(G_FILE_ATTRIBUTE_UNIX_MODE) error: %s", local_error->message);
     g_propagate_error (error, local_error);
     return FALSE;
   }
@@ -1000,14 +980,14 @@ VFSChown (struct TVFSGlobs *globs, const char *FileName, guint32 UID, guint32 GI
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSChown: globs->file == NULL !\n");
+    log_error ("VFSChown: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   f = g_file_resolve_relative_path (globs->file, FileName);
   if (f == NULL) {
-    g_print ("(EE) VFSChown: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSChown: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -1015,7 +995,7 @@ VFSChown (struct TVFSGlobs *globs, const char *FileName, guint32 UID, guint32 GI
   local_error = NULL;
   g_file_set_attribute_uint32 (f, G_FILE_ATTRIBUTE_UNIX_UID, UID, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSChown: g_file_set_attribute_uint32() error: %s\n", local_error->message);
+    log_error ("VFSChown: g_file_set_attribute_uint32(G_FILE_ATTRIBUTE_UNIX_UID) error: %s", local_error->message);
     g_propagate_error (error, local_error);
     g_object_unref (f);
     return FALSE;
@@ -1023,7 +1003,7 @@ VFSChown (struct TVFSGlobs *globs, const char *FileName, guint32 UID, guint32 GI
   local_error = NULL;
   g_file_set_attribute_uint32 (f, G_FILE_ATTRIBUTE_UNIX_GID, GID, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSChown: g_file_set_attribute_uint32() error: %s\n", local_error->message);
+    log_error ("VFSChown: g_file_set_attribute_uint32(G_FILE_ATTRIBUTE_UNIX_GID) error: %s", local_error->message);
     g_propagate_error (error, local_error);
     g_object_unref (f);
     return FALSE;
@@ -1040,14 +1020,14 @@ VFSChangeTimes (struct TVFSGlobs *globs, const char *APath, guint32 mtime, guint
   GError *local_error;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSChangeTimes: globs->file == NULL !\n");
+    log_error ("VFSChangeTimes: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
   f = g_file_resolve_relative_path (globs->file, APath);
   if (f == NULL) {
-    g_print ("(EE) VFSChangeTimes: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSChangeTimes: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path.");
     return FALSE;
   }
@@ -1057,7 +1037,7 @@ VFSChangeTimes (struct TVFSGlobs *globs, const char *APath, guint32 mtime, guint
   local_error = NULL;
   g_file_set_attribute_uint64 (f, G_FILE_ATTRIBUTE_TIME_MODIFIED, mtime, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSChangeTimes: g_file_set_attribute_uint64() error: %s\n", local_error->message);
+    log_error ("VFSChangeTimes: g_file_set_attribute_uint64(G_FILE_ATTRIBUTE_TIME_MODIFIED) error: %s", local_error->message);
     g_propagate_error (error, local_error);
     g_object_unref (f);
     return FALSE;
@@ -1065,7 +1045,7 @@ VFSChangeTimes (struct TVFSGlobs *globs, const char *APath, guint32 mtime, guint
   local_error = NULL;
   g_file_set_attribute_uint64 (f, G_FILE_ATTRIBUTE_TIME_ACCESS, atime, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSChangeTimes: g_file_set_attribute_uint64() error: %s\n", local_error->message);
+    log_error ("VFSChangeTimes: g_file_set_attribute_uint64(G_FILE_ATTRIBUTE_TIME_ACCESS) error: %s", local_error->message);
     g_error_free (local_error);
     /*  Silently drop the error, atime is not commonly supported on most systems  */
   }
@@ -1092,7 +1072,7 @@ VFSGetDirSize_recurse (struct TVFSGlobs *globs, GFile *file, guint64 *size)
   en = g_file_enumerate_children (file, G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_SIZE,
                                   G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &error);
   if (error) {
-    g_print ("(EE) VFSGetDirSize_recurse: g_file_enumerate_children() error: %s\n", error->message);
+    log_error ("VFSGetDirSize_recurse: g_file_enumerate_children() error: %s", error->message);
     g_error_free (error);
     return;
   }
@@ -1105,7 +1085,7 @@ VFSGetDirSize_recurse (struct TVFSGlobs *globs, GFile *file, guint64 *size)
     if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
       f = g_file_resolve_relative_path (file, g_file_info_get_name (info));
       if (f == NULL) {
-        g_print ("(EE) VFSGetDirSize_recurse: g_file_resolve_relative_path() failed.\n");
+        log_error ("VFSGetDirSize_recurse: g_file_resolve_relative_path() failed.");
         return;
       }
       VFSGetDirSize_recurse (globs, f, size);
@@ -1116,13 +1096,13 @@ VFSGetDirSize_recurse (struct TVFSGlobs *globs, GFile *file, guint64 *size)
     g_object_unref (info);
   }
   if (error) {
-    g_print ("(EE) VFSGetDirSize_recurse: g_file_enumerator_next_file() error: %s\n", error->message);
+    log_error ("VFSGetDirSize_recurse: g_file_enumerator_next_file() error: %s", error->message);
     g_error_free (error);
   }
   g_file_enumerator_close (en, NULL, &error);
   g_object_unref (en);
   if (error) {
-    g_print ("(EE) VFSGetDirSize_recurse: g_file_enumerator_close() error: %s\n", error->message);
+    log_error ("VFSGetDirSize_recurse: g_file_enumerator_close() error: %s", error->message);
     g_error_free (error);
   }
 }
@@ -1136,12 +1116,12 @@ VFSGetDirSize (struct TVFSGlobs *globs, const char *APath)
   if (globs == NULL)
     return 0;
   if (globs->file == NULL) {
-    g_print ("(EE) VFSGetDirSize: globs->file == NULL !\n");
+    log_error ("VFSGetDirSize: globs->file == NULL!");
     return 0;
   }
   f = g_file_resolve_relative_path (globs->file, APath);
   if (f == NULL) {
-    g_print ("(EE) VFSGetDirSize: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSGetDirSize: g_file_resolve_relative_path() failed.");
     return 0;
   }
 
@@ -1157,7 +1137,7 @@ VFSGetDirSize (struct TVFSGlobs *globs, const char *APath)
 void
 VFSBreakGetDirSize (struct TVFSGlobs *globs)
 {
-  g_print ("(WW) VFSBreakGetDirSize: ################################### calling Break\n");
+  log_debug ("VFSBreakGetDirSize: calling Break");
   if (globs)
     globs->break_get_dir_size = TRUE;
 }
@@ -1221,18 +1201,18 @@ VFSIsOnSameFS (struct TVFSGlobs *globs, const char *Path1, const char *Path2, gb
   gboolean res;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSIsOnSameFS: globs->file == NULL !\n");
+    log_error ("VFSIsOnSameFS: globs->file == NULL!");
     return FALSE;
   }
 
   file1 = g_file_resolve_relative_path (globs->file, Path1);
   file2 = g_file_resolve_relative_path (globs->file, Path2);
   if (file1 == NULL) {
-    g_print ("(EE) VFSIsOnSameFS: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSIsOnSameFS: g_file_resolve_relative_path() failed.");
     return FALSE;
   }
   if (file2 == NULL) {
-    g_print ("(EE) VFSIsOnSameFS: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSIsOnSameFS: g_file_resolve_relative_path() failed.");
     return FALSE;
   }
 
@@ -1241,7 +1221,7 @@ VFSIsOnSameFS (struct TVFSGlobs *globs, const char *Path1, const char *Path2, gb
                              FollowSymlinks ? G_FILE_QUERY_INFO_NONE : G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
                              NULL, &error);
   if (error) {
-    g_print ("(EE) VFSIsOnSameFS: g_file_query_info() error: %s\n", error->message);
+    log_error ("VFSIsOnSameFS: g_file_query_info() error: %s", error->message);
     g_error_free (error);
     g_object_unref (file1);
     g_object_unref (file2);
@@ -1251,7 +1231,7 @@ VFSIsOnSameFS (struct TVFSGlobs *globs, const char *Path1, const char *Path2, gb
                              FollowSymlinks ? G_FILE_QUERY_INFO_NONE : G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
                              NULL, &error);
   if (error) {
-    g_print ("(EE) VFSIsOnSameFS: g_file_query_info() error: %s\n", error->message);
+    log_error ("VFSIsOnSameFS: g_file_query_info() error: %s", error->message);
     g_error_free (error);
     g_object_unref (info1);
     g_object_unref (file1);
@@ -1259,8 +1239,9 @@ VFSIsOnSameFS (struct TVFSGlobs *globs, const char *Path1, const char *Path2, gb
     return FALSE;
   }
 
-  g_print ("(II) VFSIsOnSameFS: '%s' vs. '%s'\n", g_file_info_get_attribute_string (info1, G_FILE_ATTRIBUTE_ID_FILESYSTEM),
-                                                  g_file_info_get_attribute_string (info2, G_FILE_ATTRIBUTE_ID_FILESYSTEM));
+  log_debug ("VFSIsOnSameFS: '%s' vs. '%s'",
+             g_file_info_get_attribute_string (info1, G_FILE_ATTRIBUTE_ID_FILESYSTEM),
+             g_file_info_get_attribute_string (info2, G_FILE_ATTRIBUTE_ID_FILESYSTEM));
 
   res = strcmp (g_file_info_get_attribute_string (info1, G_FILE_ATTRIBUTE_ID_FILESYSTEM),
                 g_file_info_get_attribute_string (info2, G_FILE_ATTRIBUTE_ID_FILESYSTEM)) == 0;
@@ -1279,18 +1260,18 @@ VFSTwoSameFiles (struct TVFSGlobs *globs, const char *Path1, const char *Path2,
   gboolean res;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSTwoSameFiles: globs->file == NULL !\n");
+    log_error ("VFSTwoSameFiles: globs->file == NULL!");
     return FALSE;
   }
 
   file1 = g_file_resolve_relative_path (globs->file, Path1);
   file2 = g_file_resolve_relative_path (globs->file, Path2);
   if (file1 == NULL) {
-    g_print ("(EE) VFSTwoSameFiles: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSTwoSameFiles: g_file_resolve_relative_path() failed.");
     return FALSE;
   }
   if (file2 == NULL) {
-    g_print ("(EE) VFSTwoSameFiles: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSTwoSameFiles: g_file_resolve_relative_path() failed.");
     g_object_unref (file1);
     return FALSE;
   }
@@ -1313,8 +1294,6 @@ vfs_copy_progress_callback (goffset current_num_bytes,
 {
   struct TVFSGlobs *globs;
 
-//  g_print ("(II) vfs_copy_progress_callback spawned: current_num_bytes = %lu, total_num_bytes = %lu\n", current_num_bytes, total_num_bytes);
-
   if (! user_data)
     return;
   globs = (struct TVFSGlobs *)user_data;
@@ -1335,21 +1314,21 @@ VFSCopyToLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstN
   gboolean res;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSCopyToLocal: globs->file == NULL !\n");
+    log_error ("VFSCopyToLocal: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
-  g_print ("(II) VFSCopyToLocal: '%s' --> '%s'\n", sSrcName, sDstName);
+  log_notice ("VFSCopyToLocal: Copying '%s' --> '%s'", sSrcName, sDstName);
   src = g_file_resolve_relative_path (globs->file, sSrcName);
   if (src == NULL) {
-    g_print ("(EE) VFSCopyToLocal: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSCopyToLocal: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path for source file.");
     return FALSE;
   }
   dst = g_file_new_for_path (sDstName);
   if (dst == NULL) {
-    g_print ("(EE) VFSCopyToLocal: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSCopyToLocal: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot get target file.");
     return FALSE;
   }
@@ -1359,7 +1338,7 @@ VFSCopyToLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstN
   globs->cancellable = g_cancellable_new ();
   g_file_copy (src, dst, TUXCMD_DEFAULT_COPY_FLAGS, globs->cancellable, vfs_copy_progress_callback, globs, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSCopyToLocal: g_file_copy() error: %s\n", local_error->message);
+    log_error ("VFSCopyToLocal: g_file_copy() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     res = FALSE;
   }
@@ -1379,21 +1358,21 @@ VFSCopyFromLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDs
   gboolean res;
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSCopyFromLocal: globs->file == NULL !\n");
+    log_error ("VFSCopyFromLocal: globs->file == NULL!");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "globs->file == NULL");
     return FALSE;
   }
 
-  g_print ("(II) VFSCopyFromLocal: '%s' --> '%s'\n", sSrcName, sDstName);
+  log_notice ("VFSCopyFromLocal: Copying '%s' --> '%s'", sSrcName, sDstName);
   src = g_file_new_for_path (sSrcName);
   if (src == NULL) {
-    g_print ("(EE) VFSCopyFromLocal: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSCopyFromLocal: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot get source file.");
     return FALSE;
   }
   dst = g_file_resolve_relative_path (globs->file, sDstName);
   if (dst == NULL) {
-    g_print ("(EE) VFSCopyFromLocal: g_file_resolve_relative_path() failed.\n");
+    log_error ("VFSCopyFromLocal: g_file_resolve_relative_path() failed.");
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Cannot resolve relative path for target file.");
     return FALSE;
   }
@@ -1406,7 +1385,7 @@ VFSCopyFromLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDs
   /* FIXME: Appending not supported */
   g_file_copy (src, dst, TUXCMD_DEFAULT_COPY_FLAGS, globs->cancellable, vfs_copy_progress_callback, globs, &local_error);
   if (local_error) {
-    g_print ("(EE) VFSCopyFromLocal: g_file_copy() error: %s\n", local_error->message);
+    log_error ("VFSCopyFromLocal: g_file_copy() error: %s", local_error->message);
     g_propagate_error (error, local_error);
     res = FALSE;
   }
diff --git a/gvfs/logutils.c b/gvfs/logutils.c
new file mode 120000
index 0000000..c1e4fc5
--- /dev/null
+++ b/gvfs/logutils.c
@@ -0,0 +1 @@
+../common/logutils.c
\ No newline at end of file
diff --git a/gvfs/logutils.h b/gvfs/logutils.h
new file mode 120000
index 0000000..ed79bd9
--- /dev/null
+++ b/gvfs/logutils.h
@@ -0,0 +1 @@
+../common/logutils.h
\ No newline at end of file