diff options
| author | Julien Puydt <jpuydt@debian.org> | 2022-08-15 22:37:17 +0200 |
|---|---|---|
| committer | Julien Puydt <jpuydt@debian.org> | 2022-08-15 22:37:17 +0200 |
| commit | 1700c8156807a1003e36113669dfe659c2e47c16 (patch) | |
| tree | 07150d70c9e5cd71db106864d7b982f9ce20f65d | |
| parent | 017104a4a8adab2f844a84cbf4f480cc9491d5e1 (diff) | |
New upstream version 1.2.4
| -rw-r--r-- | src/protocol/oBus_address.ml | 6 | ||||
| -rw-r--r-- | tools/tools_util/utils.ml | 2 | ||||
| -rw-r--r-- | tools/transformers/obus_gen_client.ml | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/protocol/oBus_address.ml b/src/protocol/oBus_address.ml index 4a9296f..4d9f526 100644 --- a/src/protocol/oBus_address.ml +++ b/src/protocol/oBus_address.ml @@ -108,10 +108,8 @@ let xdg_fallback_session () = Lwt.catch (fun () -> let sock_path = Filename.concat path "bus" in let%lwt stat = Lwt_unix.stat sock_path in - let%lwt login = Lwt_unix.getlogin () in - let%lwt user = Lwt_unix.getpwnam login in - if stat.st_uid = user.pw_uid - && stat.st_kind = Lwt_unix.S_SOCK + let uid = Unix.getuid () in + if stat.st_uid = uid && stat.st_kind = Lwt_unix.S_SOCK then Lwt.return_some [{ name = "unix"; args = [("path", sock_path)] }] else Lwt.return_none) (fun _ -> Lwt.return_none) diff --git a/tools/tools_util/utils.ml b/tools/tools_util/utils.ml index 0025fc4..96b02fc 100644 --- a/tools/tools_util/utils.ml +++ b/tools/tools_util/utils.ml @@ -130,7 +130,7 @@ let convertor_recv top typ = (fun top t -> match t with | "int32" | "uint32" -> Some "Int32.to_int" - | "object_path" -> Some(paren top ("OBus_proxy.make (OBus_context.sender context)")) + | "object_path" -> Some(paren top ("(fun x -> OBus_proxy.make ~peer:(OBus_context.sender context) ~path:x)")) | name when List.mem name dbus_symbols -> None | name -> Some("make_" ^ name)) top typ diff --git a/tools/transformers/obus_gen_client.ml b/tools/transformers/obus_gen_client.ml index d00f013..f63ad54 100644 --- a/tools/transformers/obus_gen_client.ml +++ b/tools/transformers/obus_gen_client.ml @@ -141,7 +141,7 @@ let print_impl oc name members symbols annotations = output_string oc " "; print_names oc names; output_string oc ")\n"; - fprintf oc " (OBus_signal.connect s_%s proxy)\n" name + fprintf oc " (OBus_signal.make s_%s proxy)\n" name end | Property(name, typ, access, annotations) -> fprintf oc "\n let %s proxy =\n" (OBus_name.ocaml_lid name); |