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

Tue Jan 23 16:13:38 EET 2007

Author: mitch
Date: 2007-01-23 16:13:34 +0200 (Tue, 23 Jan 2007)
New Revision: 9271

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.h
Log:
2007-01-23  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkentry.[ch]
	* gtk/gtktextview.[ch]: conditionalize maemo changes with
	MAEMO_CHANGES.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================

--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 14:09:07 UTC (rev 9270)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 14:13:34 UTC (rev 9271)
@@ -1,6 +1,12 @@
+2007-01-23  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkentry.[ch]
+	* gtk/gtktextview.[ch]: conditionalize maemo changes with
+	MAEMO_CHANGES.
+
 Tue Jan 23 14:59:06 2007  Tim Janik  <timj at imendio.com>
 
-	* gtk/gtkmenushell.h: conditionalize maemo chanegs with MAEMO_CHANGES.
+	* gtk/gtkmenushell.h: conditionalize maemo changes with MAEMO_CHANGES.
 
 Tue Jan 23 14:33:33 2007  Tim Janik  <timj at imendio.com>
 
@@ -13,7 +19,7 @@
 	* gtk/gtktoolbutton.h:
 	* gtk/gtkcontainer.c:
 	* gtk/gtkbutton.[hc]:
-	* gtk/gtkmenu.[hc]: conditionalize maemo chanegs with MAEMO_CHANGES.
+	* gtk/gtkmenu.[hc]: conditionalize maemo changes with MAEMO_CHANGES.
 
 Tue Jan 23 13:54:49 2007  Tim Janik  <timj at imendio.com>
 
@@ -21,12 +27,12 @@
 	* gtk/gtkwidget.[hc]:
 	* gtk/gtkrange.[hc]:
 	* gtk/gtkstyle.[hc]:
-	* gtk/gtkrc.[hc]: conditionalize maemo chanegs with MAEMO_CHANGES.
+	* gtk/gtkrc.[hc]: conditionalize maemo changes with MAEMO_CHANGES.
 
 Tue Jan 23 13:49:31 2007  Tim Janik  <timj at imendio.com>
 
 	* gdk/x11/gdkwindow-x11.c: 
-	* gdk/gdkwindow.h: conditionalize maemo chanegs with MAEMO_CHANGES.
+	* gdk/gdkwindow.h: conditionalize maemo changes with MAEMO_CHANGES.
 
 Tue Jan 23 13:16:20 2007  Tim Janik  <timj at imendio.com>
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.c	2007-01-23 14:09:07 UTC (rev 9270)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.c	2007-01-23 14:13:34 UTC (rev 9271)
@@ -105,9 +105,9 @@
   COPY_CLIPBOARD,
   PASTE_CLIPBOARD,
   TOGGLE_OVERWRITE,
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   INVALID_INPUT,
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
   LAST_SIGNAL
 };
 
@@ -127,9 +127,9 @@
   PROP_TEXT,
   PROP_XALIGN,
   PROP_TRUNCATE_MULTILINE
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   , PROP_HILDON_INPUT_MODE
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -287,13 +287,13 @@
 						   gint          offset,
 						   gint          n_chars,
 						   GtkEntry     *entry);
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 static gboolean gtk_entry_has_selection_cb        (GtkIMContext *context,
                                                    GtkEntry     *entry);
 static void     gtk_entry_clipboard_operation_cb  (GtkIMContext *context,
                                                    GtkIMContextClipboardOperation op,
                                                    GtkEntry     *entry);
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 /* Internal routines
  */
