add some lame code to handle G_MININT, fixes #57424

2001-09-07  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes
	#57424

diff --git a/ChangeLog b/ChangeLog
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7953464708025a1bc2c978094def411e03e57347..d3e1d193102e523dd7180831c79dd25c21e33386 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
 Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index af947d105eb8738a7b6d769e18d3d6c4e1d8aac1..ae52c76d170c6ad614723a2a58c3859cfd2aacb3 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -31,6 +31,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#define FIX_OVERFLOWS(varname) if ((varname) == G_MININT) (varname) = G_MININT + 1
+
 typedef struct _GtkTextRealIter GtkTextRealIter;
 
 struct _GtkTextRealIter
@@ -2173,6 +2175,8 @@ gtk_text_iter_forward_chars (GtkTextIter *iter, gint count)
 
   g_return_val_if_fail (iter != NULL, FALSE);
 
+  FIX_OVERFLOWS (count);
+  
   real = gtk_text_iter_make_real (iter);
 
   if (real == NULL)
@@ -2243,6 +2247,8 @@ gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
 
   g_return_val_if_fail (iter != NULL, FALSE);
 
+  FIX_OVERFLOWS (count);
+  
   real = gtk_text_iter_make_real (iter);
 
   if (real == NULL)
@@ -2391,7 +2397,7 @@ gtk_text_iter_forward_line (GtkTextIter *iter)
   GtkTextRealIter *real;
 
   g_return_val_if_fail (iter != NULL, FALSE);
-
+  
   real = gtk_text_iter_make_real (iter);
 
   if (real == NULL)
@@ -2496,6 +2502,8 @@ gtk_text_iter_backward_line (GtkTextIter *iter)
 gboolean
 gtk_text_iter_forward_lines (GtkTextIter *iter, gint count)
 {
+  FIX_OVERFLOWS (count);
+  
   if (count < 0)
     return gtk_text_iter_backward_lines (iter, 0 - count);
   else if (count == 0)
@@ -2525,6 +2533,8 @@ gtk_text_iter_forward_lines (GtkTextIter *iter, gint count)
 gboolean
 gtk_text_iter_backward_lines (GtkTextIter *iter, gint count)
 {
+  FIX_OVERFLOWS (count);
+  
   if (count < 0)
     return gtk_text_iter_forward_lines (iter, 0 - count);
   else if (count == 0)
@@ -2864,6 +2874,8 @@ gtk_text_iter_forward_word_ends (GtkTextIter      *iter,
 {
   g_return_val_if_fail (iter != NULL, FALSE);
 
+  FIX_OVERFLOWS (count);
+  
   if (count == 0)
     return FALSE;
 
@@ -2898,6 +2910,8 @@ gtk_text_iter_backward_word_starts (GtkTextIter      *iter,
 {
   g_return_val_if_fail (iter != NULL, FALSE);
 
+  FIX_OVERFLOWS (count);
+  
   if (count < 0)
     return gtk_text_iter_forward_word_ends (iter, -count);
 
@@ -3223,6 +3237,8 @@ gtk_text_iter_forward_cursor_positions (GtkTextIter *iter,
 {
   g_return_val_if_fail (iter != NULL, FALSE);
 
+  FIX_OVERFLOWS (count);
+  
   if (count == 0)
     return FALSE;
   
@@ -3258,6 +3274,8 @@ gtk_text_iter_backward_cursor_positions (GtkTextIter *iter,
 {
   g_return_val_if_fail (iter != NULL, FALSE);
 
+  FIX_OVERFLOWS (count);
+  
   if (count == 0)
     return FALSE;