Merge lp:~xapantu/wingpanel-indicator-notifications/nodbusglib into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[xapantu]

* Use again native GLib to handle DBus messages.
* Fix bug #1468851.

Don't break everything with dbus-glib-1 :P

[kay van der Zander (kay20)]

hey nice work.

i have some comments see the diff comments.
You know i don't lik the use of 'this' and i am not the only one ;).
my advice is to remove it because there is already a difference in name of the parameters.
started with _<name>

review: Needs Fixing

[xapantu (xapantu)]

For the record, this is just a revert of a broken commit, so I am not
really responsible for the code here (ok, that's a bad excuse, and I
know it).

Also, we really need to talk about that, but that kind of thing should
not be a merge request blocker, really.

I will change that if I have some time, as I am always a peaceful guy.

Lucas

On 22/09/2015 11:02, kay van der Zander wrote:
> Review: Needs Fixing
>
> hey nice work.
>
> i have some comments see the diff comments.
> You know i don't lik the use of 'this' and i am not the only one ;).
> my advice is to remove it because there is already a difference in name of the parameters.
> started with _<name>
>
> Diff comments:
>
>>
>> === modified file 'src/Services/NotificationsMonitor.vala'
>> --- src/Services/NotificationsMonitor.vala 2015-08-21 14:30:03 +0000
>> +++ src/Services/NotificationsMonitor.vala 2015-09-22 08:45:47 +0000
>> @@ -52,19 +52,27 @@
>> public DBusIface? dbusiface = null;
>> private uint32 id_counter = 0;
>>
>> - public signal void received (Notification notification);
>> + public signal void received (DBusMessage message, uint32 id);
>>
>> public NotificationMonitor () {
>> try {
>> connection = Bus.get_sync (BusType.SESSION);
>> + this.add_filter ();
>> } catch (Error e) {
>> error ("%s\n", e.message);
>> }
>>
>> - this.add_filter ();
>
> also remove blank line
>
>> }
>>
>> private void add_filter () {
>> + var message = new DBusMessage.method_call ("org.freedesktop.DBus",
>> + "/org/freedesktop/DBus",
>> + "org.freedesktop.DBus",
>> + "AddMatch");
>> +
>> + var body = new Variant.parsed ("(%s,)", MATCH_STRING);
>> + message.set_body (body);
>> +
>> try {
>> niface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.Notifications",
>> "/org/freedesktop/Notifications");
>> @@ -73,43 +81,54 @@
>> }
>>
>> id_counter = get_current_notification_id ();
>> -
>> - var filter_connection = DBus.Bus.@get (DBus.BusType.SESSION);
>> - var raw_connection = filter_connection.get_connection ();
>> - var error = DBus.RawError ();
>> - raw_connection.add_match (MATCH_RULE, ref error);
>> - raw_connection.add_filter (message_filter);
>> - }
>> -
>> - private DBus.RawHandlerResult message_filter (DBus.RawConnection connection, DBus.RawMessage message) {
>> - if (message.get_sender () != "org.freedesktop.DBus") {
>> - var notification = new Notification.from_message (message, id_counter);
>> - uint replaces_id = notification.replaces_id;
>> - uint current_id = replaces_id;
>> -
>> - if (replaces_id == 0) {
>> - id_counter++;
>> - current_id = id_counter;
>> - }
>> -
>> - if (nsettings.do_not_disturb) {
>> - this.received (notification);
>> - ...

[kay van der Zander (kay20)]

when the diff comment are fixed i will aprove the merge

[Adam Bieńkowski (donadigo)]

Thanks for your work there! I am giving Needs Fixing only for the codestyle isses, I commented on the diff what I would like to change but it's not essential. From the function point of view it's all OK.

review: Needs Fixing (code / function)

[xapantu (xapantu)]

Updated

[lp:~xapantu/wingpanel-indicator-notifications/nodbusglib]

44. By xapantu on 2015-09-23

Put back the old code with a few fixes, so as it does not break the api (see bug #1468851)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-21 14:28:29 +0000
+++ src/CMakeLists.txt	2015-09-23 21:50:46 +0000
@@ -1,7 +1,7 @@
 find_package (PkgConfig)
 
 # Add all your dependencies to the list below
-pkg_check_modules (DEPS REQUIRED wingpanel-2.0 granite gio-2.0 gdk-pixbuf-2.0 libwnck-3.0 dbus-glib-1)
+pkg_check_modules (DEPS REQUIRED wingpanel-2.0 granite gio-2.0 gdk-pixbuf-2.0 libwnck-3.0)
 
 add_definitions (${DEPS_CFLAGS})
 add_definitions (-DWNCK_I_KNOW_THIS_IS_UNSTABLE)
@@ -31,8 +31,6 @@
   gio-2.0
   granite
   libwnck-3.0
-CUSTOM_VAPIS
-  Services/dbus-glib-1.vapi
 )
 
 add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C})

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-08-21 14:27:21 +0000
+++ src/Indicator.vala	2015-09-23 21:50:46 +0000
@@ -124,11 +124,13 @@
                 }
             });
 
