Re: pspp 0.6.2 and gtk2

[Ben Pfaff]

Here's the fix that Jeremy described to me earlier today.
Jeremy, can you confirm that this solves the problem.  John, does
this look good?

This will have to wait for Savannah to come back up before I can
actually push it, anyhow.

Thanks,

Ben.

--8<--------------------------cut here-------------------------->8--

From: Ben Pfaff <address@hidden>
Date: Tue, 30 Nov 2010 20:29:59 -0800
Subject: [PATCH] gtksheet: Fix name collision with GTK+ 2.22.

This just adds a "pspp_" prefix to gtk_entry_reset_im_context().

Bug report and fix from Jeremy Lavergne <address@hidden>.
---
 lib/gtksheet/gtkitementry.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/gtksheet/gtkitementry.c b/lib/gtksheet/gtkitementry.c
index 703215c..c7c211e 100644
--- a/lib/gtksheet/gtkitementry.c
+++ b/lib/gtksheet/gtkitementry.c
@@ -145,7 +145,7 @@ static void         gtk_entry_draw_cursor              
(GtkEntry       *entry,
 static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
                                                         gboolean        
include_preedit);
 static void         gtk_entry_queue_draw               (GtkEntry       *entry);
-static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
+static void         pspp_gtk_entry_reset_im_context    (GtkEntry       *entry);
 static void         gtk_entry_recompute                (GtkEntry       *entry);
 static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
                                                        CursorType      type,
@@ -694,7 +694,7 @@ gtk_entry_real_set_position (GtkEditable *editable,
   if (position != entry->current_pos ||
       position != entry->selection_bound)
     {
-      gtk_entry_reset_im_context (entry);
+      pspp_gtk_entry_reset_im_context (entry);
       gtk_entry_set_positions (entry, position, position);
     }
 }
@@ -895,7 +895,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
 {
   gint new_pos = entry->current_pos;
 
-  gtk_entry_reset_im_context (entry);
+  pspp_gtk_entry_reset_im_context (entry);
 
   if (entry->current_pos != entry->selection_bound && !extend_selection)
     {
@@ -989,7 +989,7 @@ gtk_entry_insert_at_cursor (GtkEntry    *entry,
 
   if (entry->editable)
     {
-      gtk_entry_reset_im_context (entry);
+      pspp_gtk_entry_reset_im_context (entry);
 
       gtk_editable_insert_text (editable, str, -1, &pos);
       gtk_editable_set_position (editable, pos);
@@ -1005,7 +1005,7 @@ gtk_entry_delete_from_cursor (GtkEntry       *entry,
   gint start_pos = entry->current_pos;
   gint end_pos = entry->current_pos;
 
-  gtk_entry_reset_im_context (entry);
+  pspp_gtk_entry_reset_im_context (entry);
 
   if (!entry->editable)
     return;
@@ -1777,7 +1777,7 @@ gtk_entry_queue_draw (GtkEntry *entry)
 }
 
 static void
-gtk_entry_reset_im_context (GtkEntry *entry)
+pspp_gtk_entry_reset_im_context (GtkEntry *entry)
 {
   if (entry->need_im_reset)
     {
-- 
Ben Pfaff 
http://benpfaff.org