[gentoo-commits] gentoo-x86 commit in xfce-base/exo/files: exo-0.3.102-eject.patch exo-0.3.101-iocharset.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/08/23 17:43:26

  Added:                exo-0.3.102-eject.patch exo-0.3.101-iocharset.patch
  Log:
  Move from xfce-extra category.
  (Portage version: 2.2_rc39/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.1                  xfce-base/exo/files/exo-0.3.102-eject.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/exo/files/exo-0.3.102-eject.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/exo/files/exo-0.3.102-eject.patch?rev=1.1&content-type=text/plain

Index: exo-0.3.102-eject.patch
===================================================================
diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
index 791a536..4084719 100644
--- a/exo-mount/exo-mount-hal.c
+++ b/exo-mount/exo-mount-hal.c
@@ -145,6 +145,42 @@ exo_mount_hal_propagate_error (GError   **error,
 }
 
 
+static gboolean
+string_in_list(gchar * const *haystack, const gchar *needle)
+{
+  gint n;
+
+  if (!haystack)
+      return FALSE;
+
+  for (n=0; haystack[n]; ++n) {
+      if (!strcmp (haystack[n], needle))
+          return TRUE;
+  }
+  return FALSE;
+}
+
+
+static gboolean
+device_has_interface(const gchar *udi, const gchar *iface,
+        DBusError *derror)
+{
+  gboolean result;
+  gchar **interfaces;
+
+  /* determine the info.interfaces property of the device */
+  interfaces = libhal_device_get_property_strlist (hal_context, udi,
+          "info.interfaces", derror);
+
+  /* check for the interface we need */
+  result = string_in_list(interfaces, iface);
+  libhal_free_string_array(interfaces);
+
+  return result;
+}
+
+
+
 
 /**
  * exo_mount_hal_device_from_udi:
@@ -158,18 +194,15 @@ exo_mount_hal_propagate_error (GError   **error,
  *               or %NULL in case of an error.
  **/
 ExoMountHalDevice*
-exo_mount_hal_device_from_udi (const gchar *udi,
+exo_mount_hal_device_from_udi (const gchar *in_udi,
                                GError     **error)
 {
   ExoMountHalDevice *device = NULL;
   DBusError          derror;
-  gchar            **interfaces;
-  gchar            **volume_udis;
-  gchar             *volume_udi = NULL;
   gint               n_volume_udis;
-  gint               n;
+  gchar             *udi;
 
-  g_return_val_if_fail (udi != NULL, NULL);
+  g_return_val_if_fail (in_udi != NULL, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
   /* make sure the HAL support is initialized */
@@ -179,55 +212,60 @@ exo_mount_hal_device_from_udi (const gchar *udi,
   /* initialize D-Bus error */
   dbus_error_init (&derror);
 
-again:
-  /* determine the info.interfaces property of the device */
-  interfaces = libhal_device_get_property_strlist (hal_context, udi, "info.interfaces", &derror);
-  if (G_UNLIKELY (interfaces == NULL))
+  udi = g_strdup (in_udi);
+  /* at this point, we own udi */
+
+  /* maybe we have a mountable device here */
+  while(G_UNLIKELY (!device_has_interface (udi,
+                  "org.freedesktop.Hal.Device.Volume", &derror)))
     {
-      /* reset D-Bus error */
-      dbus_error_free (&derror);
+      gchar **volume_udis;
 
-      /* release any previous volume UDI */
-      g_free (volume_udi);
-      volume_udi = NULL;
+      /* maybe there was a D-Bus error? gotta check */
+      if (G_UNLIKELY (dbus_error_is_set (&derror)))
+        {
+          exo_mount_hal_propagate_error (error, &derror);
+          g_free (udi);
+          return NULL;
+        }
+
+      /* maybe we have a volume whose parent is identified by the udi */
+      volume_udis = libhal_manager_find_device_string_match (hal_context,
+              "info.parent", udi, &n_volume_udis, &derror);
 
-      /* ok, but maybe we have a volume whose parent is identified by the udi */
-      volume_udis = libhal_manager_find_device_string_match (hal_context, "info.parent", udi, &n_volume_udis, &derror);
       if (G_UNLIKELY (volume_udis == NULL))
         {
-err0:     exo_mount_hal_propagate_error (error, &derror);
-          goto out;
+          exo_mount_hal_propagate_error (error, &derror);
+          g_free (udi);
+          return NULL;
         }
       else if (G_UNLIKELY (n_volume_udis < 1))
         {
-          /* no match, we cannot handle that device */
           libhal_free_string_array (volume_udis);
-          goto err1;
+          dbus_error_free (&derror);
+          /* definitely not a device that we're able to
+           * mount, eject or unmount */
+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                  _("Given device \"%s\" is not a volume or drive"), udi);
+          g_free (udi);
+          return NULL;
         }
 
+      g_free (udi);
+
       /* use the first volume UDI... */
-      volume_udi = g_strdup (volume_udis[0]);
+      udi = g_strdup (volume_udis[0]);
       libhal_free_string_array (volume_udis);
-
       /* ..and try again using that UDI */
-      udi = (const gchar *) volume_udi;
-      goto again;
     }
 
-  /* verify that we have a mountable device here */
-  for (n = 0; interfaces[n] != NULL; ++n)
-    if (strcmp (interfaces[n], "org.freedesktop.Hal.Device.Volume") == 0)
-      break;
-  if (G_UNLIKELY (interfaces[n] == NULL))
-    {
-      /* definitely not a device that we're able to mount, eject or unmount */
-err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), udi);
-      goto out;
-    }
+  /* at this point, udi contains the UDI of something
+   * that implements Hal.Device.Volume.
+   * udi is the only resource that we hold here. */
 
   /* setup the device struct */
   device = g_new0 (ExoMountHalDevice, 1);
-  device->udi = g_strdup (udi);
+  device->udi = udi;
 
   /* check if we have a volume here */
   device->volume = libhal_volume_from_udi (hal_context, udi);
@@ -269,8 +307,8 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
   if (G_UNLIKELY (device->file == NULL || device->name == NULL))
     {
       exo_mount_hal_device_free (device);
-      device = NULL;
-      goto err0;
+      exo_mount_hal_propagate_error(error, &derror);
+      return NULL;
     }
 
   /* check if we failed */
@@ -282,11 +320,7 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
       device = NULL;
     }
 
-out:
-  /* cleanup */
-  libhal_free_string_array (interfaces);
-  g_free (volume_udi);
-
+  dbus_error_free (&derror);
   return device;
 }
 
