[gucharmap] gucharmap: Use new workarea API

[Christian Persch <chpe src gnome org>]

commit ee12cb650be2406bf60f3e1a41331a66a18fe808
Author: Christian Persch <chpe gnome org>
Date:   Mon Dec 19 14:57:35 2011 +0100

    gucharmap: Use new workarea API

 docs/reference/tmpl/gucharmap-chartable.sgml    |   13 ++-----------
 docs/reference/tmpl/gucharmap-unicode-info.sgml |   23 ++++++++++++-----------
 docs/reference/tmpl/gucharmap-unused.sgml       |    9 +++++++++
 gucharmap/gucharmap-chartable.c                 |    4 ++++
 gucharmap/main.c                                |    4 ++++
 5 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/docs/reference/tmpl/gucharmap-chartable.sgml b/docs/reference/tmpl/gucharmap-chartable.sgml
index d62fa0b..136263d 100644
--- a/docs/reference/tmpl/gucharmap-chartable.sgml
+++ b/docs/reference/tmpl/gucharmap-chartable.sgml
@@ -63,15 +63,6 @@ GucharmapChartable
 
 @gucharmapchartable: the object which received the signal.
 
-<!-- ##### SIGNAL GucharmapChartable::set-scroll-adjustments ##### -->
-<para>
-
-</para>
-
- gucharmapchartable: the object which received the signal.
- arg1: 
- arg2: 
-
 <!-- ##### SIGNAL GucharmapChartable::status-message ##### -->
 <para>
 
@@ -166,7 +157,7 @@ GucharmapChartable
 </para>
 
 @chartable: 
- uc: 
+ wc: 
 
 
 <!-- ##### FUNCTION gucharmap_chartable_set_zoom_enabled ##### -->
@@ -202,7 +193,7 @@ GucharmapChartable
 </para>
 
 @chartable: 
- list: 
+ codepoint_list: 
 
 
 <!-- ##### FUNCTION gucharmap_chartable_get_codepoint_list ##### -->
diff --git a/docs/reference/tmpl/gucharmap-unicode-info.sgml b/docs/reference/tmpl/gucharmap-unicode-info.sgml
index 806d803..3279804 100644
--- a/docs/reference/tmpl/gucharmap-unicode-info.sgml
+++ b/docs/reference/tmpl/gucharmap-unicode-info.sgml
@@ -38,6 +38,7 @@ gucharmap-unicode-info
 @GUCHARMAP_UNICODE_VERSION_5_1: 
 @GUCHARMAP_UNICODE_VERSION_5_2: 
 @GUCHARMAP_UNICODE_VERSION_6_0: 
+ GUCHARMAP_UNICODE_VERSION_6_1: 
 @GUCHARMAP_UNICODE_VERSION_LATEST: 
 
 <!-- ##### FUNCTION gucharmap_get_unicode_name ##### -->
@@ -72,7 +73,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -162,7 +163,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -171,7 +172,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -180,7 +181,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -189,7 +190,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -198,7 +199,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -207,7 +208,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -216,7 +217,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @outbuf: 
 @Returns: 
 
@@ -226,7 +227,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -235,7 +236,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
@@ -244,7 +245,7 @@ gucharmap-unicode-info
 
 </para>
 
- wc: 
+ uc: 
 @Returns: 
 
 
diff --git a/docs/reference/tmpl/gucharmap-unused.sgml b/docs/reference/tmpl/gucharmap-unused.sgml
index 338be31..28f5f8a 100644
--- a/docs/reference/tmpl/gucharmap-unused.sgml
+++ b/docs/reference/tmpl/gucharmap-unused.sgml
@@ -63,6 +63,15 @@ gucharmap
 </para>
 
 
+<!-- ##### SIGNAL GucharmapChartable::set-scroll-adjustments ##### -->
+<para>
+
+</para>
+
+ gucharmapchartable: the object which received the signal.
+ arg1: 
+ arg2: 
+
 <!-- ##### FUNCTION gucharmap_charmap_set_font ##### -->
 <para>
 
diff --git a/gucharmap/gucharmap-chartable.c b/gucharmap/gucharmap-chartable.c
index be25fec..2ae3a48 100644
--- a/gucharmap/gucharmap-chartable.c
+++ b/gucharmap/gucharmap-chartable.c
@@ -309,7 +309,11 @@ position_rectangle_on_screen (GtkWidget *widget,
   monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
   if (monitor_num < 0)
     monitor_num = 0;
+#if GTK_CHECK_VERSION (3, 3, 5)
+  gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
+#else
   gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+#endif
 
   for (i = 0; i < G_N_ELEMENTS (positions); ++i) {
     if (position_rectangle (rectangle, target_rect, &monitor, positions[i], direction))
diff --git a/gucharmap/main.c b/gucharmap/main.c
index cb50871..a6e3c1b 100644
--- a/gucharmap/main.c
+++ b/gucharmap/main.c
@@ -89,7 +89,11 @@ main (int argc, char **argv)
 
   screen = gtk_window_get_screen (GTK_WINDOW (window));
   monitor = gdk_screen_get_monitor_at_point (screen, 0, 0);
+#if GTK_CHECK_VERSION (3, 3, 5)
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+#else
   gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+#endif
   gtk_window_set_default_size (GTK_WINDOW (window), rect.width * 9/16, rect.height * 9/16);
 
   /* No --font argument, use the stored font (if any) */