Julien Puydt pushed to branch upstream at Debian OCaml Maintainers / obus
Commits:
-
1700c815
by Julien Puydt at 2022-08-15T22:37:17+02:00
3 changed files:
Changes:
| ... | ... | @@ -108,10 +108,8 @@ let xdg_fallback_session () = |
| 108 | 108 | Lwt.catch (fun () ->
|
| 109 | 109 | let sock_path = Filename.concat path "bus" in
|
| 110 | 110 | let%lwt stat = Lwt_unix.stat sock_path in
|
| 111 | - let%lwt login = Lwt_unix.getlogin () in
|
|
| 112 | - let%lwt user = Lwt_unix.getpwnam login in
|
|
| 113 | - if stat.st_uid = user.pw_uid
|
|
| 114 | - && stat.st_kind = Lwt_unix.S_SOCK
|
|
| 111 | + let uid = Unix.getuid () in
|
|
| 112 | + if stat.st_uid = uid && stat.st_kind = Lwt_unix.S_SOCK
|
|
| 115 | 113 | then Lwt.return_some [{ name = "unix"; args = [("path", sock_path)] }]
|
| 116 | 114 | else Lwt.return_none)
|
| 117 | 115 | (fun _ -> Lwt.return_none)
|
| ... | ... | @@ -130,7 +130,7 @@ let convertor_recv top typ = |
| 130 | 130 | (fun top t ->
|
| 131 | 131 | match t with
|
| 132 | 132 | | "int32" | "uint32" -> Some "Int32.to_int"
|
| 133 | - | "object_path" -> Some(paren top ("OBus_proxy.make (OBus_context.sender context)"))
|
|
| 133 | + | "object_path" -> Some(paren top ("(fun x -> OBus_proxy.make ~peer:(OBus_context.sender context) ~path:x)"))
|
|
| 134 | 134 | | name when List.mem name dbus_symbols -> None
|
| 135 | 135 | | name -> Some("make_" ^ name))
|
| 136 | 136 | top typ
|
| ... | ... | @@ -141,7 +141,7 @@ let print_impl oc name members symbols annotations = |
| 141 | 141 | output_string oc " ";
|
| 142 | 142 | print_names oc names;
|
| 143 | 143 | output_string oc ")\n";
|
| 144 | - fprintf oc " (OBus_signal.connect s_%s proxy)\n" name
|
|
| 144 | + fprintf oc " (OBus_signal.make s_%s proxy)\n" name
|
|
| 145 | 145 | end
|
| 146 | 146 | | Property(name, typ, access, annotations) ->
|
| 147 | 147 | fprintf oc "\n let %s proxy =\n" (OBus_name.ocaml_lid name);
|