-            monitor.received.connect ((notification) => {
-                if (!(notification.app_name in EXCEPTIONS || notification.app_name in settings.blacklist)) {
-                    var entry = new NotificationEntry (notification);
-                    nlist.add_item (entry);
-                }
+            monitor.received.connect ((message, id) => {
+                var notification = new Notification.from_message (message, id);
+                if (notification.app_name in EXCEPTIONS || notification.app_name in settings.blacklist)
+                    return;
+
+                var entry = new NotificationEntry (notification);
+                nlist.add_item (entry);
 
                 dynamic_icon.set_main_icon_name (get_display_icon_name ());
             });

=== modified file 'src/Services/Notification.vala'
--- src/Services/Notification.vala	2015-08-21 14:27:21 +0000
+++ src/Services/Notification.vala	2015-09-23 21:50:46 +0000
@@ -32,7 +32,7 @@
      * we need to store them in the separate
      * variables.
      */
-    public uint id;
+    public uint32 id;
     public uint64 id_64;
     public uint32 pid = 0;
     public DateTime timestamp;
@@ -55,49 +55,25 @@
     private const string DEFAULT = "default";
     private bool pid_accuired;
 
-    public Notification.from_message (DBus.RawMessage message, uint32 _id) {
-        void* _app_name, _replaces_id, _app_icon, _summary, _body, _actions, _hints, _expire_timeout;
-
-        DBus.RawMessageIter iter;
-        message.iter_init (out iter);
+    public Notification.from_message (DBusMessage message, uint32 _id) {
+        var body = message.get_body ();
 
         this.data_session = false;
 
-        iter.get_basic (out _app_name);
-        iter.next ();
-
-        iter.get_basic (out _replaces_id);
-        iter.next ();
-
-        iter.get_basic (out _app_icon);
-        iter.next ();
-
-        iter.get_basic (out _summary);
-        iter.next ();
-
-        iter.get_basic (out _body);
-        iter.next ();
-
-        iter.get_basic (out _actions);
-        iter.next ();
-        iter.next ();
-
-        iter.get_basic (out _expire_timeout);
-
-        this.app_name = (string) _app_name;
+        this.app_name = this.get_string (body, Column.APP_NAME);
         this.display_name = app_name;
-        this.replaces_id = (uint) _replaces_id;
-        this.app_icon = (string) _app_icon;
-        this.summary = (string) _summary;
-        this.message_body = (string) _body;
-        this.actions = (string[]) actions;
-        this.expire_timeout = (int) expire_timeout;
+        this.app_icon = this.get_string (body, Column.APP_ICON);
+        this.summary = this.get_string (body, Column.SUMMARY);
+        this.message_body = this.get_string (body, Column.BODY);
+        this.expire_timeout = this.get_int32 (body, Column.EXPIRE_TIMEOUT);
+        this.replaces_id = this.get_uint32 (body, Column.REPLACES_ID);
         this.id = _id;
         this.id_64 = -1;
         this.sender = message.get_sender ();
 
         setup_pid ();
 
+        this.actions = body.get_child_value (Column.ACTIONS).dup_strv ();
         this.timestamp = new DateTime.now_local ();
         this.unix_time = timestamp.to_unix ();
 
@@ -116,7 +92,8 @@
         this.message_body = _message_body;
         this.expire_timeout = -1;
         this.replaces_id = 0;
-        this.id = (uint32) _id;
+        this.id_64 = _id;
+        this.id = -1;
         this.sender = _sender;
 
         setup_pid ();
@@ -147,7 +124,6 @@
             if (dbusiface.name_has_owner (sender)) {
                 this.pid = dbusiface.get_connection_unix_process_id (sender);
             }
-
         } catch (Error e) {
             error ("%s\n", e.message);
         }
@@ -164,6 +140,21 @@
         return false;
     }
 
+    private string get_string (Variant tuple, int column) {
+        var child = tuple.get_child_value (column);
+        return child.dup_string ();
+    }
+
+    private int32 get_int32 (Variant tuple, int column) {
+        var child = tuple.get_child_value (column);
+        return child.get_int32 ();
+    }
+
+    private uint32 get_uint32 (Variant tuple, int column) {
+        var child = tuple.get_child_value (column);
+        return child.get_uint32 ();
+    }
+
     private bool source_func () {
         return this.time_changed (timestamp.difference (new DateTime.now_local ()));
     }

=== modified file 'src/Services/NotificationsMonitor.vala'
--- src/Services/NotificationsMonitor.vala	2015-08-21 14:30:03 +0000
+++ src/Services/NotificationsMonitor.vala	2015-09-23 21:50:46 +0000
@@ -44,7 +44,7 @@
 }
 
 public class NotificationMonitor : Object {
-    private const string MATCH_RULE = "eavesdrop=true,type='method_call',interface='org.freedesktop.Notifications',member='Notify'";
+    private const string MATCH_STRING = "eavesdrop='true',type='method_call',interface='org.freedesktop.Notifications',member='Notify'";
     private const uint32 REASON_DISMISSED = 2;
 
     private DBusConnection connection;
@@ -52,19 +52,26 @@
     public DBusIface? dbusiface = null;
     private uint32 id_counter = 0;
 
-    public signal void received (Notification notification);
+    public signal void received (DBusMessage message, uint32 id);
 
     public NotificationMonitor () {
         try {
             connection = Bus.get_sync (BusType.SESSION);
+            this.add_filter ();  
         } catch (Error e) {
             error ("%s\n", e.message);
         }
-
-        this.add_filter ();
     }
 
     private void add_filter () {
+        var message = new DBusMessage.method_call ("org.freedesktop.DBus",
+                                                "/org/freedesktop/DBus",
+                                                "org.freedesktop.DBus",
+                                                "AddMatch");
+
+        var body = new Variant.parsed ("(%s,)", MATCH_STRING);
+        message.set_body (body);
+        
         try {
             niface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.Notifications",
                                                       "/org/freedesktop/Notifications"); 
@@ -73,42 +80,49 @@
         }
 
         id_counter = get_current_notification_id ();
+        try {
+            connection.send_message (message, DBusSendMessageFlags.NONE, null);
+        } catch (Error e) {
+            error ("%s\n", e.message);
+        }
 
-        var filter_connection = DBus.Bus.@get (DBus.BusType.SESSION);
-        var raw_connection = filter_connection.get_connection ();
-        var error = DBus.RawError ();
-        raw_connection.add_match (MATCH_RULE, ref error);
-        raw_connection.add_filter (message_filter);
+        connection.add_filter (message_filter);
     }
 
-    private DBus.RawHandlerResult message_filter (DBus.RawConnection connection, DBus.RawMessage message) {
-        if (message.get_sender () != "org.freedesktop.DBus") {
-            var notification = new Notification.from_message (message, id_counter);
-            uint replaces_id = notification.replaces_id;
-            uint current_id = replaces_id;
-
-            if (replaces_id == 0) {
-                id_counter++;
-                current_id = id_counter;
-            }
-
-            if (nsettings.do_not_disturb) {
-                this.received (notification);
-            } else {
-                niface.notification_closed.connect ((id, reason) => {
-                    if (id == 1) {
-                        id_counter = id;
-                        current_id = id_counter;
-                    }
-
-                    if (reason != REASON_DISMISSED && current_id == id) {
-                        this.received (notification);                
-                    }                      
-                });                 
+    private DBusMessage message_filter (DBusConnection con, owned DBusMessage message, bool incoming) {
+        if (incoming) {
+            if ((message.get_message_type () == DBusMessageType.METHOD_CALL) &&
+                (message.get_interface () == "org.freedesktop.Notifications") &&
+                (message.get_member () == "Notify")) {  
+                uint32 replaces_id = message.get_body ().get_child_value (1).get_uint32 ();
+                uint32 current_id = replaces_id; 
+
+                if (replaces_id == 0) {
+                    id_counter++;
+                    current_id = id_counter;
+                }
+
+                if (nsettings.do_not_disturb) {
+                    this.received (message, current_id);
+                } else {
+                    niface.notification_closed.connect ((id, reason) => {
+                        if (id == 1) {
+                            id_counter = id;
+                            current_id = id_counter;
+                        }
+
+                        if (reason != REASON_DISMISSED && current_id == id) {
+                            this.received (message, id);
+                            message = null;                        
+                        }                      
+                    });                    
+                }
+                return null;
+
             }
         }
 
-        return DBus.RawHandlerResult.HANDLED;
+        return message;
     }
 
     /* Check what's the current notification id */
@@ -122,4 +136,4 @@
             error ("%s\n", e.message);
         }
     } 
-}
\ No newline at end of file
+}

