[maemo-commits] [maemo-commits] r9626 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-02-05 12:39:26 +0200 (Mon, 05 Feb 2007)
New Revision: 9626

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.h
Log:
2007-02-05  Michael Natterer  <mitch at imendio.com>

	Merge from upstream:

	* gtk/gtktextbuffer.h (enum GtkTextBufferTargetInfo): changed
	values from G_MAXUINT-0, -1, -2 to -1, -2, -3 so we stay within
	ansi C enum value limits. Fixes bug #46757.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-05 10:26:10 UTC (rev 9625)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-05 10:39:26 UTC (rev 9626)
@@ -1,3 +1,11 @@
+2007-02-05  Michael Natterer  <mitch at imendio.com>
+
+	Merge from upstream:
+
+	* gtk/gtktextbuffer.h (enum GtkTextBufferTargetInfo): changed
+	values from G_MAXUINT-0, -1, -2 to -1, -2, -3 so we stay within
+	ansi C enum value limits. Fixes bug #46757.
+
 2007-02-02  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_collapse_cursor_row):

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.h	2007-02-05 10:26:10 UTC (rev 9625)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.h	2007-02-05 10:39:26 UTC (rev 9626)
@@ -49,9 +49,9 @@
  */
 typedef enum
 {
-  GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS = G_MAXUINT - 0,
-  GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT       = G_MAXUINT - 1,
-  GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = G_MAXUINT - 2
+  GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS = - 1,
+  GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT       = - 2,
+  GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = - 3
 } GtkTextBufferTargetInfo;
 
 typedef struct _GtkTextBTree GtkTextBTree;