[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gio / gdbusnamewatching.h

diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index a424f43..bdc7d32 100644 (file)
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.h
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: David Zeuthen <davidz@redhat.com>
  */
@@ -23,6 +21,10 @@
 #ifndef __G_DBUS_NAME_WATCHING_H__
 #define __G_DBUS_NAME_WATCHING_H__
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
@@ -45,12 +47,17 @@ typedef void (*GBusNameAppearedCallback) (GDBusConnection *connection,
 
 /**
  * GBusNameVanishedCallback:
- * @connection: The #GDBusConnection the name is being watched on.
+ * @connection: The #GDBusConnection the name is being watched on, or
+ *     %NULL.
  * @name: The name being watched.
  * @user_data: User data passed to g_bus_watch_name().
  *
  * Invoked when the name being watched is known not to have to have a owner.
  *
+ * This is also invoked when the #GDBusConection on which the watch was
+ * established has been closed.  In that case, @connection will be
+ * %NULL.
+ *
  * Since: 2.26
  */
 typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
@@ -58,6 +65,7 @@ typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
                                           gpointer         user_data);
 
 
+GLIB_AVAILABLE_IN_ALL
 guint g_bus_watch_name               (GBusType                  bus_type,
                                       const gchar              *name,
                                       GBusNameWatcherFlags      flags,
@@ -65,6 +73,7 @@ guint g_bus_watch_name               (GBusType                  bus_type,
                                       GBusNameVanishedCallback  name_vanished_handler,
                                       gpointer                  user_data,
                                       GDestroyNotify            user_data_free_func);
+GLIB_AVAILABLE_IN_ALL
 guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
                                       const gchar              *name,
                                       GBusNameWatcherFlags      flags,
@@ -72,6 +81,20 @@ guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
                                       GBusNameVanishedCallback  name_vanished_handler,
                                       gpointer                  user_data,
                                       GDestroyNotify            user_data_free_func);
+GLIB_AVAILABLE_IN_ALL
+guint g_bus_watch_name_with_closures (GBusType                  bus_type,
+                                      const gchar              *name,
+                                      GBusNameWatcherFlags      flags,
+                                      GClosure                 *name_appeared_closure,
+                                      GClosure                 *name_vanished_closure);
+GLIB_AVAILABLE_IN_ALL
+guint g_bus_watch_name_on_connection_with_closures (
+                                      GDBusConnection          *connection,
+                                      const gchar              *name,
+                                      GBusNameWatcherFlags      flags,
+                                      GClosure                 *name_appeared_closure,
+                                      GClosure                 *name_vanished_closure);
+GLIB_AVAILABLE_IN_ALL
 void  g_bus_unwatch_name             (guint                     watcher_id);
 
 G_END_DECLS