GDBus: Remove g_dbus_is_activated()

It's generally hard to get this right so don't attempt to do so.

diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index cc0a890..a0ffd51 100644 (file)
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -2225,7 +2225,6 @@ g_dbus_address_get_for_bus_sync
 
 <SECTION>
 <FILE>gdbusutils</FILE>
-g_dbus_is_activated
 g_dbus_generate_guid
 g_dbus_is_guid
 g_dbus_is_name

diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c
index fcaf3c3..2a1ca67 100644 (file)
--- a/gio/gdbusutils.c
+++ b/gio/gdbusutils.c
@@ -357,25 +357,5 @@ g_dbus_is_guid (const gchar *string)
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-/**
- * g_dbus_is_activated:
- *
- * Determine if the process has been activated by a message bus.
- *
- * Returns: %TRUE if this process has been started by a message bus, %FALSE otherwise.
- *
- * Since: 2.26
- */
-gboolean
-g_dbus_is_activated (void)
-{
-  /* TODO: technically this will make child processes forked by us
-   * return TRUE too..
-   */
-  return g_getenv ("DBUS_STARTER_BUS_TYPE") != NULL;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
 #define __G_DBUS_UTILS_C__
 #include "gioaliasdef.c"

diff --git a/gio/gdbusutils.h b/gio/gdbusutils.h
index d6f3450..4d8a7ab 100644 (file)
--- a/gio/gdbusutils.h
+++ b/gio/gdbusutils.h
@@ -35,8 +35,6 @@ gboolean g_dbus_is_unique_name (const gchar *string);
 gboolean g_dbus_is_member_name (const gchar *string);
 gboolean g_dbus_is_interface_name (const gchar *string);
 
-gboolean g_dbus_is_activated (void);
-
 G_END_DECLS
 
 #endif /* __G_DBUS_UTILS_H__ */

diff --git a/gio/gio.symbols b/gio/gio.symbols
index da6eb93..c7adc7c 100644 (file)
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -1705,7 +1705,6 @@ g_dbus_server_get_guid
 #if IN_HEADER(__G_DBUS_UTILS_H__)
 #if IN_FILE(__G_DBUS_UTILS_C__)
 g_dbus_generate_guid
-g_dbus_is_activated
 g_dbus_is_guid
 g_dbus_is_interface_name
 g_dbus_is_member_name