luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBus: Nuke G_BUS_TYPE_NONE

Browse Source
This commit is contained in:
David Zeuthen 2010-05-13 18:04:48 -04:00
parent 1fd55b8bbf
commit 68078ed648
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/gdbusnameowning.c
View File

@ -591,7 +591,6 @@ g_bus_own_name (GBusType bus_type,
{ {
Client *client; Client *client;
g_return_val_if_fail (bus_type != G_BUS_TYPE_NONE, 0);
g_return_val_if_fail (g_dbus_is_name (name) && !g_dbus_is_unique_name (name), 0); g_return_val_if_fail (g_dbus_is_name (name) && !g_dbus_is_unique_name (name), 0);
G_LOCK (lock); G_LOCK (lock);

1
gio/gdbusnamewatching.c
View File

@ -551,7 +551,6 @@ g_bus_watch_name (GBusType bus_type,
{ {
Client *client; Client *client;
g_return_val_if_fail (bus_type != G_BUS_TYPE_NONE, 0);
g_return_val_if_fail (g_dbus_is_name (name), 0); g_return_val_if_fail (g_dbus_is_name (name), 0);
G_LOCK (lock); G_LOCK (lock);

3
gio/gdbusproxywatching.c
View File

@ -255,7 +255,7 @@ on_name_vanished (GDBusConnection *connection,
/** /**
* g_bus_watch_proxy: * g_bus_watch_proxy:
* @bus_type: The type of bus to watch a name on (can't be #G_BUS_TYPE_NONE). * @bus_type: The type of bus to watch a name on.
* @name: The name (well-known or unique) to watch. * @name: The name (well-known or unique) to watch.
* @flags: Flags from the #GBusNameWatcherFlags enumeration. * @flags: Flags from the #GBusNameWatcherFlags enumeration.
* @object_path: The object path of the remote object to watch. * @object_path: The object path of the remote object to watch.
@ -318,7 +318,6 @@ g_bus_watch_proxy (GBusType bus_type,
{ {
Client *client; Client *client;
g_return_val_if_fail (bus_type != G_BUS_TYPE_NONE, 0);
g_return_val_if_fail (g_dbus_is_name (name), 0); g_return_val_if_fail (g_dbus_is_name (name), 0);
g_return_val_if_fail (g_variant_is_object_path (object_path), 0); g_return_val_if_fail (g_variant_is_object_path (object_path), 0);
g_return_val_if_fail (g_dbus_is_interface_name (interface_name), 0); g_return_val_if_fail (g_dbus_is_interface_name (interface_name), 0);

12
gio/gioenums.h
View File

@ -740,21 +740,19 @@ typedef enum {
/** /**
* GBusType: * GBusType:
* @G_BUS_TYPE_NONE: Not a message bus connection. * @G_BUS_TYPE_STARTER: An alias for the message bus that activated the process, if any.
* @G_BUS_TYPE_SESSION: The login session message bus.
* @G_BUS_TYPE_SYSTEM: The system-wide message bus. * @G_BUS_TYPE_SYSTEM: The system-wide message bus.
* @G_BUS_TYPE_STARTER: Connect to the bus that activated the program. * @G_BUS_TYPE_SESSION: The login session message bus.
* *
* An enumeration to specify the type of a #GDBusConnection. * An enumeration for well-known message buses.
* *
* Since: 2.26 * Since: 2.26
*/ */
typedef enum typedef enum
{ {
G_BUS_TYPE_NONE = -1, G_BUS_TYPE_STARTER = 0,
G_BUS_TYPE_SESSION = 0,
G_BUS_TYPE_SYSTEM = 1, G_BUS_TYPE_SYSTEM = 1,
G_BUS_TYPE_STARTER = 2 G_BUS_TYPE_SESSION = 2
} GBusType; } GBusType;
/** /**

1
gio/tests/gdbus-peer.c
View File

@ -510,7 +510,6 @@ test_peer (void)
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert_cmpint (data.current_connections->len, ==, 1); g_assert_cmpint (data.current_connections->len, ==, 1);
g_assert_cmpint (data.num_connection_attempts, ==, 1); g_assert_cmpint (data.num_connection_attempts, ==, 1);
//g_assert (g_dbus_connection_get_bus_type (c) == G_BUS_TYPE_NONE);
g_assert (g_dbus_connection_get_unique_name (c) == NULL); g_assert (g_dbus_connection_get_unique_name (c) == NULL);
g_assert_cmpstr (g_dbus_connection_get_guid (c), ==, test_guid); g_assert_cmpstr (g_dbus_connection_get_guid (c), ==, test_guid);