pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch

   1 Submitted By:            Armin K. <krejzi at email dot com>
   2 Date:                    2012-07-06
   3 Initial Package Version: 0.4.6
   4 Upstream Status:         Unknown
   5 Origin:                  Self
   6 Description:             Some build fixes.
   7
   8 --- obex-data-server.orig/src/ods-obex.c        2011-02-10 10:14:42.000000000 +0100
   9 +++ obex-data-server/src/ods-obex.c     2012-07-06 20:10:09.208712553 +0200
  10 @@ -412,7 +412,7 @@
  11                 goto err;
  12         }
  13
  14 -       interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf);
  15 +       interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle);
  16         if (intf_num >= interfaces_num) {
  17                 g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number");
  18                 goto err;
  19 @@ -1928,7 +1928,7 @@
  20         gchar   *uname;
  21         gsize   uname_len;
  22
  23 -       if (action != OBEX_ACTION_SETPERM)
  24 +       if (action != 0x03)
  25                 g_assert (src && dst);
  26
  27         object = OBEX_ObjectNew (obex_context->obex_handle, OBEX_CMD_ACTION);
  28 @@ -1974,7 +1974,7 @@
  29                               OBEX_HDR_ACTION_ID, hv, 1, 0);
  30
  31         /* permissions header */
  32 -       if (action == OBEX_ACTION_SETPERM) {
  33 +       if (action == 0x03) {
  34                 hv.bq4 = perms;
  35                 ret = OBEX_ObjectAddHeader (obex_context->obex_handle, object,
  36                                             OBEX_HDR_PERMISSIONS, hv, 4, 0);
  37 --- obex-data-server.orig/src/ods-session.c     2011-02-10 09:57:31.000000000 +0100
  38 +++ obex-data-server/src/ods-session.c  2012-07-06 20:10:09.208712553 +0200
  39 @@ -1761,7 +1761,7 @@
  40                           DBusGMethodInvocation *context)
  41  {
  42         return ods_session_remote_action (session, remote_source,
  43 -                                         remote_destination, OBEX_ACTION_COPY,
  44 +                                         remote_destination, 0x00,
  45                                           context);
  46  }
  47
  48 @@ -1772,7 +1772,7 @@
  49                           DBusGMethodInvocation *context)
  50  {
  51         return ods_session_remote_action (session, remote_source,
  52 -                                         remote_destination, OBEX_ACTION_MOVE,
  53 +                                         remote_destination, 0x01,
  54                                           context);
  55  }
  56