telepathy-glib: Document that tp_user_action_time_from_x11 works for GDK 3 too
Simon McVittie
smcv at kemper.freedesktop.org
Mon Apr 16 12:03:27 PDT 2012
Module: telepathy-glib
Branch: master
Commit: d3ae14a03a52b5d292410fef19b4383e9f01150a
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=d3ae14a03a52b5d292410fef19b4383e9f01150a
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Mon Apr 16 16:11:28 2012 +0100
Document that tp_user_action_time_from_x11 works for GDK 3 too
GDK 3 uses the same timestamps as GDK 2, X11, and Clutter 1.0.
Also change the spelling from Gdk to GDK, following the style used in
GDK's own documentation.
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
---
telepathy-glib/account-channel-request.c | 2 +-
telepathy-glib/defs.h | 2 +-
telepathy-glib/util.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index 9a28a93..86cbc16 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -363,7 +363,7 @@ tp_account_channel_request_class_init (
* user action happened at the current time, e.g. a client may
* request that its window gains focus.
*
- * On X11-based systems, Gdk 2.x, Clutter 1.0 etc.,
+ * On X11-based systems, GDK 2, GDK 3, Clutter 1.0 etc.,
* tp_user_action_time_from_x11() can be used to convert an X11 timestamp to
* a Telepathy user action time.
*
diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h
index 535e199..3de9de3 100644
--- a/telepathy-glib/defs.h
+++ b/telepathy-glib/defs.h
@@ -130,7 +130,7 @@ G_BEGIN_DECLS
* The "user action time" used by methods like
* tp_account_channel_request_new() to represent channel requests that should
* be treated as though they happened at the current time. This is the same
- * concept as %GDK_CURRENT_TIME in Gdk (but note that the numerical value used
+ * concept as %GDK_CURRENT_TIME in GDK (but note that the numerical value used
* in Telepathy is not the same).
*
* See also #TpAccountChannelRequest:user-action-time,
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
index a346d34..3e7ba1a 100644
--- a/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
@@ -1419,7 +1419,7 @@ tp_simple_async_report_success_in_idle (GObject *source,
*
* Convert an X11 timestamp into a user action time as used in Telepathy.
*
- * This also works for the timestamps used by Gdk 2.x and Clutter 1.0;
+ * This also works for the timestamps used by GDK 2, GDK 3 and Clutter 1.0;
* it may or may not work with other toolkits or versions.
*
* Returns: a nonzero Telepathy user action time, or
@@ -1450,8 +1450,8 @@ tp_user_action_time_from_x11 (guint32 x11_time)
* call gtk_window_present_with_time() using @x11_time as input, for instance.
*
* @x11_time is used to return a timestamp in the right format for X11,
- * Gdk 2.x and Clutter 1.0; it may or may not work with other toolkits or
- * versions.
+ * GDK 2, GDK 3 and Clutter 1.0; it may or may not work with other
+ * toolkits or versions.
*
* Returns: %TRUE if it would be appropriate to present a window
*
More information about the telepathy-commits
mailing list