From c8dec345b6e2ad04ffcede24779dd75efd25d599 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 6 Dec 2014 15:47:23 +0100 Subject: [PATCH] Add used DBus attribute and fix UnixMountEntry lower_case_cprefix Fixes bug 741089 --- vala/valausedattr.vala | 2 ++ vapi/gio-unix-2.0.vapi | 13 +------------ vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala | 13 +------------ 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/vala/valausedattr.vala b/vala/valausedattr.vala index 793c5bc23..4a1756284 100644 --- a/vala/valausedattr.vala +++ b/vala/valausedattr.vala @@ -67,6 +67,8 @@ public class Vala.UsedAttr : CodeVisitor { "GtkChild", "name", "internal", "", "GtkTemplate", "ui", "", "GtkCallback", "name", "", + + "DBus", "name", "no_reply", "result", "use_string_marshalling", "value", "signature", "", "GIR", "name", "" diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi index c42649134..c662002df 100644 --- a/vapi/gio-unix-2.0.vapi +++ b/vapi/gio-unix-2.0.vapi @@ -73,34 +73,23 @@ namespace GLib { public bool close_fd { get; set; } public int fd { get; construct; } } - [CCode (cheader_filename = "gio/gunixmounts.h", cname = "GUnixMountEntry", free_function = "g_unix_mount_free", lower_case_prefix = "g_unix_mount_")] + [CCode (cheader_filename = "gio/gunixmounts.h", cname = "GUnixMountEntry", free_function = "g_unix_mount_free", lower_case_cprefix = "g_unix_mount_")] [Compact] public class UnixMountEntry { [CCode (cname = "g_unix_mount_at")] public UnixMountEntry (string mount_path, uint64 time_read); - [CCode (cname = "g_unix_mount_compare")] public int compare (GLib.UnixMountEntry mount); [CCode (cheader_filename = "gio/gunixmounts.h", cname = "g_unix_mounts_get")] public static GLib.List @get (out uint64 time_read = null); - [CCode (cname = "g_unix_mount_get_device_path")] public unowned string get_device_path (); - [CCode (cname = "g_unix_mount_get_fs_type")] public unowned string get_fs_type (); - [CCode (cname = "g_unix_mount_get_mount_path")] public unowned string get_mount_path (); - [CCode (cname = "g_unix_mount_guess_can_eject")] public bool guess_can_eject (); - [CCode (cname = "g_unix_mount_guess_icon")] public GLib.Icon guess_icon (); - [CCode (cname = "g_unix_mount_guess_name")] public string guess_name (); - [CCode (cname = "g_unix_mount_guess_should_display")] public bool guess_should_display (); - [CCode (cname = "g_unix_mount_guess_symbolic_icon")] public GLib.Icon guess_symbolic_icon (); - [CCode (cname = "g_unix_mount_is_readonly")] public bool is_readonly (); - [CCode (cname = "g_unix_mount_is_system_internal")] public bool is_system_internal (); } [CCode (cheader_filename = "gio/gunixmounts.h")] diff --git a/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala b/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala index 4b2b8741f..424e2ec29 100644 --- a/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala +++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala @@ -22,31 +22,20 @@ namespace GLib { [Compact] - [CCode (cname = "GUnixMountEntry", cheader_filename = "gio/gunixmounts.h", lower_case_prefix = "g_unix_mount_", free_function = "g_unix_mount_free")] + [CCode (cname = "GUnixMountEntry", cheader_filename = "gio/gunixmounts.h", lower_case_cprefix = "g_unix_mount_", free_function = "g_unix_mount_free")] public class UnixMountEntry { [CCode (cname = "g_unix_mount_at")] public UnixMountEntry (string mount_path, uint64 time_read); - [CCode (cname = "g_unix_mount_compare")] public int compare (GLib.UnixMountEntry mount); - [CCode (cname = "g_unix_mount_get_device_path")] public unowned string get_device_path (); - [CCode (cname = "g_unix_mount_get_fs_type")] public unowned string get_fs_type (); - [CCode (cname = "g_unix_mount_get_mount_path")] public unowned string get_mount_path (); - [CCode (cname = "g_unix_mount_guess_can_eject")] public bool guess_can_eject (); - [CCode (cname = "g_unix_mount_guess_icon")] public GLib.Icon guess_icon (); - [CCode (cname = "g_unix_mount_guess_name")] public string guess_name (); - [CCode (cname = "g_unix_mount_guess_should_display")] public bool guess_should_display (); - [CCode (cname = "g_unix_mount_guess_symbolic_icon")] public GLib.Icon guess_symbolic_icon (); - [CCode (cname = "g_unix_mount_is_readonly")] public bool is_readonly (); - [CCode (cname = "g_unix_mount_is_system_internal")] public bool is_system_internal (); [CCode (cname = "g_unix_mounts_get", cheader_filename = "gio/gunixmounts.h")] -- 2.47.2