[maemo-commits] [maemo-commits] r9950 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso5test1/debian 2.10.6-0osso5test1/gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Feb 16 15:35:07 EET 2007
- Previous message: [maemo-commits] r9949 - projects/haf/branches/gtk+/maemo-gtk-2-10/debian
- Next message: [maemo-commits] r9951 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: xan
Date: 2007-02-16 15:35:05 +0200 (Fri, 16 Feb 2007)
New Revision: 9950
Added:
projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/
Modified:
projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/debian/changelog
projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkentry.c
projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkentry.h
projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkimcontext.h
projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtktreeview.h
Log:
2.10.6-0osso5test1
Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso5test1 (from rev 9949, projects/haf/branches/gtk+/maemo-gtk-2-10)
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/debian/changelog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog 2007-02-16 13:32:47 UTC (rev 9949)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/debian/changelog 2007-02-16 13:35:05 UTC (rev 9950)
@@ -1,5 +1,7 @@
-gtk+2.0 (2:2.10.6-0osso5) experimental; urgency=low
+gtk+2.0 (2:2.10.6-0osso5test1) experimental; urgency=low
+ *** NOTE: MAEMO GTK+ 2.10 IS ABI *INCOMPATIBLE* WITH MAEMO GTK+ 2.6 ***
+
* libgtk2.0-0.files: remove im-xim as unnecessary and in some cases harmful
* libgtk2.0-0.postinst: call hildon-theme-recache-all to regenerate theme
cache files (Fixes: MB#1024)
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkentry.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.c 2007-02-16 13:32:47 UTC (rev 9949)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkentry.c 2007-02-16 13:35:05 UTC (rev 9950)
@@ -1600,9 +1600,9 @@
width += 2 * focus_width;
height += 2 * focus_width;
- gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+ /* gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
area, widget, "entry",
- 0, 0, width, height);
+ 0, 0, width, height);*/
}
}
@@ -1620,10 +1620,10 @@
get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
- gtk_paint_flat_box (widget->style, entry->text_area,
+ gtk_paint_flat_box (widget->style, entry->text_area,
GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
&event->area, widget, "entry_bg",
- 0, 0, area_width, area_height);
+ 0, 0, area_width, area_height);
if ((entry->visible || entry->invisible_char != 0) &&
GTK_WIDGET_HAS_FOCUS (widget) &&
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkentry.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h 2007-02-16 13:32:47 UTC (rev 9949)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkentry.h 2007-02-16 13:35:05 UTC (rev 9950)
@@ -135,18 +135,16 @@
void (* paste_clipboard) (GtkEntry *entry);
void (* toggle_overwrite) (GtkEntry *entry);
-#ifdef MAEMO_CHANGES
- void (* invalid_input) (GtkEntry *entry,
- GtkInvalidInputType invalid_input_type);
-#endif /* MAEMO_CHANGES */
-
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
-#ifndef MAEMO_CHANGES
+#ifdef MAEMO_CHANGES
+ void (* invalid_input) (GtkEntry *entry,
+ GtkInvalidInputType invalid_input_type);
+#else
void (*_gtk_reserved3) (void);
-#endif /* !MAEMO_CHANGES */
+#endif /* MAEMO_CHANGES */
};
GType gtk_entry_get_type (void) G_GNUC_CONST;
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkimcontext.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h 2007-02-16 13:32:47 UTC (rev 9949)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtkimcontext.h 2007-02-16 13:35:05 UTC (rev 9950)
@@ -92,6 +92,9 @@
gchar **text,
gint *cursor_index);
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+
#ifdef MAEMO_CHANGES
void (*show) (GtkIMContext *context);
void (*hide) (GtkIMContext *context);
@@ -105,14 +108,12 @@
gboolean (*filter_event) (GtkIMContext *context,
GdkEvent *event);
#else /* MAEMO_CHANGES */
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
void (*_gtk_reserved5) (void);
+ void (*_gtk_reserved6) (void);
#endif /* MAEMO_CHANGES */
- void (*_gtk_reserved6) (void);
};
GType gtk_im_context_get_type (void) G_GNUC_CONST;
Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtktreeview.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h 2007-02-16 13:32:47 UTC (rev 9949)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso5test1/gtk/gtktreeview.h 2007-02-16 13:35:05 UTC (rev 9950)
@@ -104,14 +104,17 @@
gboolean (* start_interactive_search) (GtkTreeView *tree_view);
/* Padding for future expansion */
+ void (*_gtk_reserved0) (void);
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+
#ifdef MAEMO_CHANGES
void (* row_insensitive) (GtkTreeView *tree_view,
GtkTreePath *path);
+#else
+ void (*_gtk_reserved4) (void);
#endif /* MAEMO_CHANGES */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
};
- Previous message: [maemo-commits] r9949 - projects/haf/branches/gtk+/maemo-gtk-2-10/debian
- Next message: [maemo-commits] r9951 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]