recipes/gnome/gvfs-1.5.5/imobile-fix.patch

   1 From 1d1ce86222b0a34451b7fc798824e69dd0ebf93b Mon Sep 17 00:00:00 2001
   2 From: Bastien Nocera <hadess@hadess.net>
   3 Date: Mon, 22 Mar 2010 14:31:23 +0000
   4 Subject: Fix compilation with libimobiledevice 1.0.0
   5
   6 AFC_E_INVALID_ARGUMENT was renamed to AFC_E_INVALID_ARG
   7 in http://github.com/MattColyer/libiphone/commit/36048ded8efda588a20b5cf284670a984f7cc650
   8
   9 https://bugzilla.gnome.org/show_bug.cgi?id=613588
  10 ---
  11 diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
  12 index ae41a04..a2ca298 100644
  13 --- a/daemon/gvfsbackendafc.c
  14 +++ b/daemon/gvfsbackendafc.c
  15 @@ -38,6 +38,11 @@
  16  #define G_VFS_BACKEND_AFC_MAX_FILE_SIZE G_MAXINT64
  17  int g_blocksize = 4096; /* assume this is the default block size */
  18
  19 +/* AFC_E_INVALID_ARGUMENT was renamed between 0.9.7 and 1.0.0 */
  20 +#ifndef AFC_E_INVALID_ARG
  21 +#define AFC_E_INVALID_ARG AFC_E_INVALID_ARGUMENT
  22 +#endif /* !AFC_E_INVALID_ARG */
  23 +
  24  struct _GVfsBackendAfc {
  25    GVfsBackend backend;
  26
  27 @@ -62,7 +67,7 @@ static struct afc_error_mapping afc_error_to_g_io_error[] = {
  28        { AFC_E_READ_ERROR               , G_IO_ERROR_NOT_DIRECTORY },
  29        { AFC_E_WRITE_ERROR              , G_IO_ERROR_FAILED },
  30        { AFC_E_UNKNOWN_PACKET_TYPE      , G_IO_ERROR_FAILED },
  31 -      { AFC_E_INVALID_ARGUMENT         , G_IO_ERROR_INVALID_ARGUMENT },
  32 +      { AFC_E_INVALID_ARG              , G_IO_ERROR_INVALID_ARGUMENT },
  33        { AFC_E_OBJECT_NOT_FOUND         , G_IO_ERROR_NOT_FOUND },
  34        { AFC_E_OBJECT_IS_DIR            , G_IO_ERROR_IS_DIRECTORY },
  35        { AFC_E_DIR_NOT_EMPTY            , G_IO_ERROR_NOT_EMPTY },
  36 --
  37 cgit v0.8.3.1