[gucharmap] Some trivial fixups

[Ryan Lortie <ryanl src gnome org>]

commit 3bca4bf448e3a0ba2c22298c81da871457f8e06c
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jan 27 09:53:41 2012 -0500

    Some trivial fixups
    
    Stop using a couple of deprecated symbols and fix a couple other
    warnings.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668846

 gucharmap/gucharmap-charmap.c              |    8 ++------
 gucharmap/gucharmap-chartable-accessible.c |    6 +++---
 gucharmap/gucharmap-search-dialog.c        |    2 +-
 gucharmap/gucharmap-window.c               |    4 +---
 4 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/gucharmap/gucharmap-charmap.c b/gucharmap/gucharmap-charmap.c
index c2e371f..ea088c7 100644
--- a/gucharmap/gucharmap-charmap.c
+++ b/gucharmap/gucharmap-charmap.c
@@ -79,8 +79,8 @@ gucharmap_charmap_finalize (GObject *object)
   GucharmapCharmap *charmap = GUCHARMAP_CHARMAP (object);
   GucharmapCharmapPrivate *priv = charmap->priv;
 
-  gdk_cursor_unref (priv->hand_cursor);
-  gdk_cursor_unref (priv->regular_cursor);
+  g_object_unref (priv->hand_cursor);
+  g_object_unref (priv->regular_cursor);
 
   if (priv->font_desc)
     pango_font_description_free (priv->font_desc);
@@ -947,12 +947,9 @@ set_cursor_if_appropriate (GucharmapCharmap *charmap,
 {
   GucharmapCharmapPrivate *priv = charmap->priv;
   GSList *tags = NULL, *tagp = NULL;
-  GtkTextBuffer *buffer;
   GtkTextIter iter;
   gboolean hovering_over_link = FALSE;
 
-  buffer = gtk_text_view_get_buffer (priv->details_view);
-
   gtk_text_view_get_iter_at_location (priv->details_view,
                                       &iter, x, y);
 
@@ -1000,7 +997,6 @@ details_motion_notify_event (GtkWidget *text_view,
 
   set_cursor_if_appropriate (charmap, x, y);
 
-  gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
   return FALSE;
 }
 
diff --git a/gucharmap/gucharmap-chartable-accessible.c b/gucharmap/gucharmap-chartable-accessible.c
index 97f0a65..641a07b 100644
--- a/gucharmap/gucharmap-chartable-accessible.c
+++ b/gucharmap/gucharmap-chartable-accessible.c
@@ -420,9 +420,9 @@ gucharmap_chartable_accessible_set_scroll_adjustments (GucharmapChartable *chart
 }
 
 static void
-sync_adjustment (GucharmapChartable           *chartable,
-                 GParamSpec                   *pspec,
-                 GucharmapChartableAccessible *accessible)
+sync_adjustment (GucharmapChartable *chartable,
+                 GParamSpec         *pspec,
+                 AtkObject          *accessible)
 {
   GtkAdjustment *hadjustment, *vadjustment;
 
diff --git a/gucharmap/gucharmap-search-dialog.c b/gucharmap/gucharmap-search-dialog.c
index e71070c..59044ab 100644
--- a/gucharmap/gucharmap-search-dialog.c
+++ b/gucharmap/gucharmap-search-dialog.c
@@ -618,7 +618,7 @@ _gucharmap_search_dialog_fire_search (GucharmapSearchDialog *search_dialog,
 
   cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (search_dialog)), GDK_WATCH);
   gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (search_dialog)), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 
   list = gucharmap_charmap_get_book_codepoint_list (priv->guw->charmap);
   if (!list)
diff --git a/gucharmap/gucharmap-window.c b/gucharmap/gucharmap-window.c
index cf52e12..92af5d1 100644
--- a/gucharmap/gucharmap-window.c
+++ b/gucharmap/gucharmap-window.c
@@ -179,7 +179,7 @@ search_start (GucharmapSearchDialog *search_dialog,
 
   cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (guw)), GDK_WATCH);
   gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (guw)), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 
   action = gtk_action_group_get_action (guw->action_group, "Find");
   gtk_action_set_sensitive (action, FALSE);
@@ -472,7 +472,6 @@ next_or_prev_character (GtkAction       *action,
 {
   GucharmapChartable *chartable;
   GucharmapChartableClass *klass;
-  GtkBindingSet *binding_set;
   const char *name;
   guint keyval = 0;
 
@@ -485,7 +484,6 @@ next_or_prev_character (GtkAction       *action,
 
   chartable = gucharmap_charmap_get_chartable (guw->charmap);
   klass = GUCHARMAP_CHARTABLE_GET_CLASS (chartable);
-  binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_set_activate (gtk_binding_set_by_class (klass),
                             keyval,
                             0,