@@ -313,7 +347,7 @@ exo_mount_hal_device_from_file (const gchar *file,
   gchar            **interfaces;
   gchar            **udis;
   gint               n_udis;
-  gint               n, m;
+  gint               n;
 
   g_return_val_if_fail (g_path_is_absolute (file), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -347,12 +381,7 @@ exo_mount_hal_device_from_file (const gchar *file,
         continue;
 
       /* check if we have a mountable device here */
-      for (m = 0; interfaces[m] != NULL; ++m)
-        if (strcmp (interfaces[m], "org.freedesktop.Hal.Device.Volume") == 0)
-          break;
-
-      /* check if it's a usable device */
-      if (interfaces[m] != NULL)
+      if (string_in_list (interfaces, "org.freedesktop.Hal.Device.Volume"))
         {
           libhal_free_string_array (interfaces);
           break;



1.1                  xfce-base/exo/files/exo-0.3.101-iocharset.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/exo/files/exo-0.3.101-iocharset.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/exo/files/exo-0.3.101-iocharset.patch?rev=1.1&content-type=text/plain

Index: exo-0.3.101-iocharset.patch
===================================================================
diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
index 791a536..4b130c3 100644
--- a/exo-mount/exo-mount-hal.c
+++ b/exo-mount/exo-mount-hal.c
@@ -34,6 +34,8 @@
 #include <unistd.h>
 #endif
 
+#include <langinfo.h>
+
 #include <libhal-storage.h>
 
 #include <exo-hal/exo-hal.h>
@@ -616,6 +618,30 @@ oom:  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
 
 
 /**
+ * exo_mount_hal_iocharset:
+ *
+ * Determines the preferred iocharset for filesystems
+ * that support it.
+ *
+ * Return value: iocharset string or %NULL if none.
+ **/
+static const gchar*
+exo_mount_hal_iocharset ()
+{
+  const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
+  if (cs != NULL)
+    return cs;
+
+  const char* codeset = nl_langinfo (CODESET);
+  if (codeset && !strcmp (codeset, "UTF-8"))
+    return "utf8";
+
+  return NULL;
+}
+
+
+
+/**
  * exo_mount_hal_device_mount:
  * @device : an #ExoMountHalDevice.
  * @error  : return location for errors or %NULL.
@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
               /* however this one is FreeBSD specific */
               options[n++] = g_strdup ("longnames");
             }
+          else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
+            {
+              const gchar* iocharset = exo_mount_hal_iocharset();
+              if (iocharset != NULL)
+                options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
+            }
         }
     }
 
diff --git a/exo-mount/main.c b/exo-mount/main.c
index 80eae1d..f442019 100644
--- a/exo-mount/main.c
+++ b/exo-mount/main.c
@@ -39,6 +39,8 @@
 #include <string.h>
 #endif
 
+#include <locale.h>
+
 #include <glib/gstdio.h>
 
 #include <exo-hal/exo-hal.h>
@@ -97,6 +99,8 @@ main (int argc, char **argv)
   /* initialize the i18n support */
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
 
+  setlocale(LC_CTYPE, "");
+
   /* initialize GTK+ */
   if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
     {