@@ -606,7 +606,7 @@
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /**
    * GtkEntry:hildon-input-mode:
    *
@@ -623,7 +623,7 @@
                                                        HILDON_GTK_INPUT_MODE_FULL |
                                                        HILDON_GTK_INPUT_MODE_AUTOCAP,
                                                        GTK_PARAM_READWRITE));
-  /* MAEMO START */
+#endif /* MAEMO_CHANGES */
  
   signals[POPULATE_POPUP] =
     g_signal_new (I_("populate_popup"),
@@ -725,7 +725,7 @@
 		  _gtk_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /**
    * GtkEntry::invalid-input:
    *
@@ -744,7 +744,7 @@
                   _gtk_marshal_VOID__ENUM,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_INVALID_INPUT_TYPE);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   /*
    * Key bindings
@@ -919,7 +919,7 @@
 						       TRUE,
 						       GTK_PARAM_READWRITE));
 
-   /* MAEMO START */
+#ifdef MAEMO_CHANGES
    /**
     * GtkEntry:icon-width:
     *
@@ -935,7 +935,7 @@
                                                               G_MAXINT,
                                                               0,
                                                               GTK_PARAM_READWRITE));
-   /* MAEMO_END */
+#endif /* MAEMO_CHANGES */
 
   /**
    * GtkSettings:gtk-entry-password-hint-timeout:
@@ -1016,8 +1016,7 @@
       break;
       
     case PROP_VISIBILITY:
-      /* MAEMO START */
-      /* gtk_entry_set_visibility (entry, g_value_get_boolean (value)); */
+#ifdef MAEMO_CHANGES
       {
         /* converting to hildon input mode first then through
          * that mode changing function to reach compatible with
@@ -1032,7 +1031,9 @@
 
         hildon_gtk_entry_set_input_mode (entry, mode);
       }
-      /* MAEMO END */
+#else
+      gtk_entry_set_visibility (entry, g_value_get_boolean (value));
+#endif /* MAEMO_CHANGES */
       break;
 
     case PROP_HAS_FRAME:
@@ -1067,11 +1068,11 @@
       entry->truncate_multiline = g_value_get_boolean (value);
       break;
 
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
     case PROP_HILDON_INPUT_MODE:
       hildon_gtk_entry_set_input_mode (entry, g_value_get_flags (value));
       break;
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
     case PROP_SCROLL_OFFSET:
     case PROP_CURSOR_POSITION:
@@ -1133,11 +1134,11 @@
     case PROP_TRUNCATE_MULTILINE:
       g_value_set_boolean (value, entry->truncate_multiline);
       break;
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
     case PROP_HILDON_INPUT_MODE:
       g_value_set_flags (value, hildon_gtk_entry_get_input_mode (entry));
       break;
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1186,12 +1187,12 @@
 		    G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry);
   g_signal_connect (entry->im_context, "delete_surrounding",
 		    G_CALLBACK (gtk_entry_delete_surrounding_cb), entry);
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   g_signal_connect (entry->im_context, "has_selection",
                     G_CALLBACK (gtk_entry_has_selection_cb), entry);
   g_signal_connect (entry->im_context, "clipboard_operation",
                     G_CALLBACK (gtk_entry_clipboard_operation_cb), entry);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 }
 
 /*
@@ -1394,11 +1395,11 @@
   gint xborder, yborder;
   GtkBorder inner_border;
   PangoContext *context;
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   gint icon_width;
 
   gtk_widget_style_get (widget, "icon-width", &icon_width, NULL);
-  /* MAEMO_END */
+#endif /* MAEMO_CHANGES */
   
   gtk_widget_ensure_style (widget);
   context = gtk_widget_get_pango_context (widget);
@@ -1423,9 +1424,9 @@
       requisition->width = char_pixels * entry->width_chars + xborder * 2 + inner_border.left + inner_border.right;
     }
     
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   requisition->width += icon_width;
-  /* MAEMO_END */
+#endif /* MAEMO_CHANGES */
   requisition->height = PANGO_PIXELS (entry->ascent + entry->descent) + yborder * 2 + inner_border.top + inner_border.bottom;
 
   pango_font_metrics_unref (metrics);
@@ -1441,24 +1442,32 @@
   gint xborder, yborder;
   GtkRequisition requisition;
   GtkWidget *widget = GTK_WIDGET (entry);
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   gint icon_width;
 
   gtk_widget_style_get (widget, "icon-width", &icon_width, NULL);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   gtk_widget_get_child_requisition (widget, &requisition);
 
   _gtk_entry_get_borders (entry, &xborder, &yborder);
 
   if (x)
