[gtk+/xi2] GdkDeviceManager*: Turn get_devices() into list_devices().
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/xi2] GdkDeviceManager*: Turn get_devices() into list_devices().
- Date: Fri, 27 Nov 2009 15:04:13 +0000 (UTC)
commit a2f4e52e91373f99749a3f91cdd1de40f4d032ed
Author: Carlos Garnacho <carlos gnome org>
Date: Fri Nov 27 15:54:05 2009 +0100
GdkDeviceManager*: Turn get_devices() into list_devices().
Seems to be the convention for functions that return an allocated list.
Pointed out by Michael Natterer.
gdk/gdk.symbols | 1 +
gdk/gdkdevicemanager.c | 8 ++++----
gdk/gdkdevicemanager.h | 6 +++---
gdk/gdkdisplay.c | 6 +++---
gdk/gdkwindow.c | 10 +++++-----
gdk/x11/gdkdevicemanager-core.c | 10 +++++-----
gdk/x11/gdkdevicemanager-xi.c | 12 ++++++------
gdk/x11/gdkdevicemanager-xi2.c | 10 +++++-----
gdk/x11/gdkdisplay-x11.c | 4 ++--
gdk/x11/gdkmain-x11.c | 12 ++++++------
10 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index cb8fc52..5f3ae75 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -398,6 +398,7 @@ gdk_cursor_get_image
#if IN_FILE(__GDK_DEVICE_MANAGER_C__)
gdk_device_manager_get_display
gdk_device_manager_get_type G_GNUC_CONST
+gdk_device_manager_list_devices
#endif
#endif
diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index 14f3856..8ecc3c0 100644
--- a/gdk/gdkdevicemanager.c
+++ b/gdk/gdkdevicemanager.c
@@ -209,7 +209,7 @@ gdk_device_manager_get_display (GdkDeviceManager *device_manager)
}
/**
- * gdk_device_manager_get_devices:
+ * gdk_device_manager_list_devices:
* @device_manager: a #GdkDeviceManager
* @type: device type to get.
*
@@ -221,12 +221,12 @@ gdk_device_manager_get_display (GdkDeviceManager *device_manager)
* GTK+ and must not be freed or unreffed.
**/
GList *
-gdk_device_manager_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type)
+gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type)
{
g_return_val_if_fail (GDK_IS_DEVICE_MANAGER (device_manager), NULL);
- return GDK_DEVICE_MANAGER_GET_CLASS (device_manager)->get_devices (device_manager, type);
+ return GDK_DEVICE_MANAGER_GET_CLASS (device_manager)->list_devices (device_manager, type);
}
#define __GDK_DEVICE_MANAGER_C__
diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h
index 337d7ea..ec86953 100644
--- a/gdk/gdkdevicemanager.h
+++ b/gdk/gdkdevicemanager.h
@@ -57,14 +57,14 @@ struct _GdkDeviceManagerClass
GdkDevice *device);
/* VMethods */
- GList * (* get_devices) (GdkDeviceManager *device_manager,
- GdkDeviceType type);
+ GList * (* list_devices) (GdkDeviceManager *device_manager,
+ GdkDeviceType type);
};
GType gdk_device_manager_get_type (void) G_GNUC_CONST;
GdkDisplay * gdk_device_manager_get_display (GdkDeviceManager *device_manager);
-GList * gdk_device_manager_get_devices (GdkDeviceManager *device_manager,
+GList * gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
GdkDeviceType type);
G_END_DECLS
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 0c5dd79..d4c87c5 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -426,7 +426,7 @@ gdk_display_pointer_ungrab (GdkDisplay *display,
g_return_if_fail (GDK_IS_DISPLAY (display));
device_manager = gdk_display_get_device_manager (display);
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
/* FIXME: Should this be generic to all backends? */
/* FIXME: What happens with extended devices? */
@@ -494,7 +494,7 @@ gdk_display_keyboard_ungrab (GdkDisplay *display,
g_return_if_fail (GDK_IS_DISPLAY (display));
device_manager = gdk_display_get_device_manager (display);
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
/* FIXME: Should this be generic to all backends? */
/* FIXME: What happens with extended devices? */
@@ -1699,7 +1699,7 @@ gdk_display_pointer_is_grabbed (GdkDisplay *display)
g_return_val_if_fail (GDK_IS_DISPLAY (display), TRUE);
device_manager = gdk_display_get_device_manager (display);
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
for (dev = devices; dev; dev = dev->next)
{
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index fd1bfaa..2a91f3b 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -6868,9 +6868,9 @@ gdk_window_hide (GdkWindow *window)
device_manager = gdk_display_get_device_manager (display);
/* Get all devices */
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
- devices = g_list_concat (devices, gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
- devices = g_list_concat (devices, gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
for (d = devices; d; d = d->next)
{
@@ -9982,7 +9982,7 @@ gdk_pointer_grab (GdkWindow * window,
serial = _gdk_windowing_window_get_next_serial (display);
device_manager = gdk_display_get_device_manager (display);
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
/* FIXME: Should this be generic to all backends? */
/* FIXME: What happens with extended devices? */
@@ -10063,7 +10063,7 @@ gdk_keyboard_grab (GdkWindow *window,
serial = _gdk_windowing_window_get_next_serial (display);
device_manager = gdk_display_get_device_manager (display);
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
/* FIXME: Should this be generic to all backends? */
/* FIXME: What happens with extended devices? */
diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c
index f1e6f01..20ed550 100644
--- a/gdk/x11/gdkdevicemanager-core.c
+++ b/gdk/x11/gdkdevicemanager-core.c
@@ -38,8 +38,8 @@
static void gdk_device_manager_core_finalize (GObject *object);
static void gdk_device_manager_core_constructed (GObject *object);
-static GList * gdk_device_manager_core_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type);
+static GList * gdk_device_manager_core_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type);
static void gdk_device_manager_event_translator_init (GdkEventTranslatorIface *iface);
@@ -61,7 +61,7 @@ gdk_device_manager_core_class_init (GdkDeviceManagerCoreClass *klass)
object_class->finalize = gdk_device_manager_core_finalize;
object_class->constructed = gdk_device_manager_core_constructed;
- device_manager_class->get_devices = gdk_device_manager_core_get_devices;
+ device_manager_class->list_devices = gdk_device_manager_core_list_devices;
}
static void
@@ -877,8 +877,8 @@ gdk_device_manager_core_translate_event (GdkEventTranslator *translator,
}
static GList *
-gdk_device_manager_core_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type)
+gdk_device_manager_core_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type)
{
GdkDeviceManagerCore *device_manager_core;
GList *devices = NULL;
diff --git a/gdk/x11/gdkdevicemanager-xi.c b/gdk/x11/gdkdevicemanager-xi.c
index 7391373..95143a3 100644
--- a/gdk/x11/gdkdevicemanager-xi.c
+++ b/gdk/x11/gdkdevicemanager-xi.c
@@ -55,8 +55,8 @@ static gboolean gdk_device_manager_xi_translate_event (GdkEventTranslator *trans
GdkDisplay *display,
GdkEvent *event,
XEvent *xevent);
-static GList * gdk_device_manager_xi_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type);
+static GList * gdk_device_manager_xi_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type);
G_DEFINE_TYPE_WITH_CODE (GdkDeviceManagerXI, gdk_device_manager_xi, GDK_TYPE_DEVICE_MANAGER_CORE,
@@ -79,7 +79,7 @@ gdk_device_manager_xi_class_init (GdkDeviceManagerXIClass *klass)
object_class->set_property = gdk_device_manager_xi_set_property;
object_class->get_property = gdk_device_manager_xi_get_property;
- device_manager_class->get_devices = gdk_device_manager_xi_get_devices;
+ device_manager_class->list_devices = gdk_device_manager_xi_list_devices;
g_object_class_install_property (object_class,
PROP_EVENT_BASE,
@@ -630,13 +630,13 @@ gdk_device_manager_xi_translate_event (GdkEventTranslator *translator,
}
static GList *
-gdk_device_manager_xi_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type)
+gdk_device_manager_xi_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type)
{
GdkDeviceManagerXIPrivate *priv;
if (type == GDK_DEVICE_TYPE_MASTER)
- return GDK_DEVICE_MANAGER_CLASS (gdk_device_manager_xi_parent_class)->get_devices (device_manager, type);
+ return GDK_DEVICE_MANAGER_CLASS (gdk_device_manager_xi_parent_class)->list_devices (device_manager, type);
else if (type == GDK_DEVICE_TYPE_FLOATING)
{
priv = GDK_DEVICE_MANAGER_XI_GET_PRIVATE (device_manager);
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 74234be..ca25185 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -34,8 +34,8 @@
static void gdk_device_manager_xi2_constructed (GObject *object);
static void gdk_device_manager_xi2_finalize (GObject *object);
-static GList * gdk_device_manager_xi2_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type);
+static GList * gdk_device_manager_xi2_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type);
static void gdk_device_manager_xi2_event_translator_init (GdkEventTranslatorIface *iface);
@@ -63,7 +63,7 @@ gdk_device_manager_xi2_class_init (GdkDeviceManagerXI2Class *klass)
object_class->constructed = gdk_device_manager_xi2_constructed;
object_class->finalize = gdk_device_manager_xi2_finalize;
- device_manager_class->get_devices = gdk_device_manager_xi2_get_devices;
+ device_manager_class->list_devices = gdk_device_manager_xi2_list_devices;
}
static void
@@ -391,8 +391,8 @@ gdk_device_manager_xi2_finalize (GObject *object)
}
static GList *
-gdk_device_manager_xi2_get_devices (GdkDeviceManager *device_manager,
- GdkDeviceType type)
+gdk_device_manager_xi2_list_devices (GdkDeviceManager *device_manager,
+ GdkDeviceType type)
{
GdkDeviceManagerXI2 *device_manager_xi2;
GList *list = NULL;
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index e0c36ad..08813d7 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1128,7 +1128,7 @@ _gdk_input_init (GdkDisplay *display)
/* For backwards compatibility, just add
* floating devices that are not keyboards.
*/
- list = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_FLOATING);
+ list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING);
for (l = list; l; l = l->next)
{
@@ -1145,7 +1145,7 @@ _gdk_input_init (GdkDisplay *display)
/* Now set "core" pointer to the first
* master device that is a pointer.
*/
- list = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
for (l = list; l; l = l->next)
{
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 7d1a667..3e46b6b 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -208,9 +208,9 @@ _gdk_xgrab_check_unmap (GdkWindow *window,
device_manager = gdk_display_get_device_manager (display);
/* Get all devices */
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
- devices = g_list_concat (devices, gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
- devices = g_list_concat (devices, gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
/* End all grabs on the newly hidden window */
for (d = devices; d; d = d->next)
@@ -237,9 +237,9 @@ _gdk_xgrab_check_destroy (GdkWindow *window)
device_manager = gdk_display_get_device_manager (display);
/* Get all devices */
- devices = gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
- devices = g_list_concat (devices, gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
- devices = g_list_concat (devices, gdk_device_manager_get_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
for (d = devices; d; d = d->next)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]