[maemo-commits] [maemo-commits] r14082 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-25 17:02:19 +0300 (Tue, 25 Sep 2007)
New Revision: 14082

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkentry.c
Log:
Make the entry truncate multiline pastes if MAEMO_CHANGES is defined.

2007-09-25  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkentry.c (gtk_entry_class_init, gtk_entry_init): Make the
	entry truncate multiline pastes if MAEMO_CHANGES is defined.
	NB#70531


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-25 13:58:45 UTC (rev 14081)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-25 14:02:19 UTC (rev 14082)
@@ -1,3 +1,9 @@
+2007-09-25  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkentry.c (gtk_entry_class_init, gtk_entry_init): Make the
+	entry truncate multiline pastes if MAEMO_CHANGES is defined.
+	NB#70531
+
 2007-09-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup,

Modified: projects/haf/trunk/gtk+/gtk/gtkentry.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentry.c	2007-09-25 13:58:45 UTC (rev 14081)
+++ projects/haf/trunk/gtk+/gtk/gtkentry.c	2007-09-25 14:02:19 UTC (rev 14082)
@@ -608,7 +608,11 @@
                                    g_param_spec_boolean ("truncate-multiline",
                                                          P_("Truncate multiline"),
                                                          P_("Whether to truncate multiline pastes to one line."),
+#ifdef MAEMO_CHANGES
+							 TRUE,
+#else /* MAEMO_CHANGES */
                                                          FALSE,
+#endif /* MAEMO_CHANGES */
                                                          GTK_PARAM_READWRITE));
 
 #ifdef MAEMO_CHANGES
@@ -1155,7 +1159,11 @@
   entry->is_cell_renderer = FALSE;
   entry->editing_canceled = FALSE;
   entry->has_frame = TRUE;
+#ifdef MAEMO_CHANGES
+  entry->truncate_multiline = TRUE;
+#else /* MAEMO_CHANGES */
   entry->truncate_multiline = FALSE;
+#endif /* MAEMO_CHANGES */
   priv->xalign = 0.0;
 
   gtk_drag_dest_set (GTK_WIDGET (entry),