-    *x = xborder /* MAEMO START */ + icon_width /* MAEMO END */;
+#ifdef MAEMO_CHANGES
+    *x = xborder + icon_width;
+#else
+    *x = xborder;
+#endif /* MAEMO_CHANGES */
 
   if (y)
     *y = yborder;
   
   if (width)
-    *width = GTK_WIDGET (entry)->allocation.width - xborder * 2 /* MAEMO START */ - icon_width /* MAEMO END */;
+#ifdef MAEMO_CHANGES
+    *width = GTK_WIDGET (entry)->allocation.width - xborder * 2 - icon_width;
+else
+    *width = GTK_WIDGET (entry)->allocation.width - xborder * 2;
+#endif /* MAEMO_CHANGES */
 
   if (height)
     *height = requisition.height - yborder * 2;
@@ -1708,7 +1717,7 @@
       (entry->button && event->button != entry->button))
     return FALSE;
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   if (entry->editable)
     {
       if (hildon_gtk_im_context_filter_event (entry->im_context,
@@ -1718,7 +1727,7 @@
           return TRUE;
         }
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   entry->button = event->button;
   
@@ -1729,10 +1738,10 @@
       entry->in_click = FALSE;
     }
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /* we need to reset IM context so pre-edit string can be committed */
   _gtk_entry_reset_im_context (entry);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   tmp_pos = gtk_entry_find_position (entry, event->x + entry->scroll_offset);
     
@@ -1745,9 +1754,9 @@
 
       if (event->state & GDK_SHIFT_MASK)
 	{
-          /* MAEMO START */
-	  /* _gtk_entry_reset_im_context (entry); */
-	  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+	  _gtk_entry_reset_im_context (entry);
+#endif /* !MAEMO_CHANGES */
 
 	  if (!have_selection) /* select from the current position to the clicked position */
 	    sel_start = sel_end = entry->current_pos;
@@ -1858,12 +1867,12 @@
     }
   else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
     {
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
       /* FIXME: maemo-gtk-2-6 has some obscure code here to prevent
        * copy/cut for invisible entries, but that code looks bogus, left
        * it out
        */
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
       gtk_entry_do_popup (entry, event);
       entry->button = 0;	/* Don't wait for release, since the menu will gtk_grab_add */
@@ -1883,7 +1892,7 @@
   if (event->window != entry->text_area || entry->button != event->button)
     return FALSE;
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   if (entry->editable)
     {
       if (hildon_gtk_im_context_filter_event (entry->im_context,
@@ -1893,7 +1902,7 @@
           return TRUE;
         }
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (entry->in_drag)
     {
@@ -2377,9 +2386,9 @@
   if (end < 0)
     end = entry->text_length;
 
-  /* MAEMO START */
-  /* _gtk_entry_reset_im_context (entry); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  _gtk_entry_reset_im_context (entry);
+#endif /* !MAEMO_CHANGES */
 
   gtk_entry_set_positions (entry,
 			   MIN (end, entry->text_length),
@@ -2472,7 +2481,7 @@
   g_free (password_hint);
 }
 
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 
 /* Returns TRUE if chr is valid in given input mode. Probably should be made
  * public, but there's no good place for it and the input mode design might
@@ -2547,7 +2556,7 @@
   return TRUE;
 }
 
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 /* Default signal handlers
  */
@@ -2567,22 +2576,23 @@
 
   n_chars = g_utf8_strlen (new_text, new_text_length);
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   if (!gtk_entry_filter_text (entry, new_text, n_chars))
     {
       g_signal_emit (entry, signals[INVALID_INPUT], 0,
                      GTK_INVALID_INPUT_MODE_RESTRICTION);
       return;
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (entry->text_max_length > 0 && n_chars + entry->text_length > entry->text_max_length)
     {
-      /* MAEMO START */
-      /* gtk_widget_error_bell (GTK_WIDGET (entry)); */
+#ifdef MAEMO_CHANGES
       g_signal_emit (entry, signals[INVALID_INPUT], 0,
                      GTK_INVALID_INPUT_MAX_CHARS_REACHED);
-      /* MAEMO END */
+#else
+      gtk_widget_error_bell (GTK_WIDGET (entry));
+#endif /* MAEMO_CHANGES */
 
       n_chars = entry->text_max_length - entry->text_length;
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
@@ -2904,10 +2914,9 @@
   gint end_pos = entry->current_pos;
   gint old_n_bytes = entry->n_bytes;
 
-  /* MAEMO START */
-  /* backspace should not clear the word completion */
-  /* _gtk_entry_reset_im_context (entry); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  _gtk_entry_reset_im_context (entry);
+#endif /* !MAEMO_CHANGES */
 
   if (!entry->editable)
     {
@@ -2983,10 +2992,9 @@
   GtkEditable *editable = GTK_EDITABLE (entry);
   gint prev_pos;
 
-  /* MAEMO START */
-  /* backspace should not clear the word completion */
-  /* _gtk_entry_reset_im_context (entry); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  _gtk_entry_reset_im_context (entry);
+#endif /* !MAEMO_CHANGES */
 
   if (!entry->editable || !entry->text)
     {
@@ -3213,7 +3221,7 @@
   return TRUE;
 }
 
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 
 static gboolean
 gtk_entry_has_selection_cb (GtkIMContext *context,
@@ -3245,7 +3253,7 @@
     }
 }
 
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 /* Internal functions
  */
@@ -3841,17 +3849,15 @@
 void
 _gtk_entry_reset_im_context (GtkEntry *entry)
 {
-  /* MAEMO START */
-#if 0
+#ifdef MAEMO_CHANGES
+  gtk_im_context_reset (entry->im_context);
+#else
   if (entry->need_im_reset)
     {
       entry->need_im_reset = 0;
       gtk_im_context_reset (entry->im_context);
     }
-#endif
-  /* We want reset to be sent more often */
-  gtk_im_context_reset (entry->im_context);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 }
 
 static gint
@@ -4527,9 +4533,9 @@
 {
   g_return_if_fail (GTK_IS_ENTRY (entry));
 
-  /* MAEMO START */
-#if 0
-  /* MAEMO END */
+#ifdef MAEMO_CHANGES
+  g_object_set (G_OBJECT (entry), "visibility", visible, NULL);
+#else
   visible = visible != FALSE;
 
   if (entry->visible != visible)
@@ -4561,13 +4567,10 @@
       g_object_notify (G_OBJECT (entry), "visibility");
       gtk_entry_recompute (entry);
     }
-  /* MAEMO START */
-#endif
-  g_object_set (G_OBJECT (entry), "visibility", visible, NULL);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 }
 
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 static void
 gtk_entry_set_real_visibility (GtkEntry *entry,
                                gboolean visible)
@@ -4579,7 +4582,7 @@
 
    gtk_entry_recompute (entry);
  }
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 /**
  * gtk_entry_get_visibility:
@@ -6176,7 +6179,7 @@
   return completion;
 }
 
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 
 void
 hildon_gtk_entry_set_input_mode (GtkEntry           *entry,
@@ -6208,7 +6211,7 @@
   return mode;
 }
 
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 #define __GTK_ENTRY_C__
 #include "gtkaliasdef.c"

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h	2007-01-23 14:09:07 UTC (rev 9270)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h	2007-01-23 14:13:34 UTC (rev 9271)
@@ -135,18 +135,18 @@
   void (* paste_clipboard)    (GtkEntry       *entry);
   void (* toggle_overwrite)   (GtkEntry       *entry);
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   void (* invalid_input) (GtkEntry            *entry,
                           GtkInvalidInputType  invalid_input_type);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
 
-  /* MAEMO START */
-  /* void (*_gtk_reserved3) (void); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  void (*_gtk_reserved3) (void);
+#endif /* !MAEMO_CHANGES */
 };
 
 GType      gtk_entry_get_type       		(void) G_GNUC_CONST;
@@ -218,11 +218,11 @@
 						 gboolean       editable);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 void               hildon_gtk_entry_set_input_mode (GtkEntry          *entry,
                                                     HildonGtkInputMode input_mode);
 HildonGtkInputMode hildon_gtk_entry_get_input_mode (GtkEntry          *entry);
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 G_END_DECLS
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.c	2007-01-23 14:09:07 UTC (rev 9270)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.c	2007-01-23 14:13:34 UTC (rev 9271)
@@ -146,9 +146,9 @@
   PROP_BUFFER,
   PROP_OVERWRITE,
   PROP_ACCEPTS_TAB,
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   PROP_HILDON_INPUT_MODE,
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
   LAST_PROP
 };
 
@@ -311,13 +311,13 @@
 							    gint           offset,
 							    gint           n_chars,
 							    GtkTextView   *text_view);
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 static gboolean gtk_text_view_has_selection_handler        (GtkIMContext  *context,
                                                             GtkTextView   *text_view);
 static void     gtk_text_view_clipboard_operation_handler  (GtkIMContext  *context,
                                                             GtkIMContextClipboardOperation op,
                                                             GtkTextView   *text_view);
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 static void gtk_text_view_mark_set_handler       (GtkTextBuffer     *buffer,
                                                   const GtkTextIter *location,
@@ -648,7 +648,7 @@
 							 TRUE,
 							 GTK_PARAM_READWRITE));
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /**
    * GtkTextView:hildon-input-mode:
    *
@@ -666,7 +666,7 @@
                                                        HILDON_GTK_INPUT_MODE_FULL |
                                                        HILDON_GTK_INPUT_MODE_AUTOCAP,
                                                        GTK_PARAM_READWRITE));
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   /*
    * Style properties
@@ -1084,12 +1084,12 @@
  		    G_CALLBACK (gtk_text_view_retrieve_surrounding_handler), text_view);
   g_signal_connect (text_view->im_context, "delete_surrounding",
  		    G_CALLBACK (gtk_text_view_delete_surrounding_handler), text_view);
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   g_signal_connect (text_view->im_context, "has_selection",
                     G_CALLBACK (gtk_text_view_has_selection_handler), text_view);
   g_signal_connect (text_view->im_context, "clipboard_operation",
                     G_CALLBACK (gtk_text_view_clipboard_operation_handler), text_view);
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   text_view->cursor_visible = TRUE;
 
@@ -2687,11 +2687,11 @@
       gtk_text_view_set_accepts_tab (text_view, g_value_get_boolean (value));
       break;
 
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
     case PROP_HILDON_INPUT_MODE:
       hildon_gtk_text_view_set_input_mode (text_view, g_value_get_int (value));
       break;
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
     default:
       g_assert_not_reached ();
@@ -2767,11 +2767,11 @@
       g_value_set_boolean (value, text_view->accepts_tab);
       break;
 
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
     case PROP_HILDON_INPUT_MODE:
       g_value_set_int (value, hildon_gtk_text_view_get_input_mode (text_view));
       break;
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -3992,14 +3992,14 @@
 
   gtk_widget_grab_focus (widget);
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   if (text_view->editable &&
       hildon_gtk_im_context_filter_event (text_view->im_context, (GdkEvent*)event))
     {
       text_view->need_im_reset = TRUE;
       return TRUE;
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (event->window != text_view->text_window->bin_window)
     {
@@ -4099,14 +4099,14 @@
   if (event->window != text_view->text_window->bin_window)
     return FALSE;
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   if (text_view->editable &&
       hildon_gtk_im_context_filter_event (text_view->im_context, (GdkEvent*)event))
     {
       text_view->need_im_reset = TRUE;
       return TRUE;
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (event->button == 1)
     {
@@ -4170,9 +4170,9 @@
 		    G_CALLBACK (keymap_direction_changed), text_view);
   gtk_text_view_check_keymap_direction (text_view);
 
-  /* MAEMO START */
-  /* text_view->need_im_reset = TRUE; */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  text_view->need_im_reset = TRUE;
+#endif /* !MAEMO_CHANGES */
   gtk_im_context_focus_in (GTK_TEXT_VIEW (widget)->im_context);
 
   return FALSE;