=== removed file 'src/Services/dbus-glib-1.vapi'
--- src/Services/dbus-glib-1.vapi	2015-08-21 14:27:21 +0000
+++ src/Services/dbus-glib-1.vapi	1970-01-01 00:00:00 +0000
@@ -1,315 +0,0 @@
-/* dbus-glib-1.vala
- *
- * Copyright (C) 2007-2010  Jürg Billeter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- *  Jürg Billeter <[e-mail]>
- *  Michael 'Mickey' Lauer <[e-mail]>
- */
-
-[CCode (cheader_filename = "dbus/dbus-glib-lowlevel.h,dbus/dbus-glib.h", gir_namespace = "DBusGLib", gir_version = "1.0")]
-namespace DBus {
-    public const string SERVICE_DBUS;
-    public const string PATH_DBUS;
-    public const string INTERFACE_DBUS;
-
-    public const string INTERFACE_INTROSPECTABLE;
-    public const string INTERFACE_PROPERTIES;
-    public const string INTERFACE_PEER;
-
-    [CCode (cname = "dbus_g_thread_init")]
-    public static void thread_init ();
-
-    [CCode (cprefix = "DBUS_BUS_")]
-    public enum BusType {
-        SESSION,
-        SYSTEM,
-        STARTER
-    }
-
-    [CCode (lower_case_cprefix = "dbus_bus_")]
-    namespace RawBus {
-        public static RawConnection get (BusType type, ref RawError error);
-    }
-
-    [CCode (ref_function = "dbus_connection_ref", unref_function = "dbus_connection_unref", cname = "DBusConnection", cprefix = "dbus_connection_")]
-    public class RawConnection {
-        [CCode (cname = "dbus_connection_setup_with_g_main")]
-        public void setup_with_main (GLib.MainContext? context = null);
-        [CCode (cname = "dbus_connection_get_g_connection")]
-        public unowned Connection get_g_connection ();
-        [CCode (cname = "dbus_connection_register_g_object")]
-        public void register_object (string at_path, GLib.Object object);
-
-        public bool send (RawMessage message, uint32? client_serial);
-        public RawMessage send_with_reply_and_block (RawMessage message, int timeout_milliseconds, ref RawError error);
-
-        public bool add_filter (RawHandleMessageFunction function, RawFreeFunction? free_data_function = null);
-        public void remove_filter (RawHandleMessageFunction function);
-
-        [CCode (cname = "dbus_bus_add_match")]
-        public void add_match (string rule, ref RawError error);
-        [CCode (cname = "dbus_bus_remove_match")]
-        public void remove_match (string rule, ref RawError error);
-        [CCode (cname = "dbus_bus_get_unique_name")]
-        public unowned string get_unique_name();
-        [CCode (cname = "dbus_bus_request_name")]
-        public int request_name(string name, uint flags, ref RawError error);
-        [CCode (cname="dbus_bus_release_name")]
-        public int release_name(string name, ref RawError error);
-    }
-
-    [CCode (cname = "DBusError", cprefix = "dbus_error_", destroy_function = "dbus_error_free")]
-    public struct RawError {
-        public string name;
-        public string message;
-
-        public RawError ();
-        public bool has_name (string name);
-        public bool is_set ();
-    }
-
-    [CCode (cname = "DBusFreeFunction", has_target = false)]
-    public delegate void* RawFreeFunction (void* memory);
-    [CCode (cname = "DBusHandleMessageFunction", instance_pos = -1)]
-    public delegate RawHandlerResult RawHandleMessageFunction(RawConnection connection, RawMessage message);
-
-    [CCode (cname = "DBusHandlerResult", cprefix = "DBUS_HANDLER_RESULT_")]
-    public enum RawHandlerResult {
-        HANDLED,
-        NOT_YET_HANDLED,
-        NEED_MEMORY
-    }
-
-    [CCode (cname = "DBusMessageIter", cprefix = "dbus_message_iter_")]
-    public struct RawMessageIter {
-        public bool has_next ();
-        public bool next ();
-        public string get_signature ();
-        public int get_arg_type ();
-        public int get_element_type ();
-        public void recurse (RawMessageIter sub);
-        public void get_basic (out void* value);
-        public bool open_container (RawType arg_type, string? signature, RawMessageIter sub);
-        public bool close_container (RawMessageIter sub);
-        public bool append_basic (RawType arg_type, void* value);
-
-        [CCode (cname = "dbus_message_type_from_string")]
-        public static int type_from_string (string type);
-        [CCode (cname = "dbus_message_type_to_string")]
-        public static string type_to_string (int type);
-    }
-
-    [CCode (ref_function = "dbus_message_ref", unref_function = "dbus_message_unref", cname = "DBusMessage", cprefix = "dbus_message_")]
-    public class RawMessage {
-        [CCode (cname = "dbus_message_new_method_call")]
-        public RawMessage.call (string bus_name, string path, string interface, string method);
-        [CCode (sentinel = "DBUS_TYPE_INVALID")]
-        public bool append_args (RawType first_arg_type, ...);
-        [CCode (cname = "dbus_message_iter_init")]
-        public bool iter_init (out RawMessageIter iter);
-        [CCode (cname = "dbus_message_iter_init_append")]
-        public bool iter_init_append (RawMessageIter iter);
-
-        public RawMessageType get_type ();
-        public bool   set_path (string object_path);
-        public unowned string get_path ();
-        public bool   has_path (string object_path);
-        public bool   set_interface (string iface);
-        public unowned string get_interface ();
-        public bool   has_interface (string iface);
-        public bool   set_member (string member);
-        public unowned string get_member ();
-        public bool   has_member (string member);
-        public bool   set_error_name (string name);
-        public unowned string get_error_name ();
-        public bool   set_destination (string destination);
-        public unowned string get_destination ();
-        public bool   set_sender (string sender);
-        public unowned string get_sender ();
-        public unowned string get_signature ();
-        public void   set_no_reply (bool no_reply);
-        public bool   get_no_reply ();
-        public bool   is_method_call (string iface, string method);
-        public bool   is_signal (string iface, string signal_name);
-        public bool   is_error (string error_name);
-        public bool   has_destination (string bus_name);
-        public bool   has_sender (string unique_bus_name);
-        public bool   has_signature (string signature);
-        public uint32 get_serial ();
-        public void   set_serial (uint32 serial);
-        public bool   set_reply_serial (uint32 reply_serial);
-        public uint32 get_reply_serial ();
-        public void   set_auto_start (bool auto_start);
-        public bool   get_auto_start ();
-        public bool   get_path_decomposed (out char[] path );
-    }
-
-    [CCode (cname = "int", cprefix = "DBUS_MESSAGE_TYPE_")]
-    public enum RawMessageType {
-        INVALID,
-        METHOD_CALL,
-        METHOD_RETURN,
-        ERROR,
-        SIGNAL
-    }
-
-    [CCode (cname = "int", cprefix = "DBUS_TYPE_")]
-    public enum RawType {
-        INVALID,
-        BYTE,
-        BOOLEAN,
-        INT16,
-        UINT16,
-        INT32,
-        UINT32,
-        INT64,
-        UINT64,
-        DOUBLE,
-        STRING,
-        OBJECT_PATH,
-        SIGNATURE,
-        ARRAY,
-        VARIANT,
-        STRUCT,
-        DICT_ENTRY,
-    }
-
-    [DBus (name = "org.freedesktop.DBus.Error")]
-    [CCode (cname = "DBusGError", lower_case_csuffix = "gerror", cprefix = "DBUS_GERROR_")]
-    public errordomain Error {
-        FAILED,
-        NO_MEMORY,
-        SERVICE_UNKNOWN,
-        NAME_HAS_NO_OWNER,
-        NO_REPLY,
-        [DBus (name = "IOError")]
-        IO_ERROR,
-        BAD_ADDRESS,
-        NOT_SUPPORTED,
-        LIMITS_EXCEEDED,
-        ACCESS_DENIED,
-        AUTH_FAILED,
-        NO_SERVER,
-        TIMEOUT,
-        NO_NETWORK,
-        ADDRESS_IN_USE,
-        DISCONNECTED,
-        INVALID_ARGS,
-        FILE_NOT_FOUND,
-        FILE_EXISTS,
-        UNKNOWN_METHOD,
-        TIMED_OUT,
-        MATCH_RULE_NOT_FOUND,
-        MATCH_RULE_INVALID,
-        [DBus (name = "Spawn.ExecFailed")]
-        SPAWN_EXEC_FAILED,
-        [DBus (name = "Spawn.ForkFailed")]
-        SPAWN_FORK_FAILED,
-        [DBus (name = "Spawn.ChildExited")]
-        SPAWN_CHILD_EXITED,
-        [DBus (name = "Spawn.ChildSignaled")]
-        SPAWN_CHILD_SIGNALED,
-        [DBus (name = "Spawn.Failed")]
-        SPAWN_FAILED,
-        UNIX_PROCESS_ID_UNKNOWN,
-        INVALID_SIGNATURE,
-        INVALID_FILE_CONTENT,
-        [DBus (name = "SELinuxSecurityContextUnknown")]
-        SELINUX_SECURITY_CONTEXT_UNKNOWN,
-        REMOTE_EXCEPTION
-    }
-
-    public struct Bus {
-        [CCode (cname = "dbus_g_bus_get")]
-        public static Connection get (BusType type) throws Error;
-    }
-
-    [Compact]
-    [CCode (ref_function = "dbus_g_connection_ref", unref_function = "dbus_g_connection_unref", cname = "DBusGConnection")]
-    public class Connection {
-        [CCode (cname = "dbus_g_connection_open")]
-        public Connection (string address) throws Error;
-        [CCode (cname = "dbus_g_proxy_new_for_name")]
-        public Object get_object (string name, string path, string? interface_ = null);
-        [CCode (cname="dbus_g_proxy_new_for_name_owner")]
-        public Object get_object_for_name_owner (string name, string path, string? interface_ = null) throws Error;
-        [CCode (cname = "dbus_g_proxy_new_from_type")]
-        public GLib.Object get_object_from_type (string name, string path, string interface_, GLib.Type type);
-        [CCode (cname = "dbus_g_connection_register_g_object")]
-        public void register_object (string at_path, GLib.Object object);
-        [CCode (cname = "dbus_g_connection_unregister_g_object")]
-        public void unregister_object (GLib.Object object);
-        [CCode (cname = "dbus_g_connection_lookup_g_object")]
-        public unowned GLib.Object lookup_object (string at_path);
-        [CCode (cname = "dbus_g_connection_get_connection")]
-        public unowned RawConnection get_connection ();
-    }
-
-    [CCode (cname = "DBusGProxy", lower_case_csuffix = "g_proxy")]
-    public class Object : GLib.Object {
-        public bool call (string method, out GLib.Error error, GLib.Type first_arg_type, ...);
-        public unowned ProxyCall begin_call (string method, ProxyCallNotify notify, GLib.DestroyNotify destroy, GLib.Type first_arg_type, ...);
-        public bool end_call (ProxyCall call, out GLib.Error error, GLib.Type first_arg_type, ...);
-        public void cancel_call (ProxyCall call);
-        public unowned string get_path ();
-        public unowned string get_bus_name ();
-        public unowned string get_interface ();
-        public GLib.HashTable<string,GLib.Value?> get_all (string interface_name) throws DBus.Error;
-
-        public signal void destroy ();
-    }
-
-    [CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "DBUS_TYPE_G_OBJECT_PATH", marshaller_type_name = "BOXED", get_value_function = "g_value_get_boxed", set_value_function = "g_value_set_boxed", type_signature = "o")]
-    public class ObjectPath : string {
-        [CCode (cname = "g_strdup")]
-        public ObjectPath (string path);
-    }
-
-    [CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "G_TYPE_STRING", marshaller_type_name = "STRING", get_value_function = "g_value_get_string", set_value_function = "g_value_set_string")]
-    public class BusName : string {
-        [CCode (cname = "g_strdup")]
-        public BusName (string bus_name);
-    }
-
-    [CCode (cname = "DBusGProxyCallNotify")]
-    public delegate void ProxyCallNotify (Object obj, ProxyCall call_id);
-
-    [CCode (cname = "DBusGProxyCall")]
-    public class ProxyCall {
-    }
-
-    [CCode (cname = "DBusGMethodInvocation")]
-    public class MethodInvocation {
-    }
-
-    [Flags]
-    [CCode (cname = "uint")]
-    public enum NameFlag {
-        ALLOW_REPLACEMENT,
-        REPLACE_EXISTING,
-        DO_NOT_QUEUE
-    }
-
-    [CCode (cname = "int")]
-    public enum RequestNameReply {
-        PRIMARY_OWNER,
-        IN_QUEUE,
-        EXISTS,
-        ALREADY_OWNER
-    }
-}