[maemo-commits] [maemo-commits] r9339 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Jan 25 12:48:05 EET 2007
- Previous message: [maemo-commits] r9338 - projects/haf/branches/gtk+/maemo-gtk-2-10/debian
- Next message: [maemo-commits] r9340 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: timj Date: 2007-01-25 12:48:03 +0200 (Thu, 25 Jan 2007) New Revision: 9339 Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.c Log: Thu Jan 25 11:46:15 2007 Tim Janik <timj at imendio.com> * gtk/gtkimmulticontext.h: * gtk/gtkimcontext.[hc]: * gtk/gtktextbuffer.c: * gtk/gtkimmodule.h: conditionalize with MAEMO_CHANGES. Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-25 10:00:38 UTC (rev 9338) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-25 10:48:03 UTC (rev 9339) @@ -1,3 +1,10 @@ +Thu Jan 25 11:46:15 2007 Tim Janik <timj at imendio.com> + + * gtk/gtkimmulticontext.h: + * gtk/gtkimcontext.[hc]: + * gtk/gtktextbuffer.c: + * gtk/gtkimmodule.h: conditionalize with MAEMO_CHANGES. + 2007-01-24 Michael Natterer <mitch at imendio.com> Merge from upstream trunk: Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.c 2007-01-25 10:00:38 UTC (rev 9338) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.c 2007-01-25 10:48:03 UTC (rev 9339) @@ -25,7 +25,7 @@ #include "gtkintl.h" #include "gtkalias.h" -/* MAEMO START */ +#ifdef MAEMO_CHANGES typedef struct _GtkIMContextPrivate GtkIMContextPrivate; #define GTK_IM_CONTEXT_GET_PRIVATE(obj) \ @@ -35,7 +35,7 @@ enum { PROP_HILDON_INPUT_MODE = 1 }; -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ enum { PREEDIT_START, @@ -44,22 +44,22 @@ COMMIT, RETRIEVE_SURROUNDING, DELETE_SURROUNDING, -/* MAEMO START */ +#ifdef MAEMO_CHANGES HAS_SELECTION, CLIPBOARD_OPERATION, -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ LAST_SIGNAL }; -/* MAEMO START */ +#ifdef MAEMO_CHANGES struct _GtkIMContextPrivate { HildonGtkInputMode mode; }; -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ static guint im_context_signals[LAST_SIGNAL] = { 0 }; -/* MAEMO START */ +#ifdef MAEMO_CHANGES static void gtk_im_context_set_property (GObject *object, guint property_id, const GValue *value, @@ -72,7 +72,7 @@ static gboolean gtk_im_context_real_filter_event (GtkIMContext *context, GdkEvent *event); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ static void gtk_im_context_real_get_preedit_string (GtkIMContext *context, gchar **str, @@ -93,23 +93,23 @@ static void gtk_im_context_class_init (GtkIMContextClass *klass) { - /* MAEMO START */ +#ifdef MAEMO_CHANGES GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ klass->get_preedit_string = gtk_im_context_real_get_preedit_string; klass->filter_keypress = gtk_im_context_real_filter_keypress; klass->get_surrounding = gtk_im_context_real_get_surrounding; klass->set_surrounding = gtk_im_context_real_set_surrounding; - /* MAEMO START */ +#ifdef MAEMO_CHANGES klass->filter_event = gtk_im_context_real_filter_event; gobject_class->set_property = gtk_im_context_set_property; gobject_class->get_property = gtk_im_context_get_property; g_type_class_add_private (klass, sizeof(GtkIMContextPrivate)); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ im_context_signals[PREEDIT_START] = g_signal_new (I_("preedit_start"), @@ -167,7 +167,7 @@ G_TYPE_INT, G_TYPE_INT); - /* MAEMO START */ +#ifdef MAEMO_CHANGES /** * GtkIMContext::has-selection: @@ -221,20 +221,20 @@ GTK_TYPE_GTK_INPUT_MODE, HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP, G_PARAM_READWRITE)); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ } static void gtk_im_context_init (GtkIMContext *im_context) { - /* MAEMO START */ +#ifdef MAEMO_CHANGES GtkIMContextPrivate *priv = GTK_IM_CONTEXT_GET_PRIVATE (im_context); priv->mode = HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ } -/* MAEMO START */ +#ifdef MAEMO_CHANGES static void gtk_im_context_set_property (GObject *object, guint property_id, @@ -272,7 +272,7 @@ break; } } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ static void gtk_im_context_real_get_preedit_string (GtkIMContext *context, @@ -295,14 +295,14 @@ return FALSE; } -/* MAEMO START */ +#ifdef MAEMO_CHANGES static gboolean gtk_im_context_real_filter_event (GtkIMContext *context, GdkEvent *event) { return FALSE; } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ typedef struct { @@ -685,7 +685,7 @@ return result; } -/* MAEMO START */ +#ifdef MAEMO_CHANGES /** * hildon_gtk_im_context_filter_event: @@ -882,7 +882,7 @@ GTK_IM_CONTEXT_CLIPBOARD_OP_PASTE); } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_IM_CONTEXT_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h 2007-01-25 10:00:38 UTC (rev 9338) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h 2007-01-25 10:48:03 UTC (rev 9339) @@ -26,14 +26,14 @@ G_BEGIN_DECLS -/* MAEMO START */ +#ifdef MAEMO_CHANGES typedef enum { GTK_IM_CONTEXT_CLIPBOARD_OP_COPY, GTK_IM_CONTEXT_CLIPBOARD_OP_CUT, GTK_IM_CONTEXT_CLIPBOARD_OP_PASTE } GtkIMContextClipboardOperation; -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define GTK_TYPE_IM_CONTEXT (gtk_im_context_get_type ()) #define GTK_IM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext)) @@ -92,7 +92,7 @@ gchar **text, gint *cursor_index); - /* MAEMO START */ +#ifdef MAEMO_CHANGES void (*show) (GtkIMContext *context); void (*hide) (GtkIMContext *context); @@ -104,20 +104,15 @@ /* Virtual functions again: */ gboolean (*filter_event) (GtkIMContext *context, GdkEvent *event); - /* MAEMO END */ - +#else /* MAEMO_CHANGES */ /* Padding for future expansion */ void (*_gtk_reserved1) (void); - - /* MAEMO START */ -#if 0 void (*_gtk_reserved2) (void); void (*_gtk_reserved3) (void); void (*_gtk_reserved4) (void); void (*_gtk_reserved5) (void); +#endif /* MAEMO_CHANGES */ void (*_gtk_reserved6) (void); -#endif - /* MAEMO END */ }; GType gtk_im_context_get_type (void) G_GNUC_CONST; @@ -148,7 +143,7 @@ gint offset, gint n_chars); -/* MAEMO START */ +#ifdef MAEMO_CHANGES gboolean hildon_gtk_im_context_filter_event (GtkIMContext *context, GdkEvent *event); @@ -161,7 +156,7 @@ void hildon_gtk_im_context_copy (GtkIMContext *context); void hildon_gtk_im_context_cut (GtkIMContext *context); void hildon_gtk_im_context_paste (GtkIMContext *context); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h 2007-01-25 10:00:38 UTC (rev 9338) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmodule.h 2007-01-25 10:48:03 UTC (rev 9339) @@ -41,7 +41,9 @@ void _gtk_im_module_list (const GtkIMContextInfo ***contexts, guint *n_contexts); GtkIMContext *_gtk_im_module_create (const gchar *context_id); -/* MAEMO CHANGE: dropped const */ +#ifdef MAEMO_CHANGES +const +#endif /* MAEMO_CHANGES */ gchar * _gtk_im_module_get_default_context_id (const gchar *lang); /* The following entry points are exported by each input method module Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h 2007-01-25 10:00:38 UTC (rev 9338) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimmulticontext.h 2007-01-25 10:48:03 UTC (rev 9339) @@ -45,7 +45,9 @@ GtkIMMulticontextPrivate *priv; - /* MAEMO CHANGE: dropped const */ +#ifdef MAEMO_CHANGES + const +#endif /* MAEMO_CHANGES */ gchar *context_id; }; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.c 2007-01-25 10:00:38 UTC (rev 9338) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktextbuffer.c 2007-01-25 10:48:03 UTC (rev 9339) @@ -4195,8 +4195,7 @@ _gtk_text_btree_spew (get_btree (buffer)); } -/* MAEMO START */ - +#ifdef MAEMO_CHANGES void gtk_text_buffer_set_can_paste_rich_text (GtkTextBuffer *buffer, gboolean can_paste_rich_text) @@ -4220,8 +4219,7 @@ { return NULL; } +#endif /* MAEMO_CHANGES */ -/* MAEMO END */ - #define __GTK_TEXT_BUFFER_C__ #include "gtkaliasdef.c"
- Previous message: [maemo-commits] r9338 - projects/haf/branches/gtk+/maemo-gtk-2-10/debian
- Next message: [maemo-commits] r9340 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]