* python/dbus_glib_bindings.pyx: reorder imports and c definitions

to fix some wranings. We now use dbus_bindings.DBusConnection instead
of defining DBusConnection ourselves.

diff --git a/ChangeLog b/ChangeLog
index 73d72ce..20cc11e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-23  John (J5) Palmieri  <johnp@redhat.com>
+
+       * python/dbus_glib_bindings.pyx: reorder imports and c definitions
+       to fix some wranings. We now use dbus_bindings.DBusConnection instead
+       of defining DBusConnection ourselves.
+
 2005-08-18  John (J5) Palmieri  <johnp@redhat.com>
 
        * python/dbus.pth: New path file to fix up problems when installing

diff --git a/python/dbus_glib_bindings.pyx b/python/dbus_glib_bindings.pyx
index 314fada..e432352 100644 (file)
--- a/python/dbus_glib_bindings.pyx
+++ b/python/dbus_glib_bindings.pyx
@@ -1,15 +1,13 @@
-cdef extern from "dbus.h":
-    ctypedef struct DBusConnection
+cimport dbus_bindings
+import dbus_bindings
 
 cdef extern from "dbus-glib.h":
     ctypedef struct GMainContext
-    cdef void dbus_connection_setup_with_g_main (DBusConnection *connection,
-                                                 GMainContext   *context)
     cdef void dbus_g_thread_init ()
 
-cimport dbus_bindings
-import dbus_bindings
-
+cdef extern from "dbus-glib-lowlevel.h":
+    cdef void dbus_connection_setup_with_g_main (dbus_bindings.DBusConnection *connection,
+                                                 GMainContext   *context)
 def setup_with_g_main(conn):
    cdef dbus_bindings.Connection connection
    connection = conn