diff options
| author | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
| commit | 961e6ca41c1e9433055130569ce3492866e2126b (patch) | |
| tree | 053a3e24565665462a498dee93762a83b5598004 /test/glib/test-service-glib.c | |
| parent | eed3989ea35a62e5f58ee7fc3f50a23ad0821800 (diff) | |
2004-06-20 Havoc Pennington <hp@redhat.com>
* dbus/dbus-glib-error-enum.h: autogenerate the GError enum
codes from the dbus error names
* glib/dbus-glib.h: move to subdir dbus/ since it's included
as dbus/dbus-glib.h and that breakage is now visible due to
including dbus/dbus-glib.h in dbus-glib-lowlevel.h
* glib/dbus-glib.h: s/gproxy/g_proxy/
* dbus/dbus-shared.h: new header to hold stuff shared with
binding APIs
* dbus/dbus-protocol.h (DBUS_ERROR_*): move errors here rather
than dbus-errors.h
* glib/dbus-glib.h (dbus_set_g_error): move to
dbus-glib-lowlevel.h
* glib/dbus-glib.h: remove dbus/dbus.h from here; change a bunch
of stuff to enable this
* dbus/dbus-glib-lowlevel.h: put dbus/dbus.h here
* a bunch of other changes with the same basic "separate glib
bindings from dbus.h" theme
Diffstat (limited to 'test/glib/test-service-glib.c')
| -rw-r--r-- | test/glib/test-service-glib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c index d3601940..aa409aa3 100644 --- a/test/glib/test-service-glib.c +++ b/test/glib/test-service-glib.c @@ -1,5 +1,5 @@ /* -*- mode: C; c-file-style: "gnu" -*- */ -#include "dbus-glib.h" +#include <dbus/dbus-glib.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -9,7 +9,7 @@ static GMainLoop *loop; int main (int argc, char **argv) { - DBusConnection *connection; + DBusGConnection *connection; GError *error; g_type_init (); @@ -17,8 +17,8 @@ main (int argc, char **argv) loop = g_main_loop_new (NULL, FALSE); error = NULL; - connection = dbus_bus_get_with_g_main (DBUS_BUS_ACTIVATION, - &error); + connection = dbus_g_bus_get (DBUS_BUS_ACTIVATION, + &error); if (connection == NULL) { g_printerr ("Failed to open connection to bus: %s\n", |