X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgdbusnamewatching.h;h=bdc7d3264803a7f8b87f45451efff9e88d492132;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=28805ceac3338781171b5adb998276ba3223f141;hpb=0fd6498cd89888023fb2161bfdde9339a4346986;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index 28805ce..bdc7d32 100644
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.h
@@ -1,6 +1,6 @@
 /* GDBus - GLib D-Bus Library
  *
- * Copyright (C) 2008-2009 Red Hat, Inc.
+ * Copyright (C) 2008-2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -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,14 +65,37 @@ typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
                                           gpointer         user_data);
 
 
-guint g_bus_watch_name   (GBusType                  bus_type,
-                          const gchar              *name,
-                          GBusNameWatcherFlags      flags,
-                          GBusNameAppearedCallback  name_appeared_handler,
-                          GBusNameVanishedCallback  name_vanished_handler,
-                          gpointer                  user_data,
-                          GDestroyNotify            user_data_free_func);
-void  g_bus_unwatch_name (guint                     watcher_id);
+GLIB_AVAILABLE_IN_ALL
+guint g_bus_watch_name               (GBusType                  bus_type,
+                                      const gchar              *name,
+                                      GBusNameWatcherFlags      flags,
+                                      GBusNameAppearedCallback  name_appeared_handler,
+                                      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,
+                                      GBusNameAppearedCallback  name_appeared_handler,
+                                      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