@@ -4197,10 +4197,10 @@
 					keymap_direction_changed,
 					text_view);
 
-  /* MAEMO START */
-  /* text_view->need_im_reset = TRUE; */
-  /* gtk_im_context_focus_out (GTK_TEXT_VIEW (widget)->im_context); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  text_view->need_im_reset = TRUE;
+  gtk_im_context_focus_out (GTK_TEXT_VIEW (widget)->im_context);
+#endif /* !MAEMO_CHANGES */
 
   return FALSE;
 }
@@ -5211,10 +5211,9 @@
   GtkTextIter end;
   gboolean leave_one = FALSE;
 
-  /* MAEMO START */
-  /* backspace should not clear the word completion */
-  /* gtk_text_view_reset_im_context (text_view); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  gtk_text_view_reset_im_context (text_view);
+#endif /* !MAEMO_CHANGES */
 
   if (type == GTK_DELETE_CHARS)
     {
@@ -5341,10 +5340,9 @@
 {
   GtkTextIter insert;
 
-  /* MAEMO START */
-  /* backspace should not clear the word completion */
-  /* gtk_text_view_reset_im_context (text_view); */
-  /* MAEMO END */
+#ifndef MAEMO_CHANGES
+  gtk_text_view_reset_im_context (text_view);
+#endif /* !MAEMO_CHANGES */
 
   /* Backspace deletes the selection, if one exists */
   if (gtk_text_buffer_delete_selection (get_buffer (text_view), TRUE,
@@ -6092,17 +6090,15 @@
 static void
 gtk_text_view_reset_im_context (GtkTextView *text_view)
 {
-  /* MAEMO START */
-#if 0
+#ifdef MAEMO_CHANGES
+  gtk_im_context_reset (text_view->im_context);
+#else
   if (text_view->need_im_reset)
     {
       text_view->need_im_reset = FALSE;
-#endif
       gtk_im_context_reset (text_view->im_context);
-#if 0
     }
-#endif
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 }
 
 /*
@@ -7000,7 +6996,7 @@
   return TRUE;
 }
 
-/* MAEMO START */
+#ifdef MAEMO_CHANGES
 
 static gboolean
 gtk_text_view_has_selection_handler (GtkIMContext *context,
@@ -7035,7 +7031,7 @@
     }
 }
 
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 static void
 gtk_text_view_mark_set_handler (GtkTextBuffer     *buffer,
@@ -7058,12 +7054,10 @@
       need_reset = TRUE;
     }
 
-  /* MAEMO START (FIXME HACK) */
-#if 0
+#ifndef MAEMO_CHANGES /* FIXME HACK */
   if (need_reset)
     gtk_text_view_reset_im_context (text_view);
-#endif
-  /* MAEMO END */
+#endif /* !MAEMO_CHANGES */
 }
 
 static void
@@ -8771,7 +8765,7 @@
   return gtk_text_layout_move_iter_visually (text_view->layout, iter, count);
 }
 
-/* MAEMO_START */
+#ifdef MAEMO_CHANGES
 
 /**
  * hildon_gtk_text_view_set_input_mode:
@@ -8819,7 +8813,7 @@
   return mode;
 }
 
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 #define __GTK_TEXT_VIEW_C__
 #include "gtkaliasdef.c"

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.h	2007-01-23 14:09:07 UTC (rev 9270)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextview.h	2007-01-23 14:13:34 UTC (rev 9271)
@@ -360,11 +360,11 @@
 /* note that the return value of this changes with the theme */
 GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView    *text_view);
 
-/* MAEMO_START */
+#ifdef MAEMO_CHANGES
 void               hildon_gtk_text_view_set_input_mode (GtkTextView       *text_view,
                                                         HildonGtkInputMode mode);
 HildonGtkInputMode hildon_gtk_text_view_get_input_mode (GtkTextView       *text_view);
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 G_END_DECLS
 


