mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-09 11:58:02 +02:00
2006-02-15 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-glib.h: * glib/dbus-gmain.h: (dbus_g_connection_open): new method for openning a connection to an arbitrary address in the glib bindings * ChangeLog: checkin last entry which doesn't seem to be commited
This commit is contained in:
parent
9076938fc0
commit
b1aa8a0baf
3 changed files with 56 additions and 2 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2006-02-15 John (J5) Palmieri <johnp@redhat.com>
|
||||
|
||||
* dbus/dbus-glib.h:
|
||||
* glib/dbus-gmain.h:
|
||||
(dbus_g_connection_open): new method for openning
|
||||
a connection to an arbitrary address in the glib bindings
|
||||
|
||||
* ChangeLog: checkin last entry which doesn't seem to be commited
|
||||
|
||||
2006-02-13 John (J5) Palmieri <johnp@redhat.com>
|
||||
|
||||
* tools/dbus-launch.c: Fixed sh syntax output
|
||||
|
||||
2006-02-13 Robert McQueen <robot101@debian.org>
|
||||
|
||||
* glib/dbus-binding-tool-glib.c, glib/dbus-gmain.c,
|
||||
|
|
@ -14,6 +27,7 @@
|
|||
but it's now possible to store these in arrays, emit them in
|
||||
signals, etc.
|
||||
|
||||
>>>>>>> 1.959
|
||||
2006-02-10 John (J5) Palmieri <johnp@redhat.com>
|
||||
|
||||
* dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly
|
||||
|
|
|
|||
|
|
@ -68,8 +68,11 @@ gboolean dbus_g_error_has_name (GError *error,
|
|||
const char * dbus_g_error_get_name (GError *error);
|
||||
|
||||
void dbus_g_thread_init (void);
|
||||
DBusGConnection* dbus_g_bus_get (DBusBusType type,
|
||||
GError **error);
|
||||
|
||||
DBusGConnection* dbus_g_connection_open (const gchar *address,
|
||||
GError **error);
|
||||
DBusGConnection* dbus_g_bus_get (DBusBusType type,
|
||||
GError **error);
|
||||
|
||||
typedef struct _DBusGObjectInfo DBusGObjectInfo;
|
||||
typedef struct _DBusGMethodInfo DBusGMethodInfo;
|
||||
|
|
|
|||
|
|
@ -696,6 +696,43 @@ dbus_server_setup_with_g_main (DBusServer *server,
|
|||
g_error ("Not enough memory to set up DBusServer for use with GLib");
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a connection to the given address.
|
||||
*
|
||||
* (Internally, calls dbus_connection_open() then calls
|
||||
* dbus_connection_setup_with_g_main() on the result.)
|
||||
*
|
||||
* @param address address of the connection to open
|
||||
* @param error address where an error can be returned.
|
||||
* @returns a DBusConnection
|
||||
*/
|
||||
DBusGConnection*
|
||||
dbus_g_connection_open (const gchar *address,
|
||||
GError **error)
|
||||
{
|
||||
DBusConnection *connection;
|
||||
DBusError derror;
|
||||
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
||||
|
||||
_dbus_g_value_types_init ();
|
||||
|
||||
dbus_error_init (&derror);
|
||||
|
||||
connection = dbus_connection_open (socket, &derror);
|
||||
if (connection == NULL)
|
||||
{
|
||||
dbus_set_g_error (error, &derror);
|
||||
dbus_error_free (&derror);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* does nothing if it's already been done */
|
||||
dbus_connection_setup_with_g_main (connection, NULL);
|
||||
|
||||
return DBUS_G_CONNECTION_FROM_CONNECTION (connection);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a connection to the given bus. The connection is a global variable
|
||||
* shared with other callers of this function.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue