[gtk+/gdk-backend-quartz: 29/29] Deal with property encoding functions for quartz
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend-quartz: 29/29] Deal with property encoding functions for quartz
- Date: Wed, 22 Dec 2010 02:33:26 +0000 (UTC)
commit faf5002b8f38b149bd89e3225636f27b8beb5922
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Dec 17 13:34:04 2010 -0500
Deal with property encoding functions for quartz
gdk/quartz/gdkdisplay-quartz.c | 2 +
gdk/quartz/gdkprivate-quartz.h | 9 +++++
gdk/quartz/gdkselection-quartz.c | 67 +++++--------------------------------
3 files changed, 20 insertions(+), 58 deletions(-)
---
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index fa31e36..b66effa 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -259,4 +259,6 @@ _gdk_display_quartz_class_init (GdkDisplayQuartz *class)
display_class->send_selection_notify = _gdk_quartz_display_send_selection_notify;
display_class->get_selection_property = _gdk_quartz_display_get_selection_property;
display_class->convert_selection = _gdk_quartz_display_convert_selection;
+ display_class->text_property_to_utf8_list = _gdk_quartz_display_text_property_to_utf8_list;
+ display_class->utf8_to_string_target = _gdk_quartz_display_utf8_to_string_target;
}
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 8e2d811..d61ccf4 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -299,5 +299,14 @@ void _gdk_quartz_display_convert_selection (GdkDisplay *display,
GdkAtom selection,
GdkAtom target,
guint32 time);
+gint _gdk_quartz_display_text_property_to_utf8_list (GdkDisplay *display,
+ GdkAtom encoding,
+ gint format,
+ const guchar *text,
+ gint length,
+ gchar ***list);
+gchar * _gdk_quartz_display_utf8_to_string_target (GdkDisplay *displayt,
+ const gchar *str);
+
#endif /* __GDK_PRIVATE_QUARTZ_H__ */
diff --git a/gdk/quartz/gdkselection-quartz.c b/gdk/quartz/gdkselection-quartz.c
index 486c523..473d24d 100644
--- a/gdk/quartz/gdkselection-quartz.c
+++ b/gdk/quartz/gdkselection-quartz.c
@@ -76,63 +76,14 @@ _gdk_quartz_display_send_selection_send_notify (GdkDisplay *display,
/* FIXME: Implement */
}
-gint
-gdk_text_property_to_text_list_for_display (GdkDisplay *display,
- GdkAtom encoding,
- gint format,
- const guchar *text,
- gint length,
- gchar ***list)
-{
- /* FIXME: Implement */
- return 0;
-}
-
-gint
-gdk_string_to_compound_text_for_display (GdkDisplay *display,
- const gchar *str,
- GdkAtom *encoding,
- gint *format,
- guchar **ctext,
- gint *length)
-{
- /* FIXME: Implement */
- return 0;
-}
-
-void gdk_free_compound_text (guchar *ctext)
-{
- /* FIXME: Implement */
-}
-
gchar *
-gdk_utf8_to_string_target (const gchar *str)
+_gdk_quartz_display_utf8_to_string_target (GdkDisplay *display,
+ const gchar *str)
{
/* FIXME: Implement */
return NULL;
}
-gboolean
-gdk_utf8_to_compound_text_for_display (GdkDisplay *display,
- const gchar *str,
- GdkAtom *encoding,
- gint *format,
- guchar **ctext,
- gint *length)
-{
- /* FIXME: Implement */
- return 0;
-}
-
-void
-gdk_free_text_list (gchar **list)
-{
- g_return_if_fail (list != NULL);
-
- g_free (*list);
- g_free (list);
-}
-
static gint
make_list (const gchar *text,
gint length,
@@ -202,13 +153,13 @@ make_list (const gchar *text,
return n_strings;
}
-gint
-gdk_text_property_to_utf8_list_for_display (GdkDisplay *display,
- GdkAtom encoding,
- gint format,
- const guchar *text,
- gint length,
- gchar ***list)
+gint
+_gdk_quartz_display_text_property_to_utf8_list (GdkDisplay *display,
+ GdkAtom encoding,
+ gint format,
+ const guchar *text,
+ gint length,
+ gchar ***list)
{
g_return_val_if_fail (text != NULL, 0);
g_return_val_if_fail (length >= 0, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]