[maemo-commits] [maemo-commits] r11278 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso11 2.10.6-0osso11/debian 2.10.6-0osso11/gtk

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Apr 25 11:02:58 EEST 2007
Author: xan
Date: 2007-04-25 11:02:57 +0300 (Wed, 25 Apr 2007)
New Revision: 11278

Added:
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/debian/changelog
Removed:
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/debian/changelog
Modified:
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/ChangeLog
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombo.c
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombobox.c
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtktogglebutton.c
Log:
gtk+ 2.10.6-0osso11



Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso11 (from rev 11272, projects/haf/trunk/gtk+)

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso11/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-04-24 21:31:24 UTC (rev 11272)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/ChangeLog	2007-04-25 08:02:57 UTC (rev 11278)
@@ -1,17 +1,5 @@
 2007-04-20  Michael Natterer  <mitch at imendio.com>
 
-	Merge from upstream trunk, replacing the old hildon popup name:
-
-    2007-03-07  Matthias Clasen <mclasen at redhat.com>
-
-	* gtk/gtkcombo.c: (gtk_combo_init):
-	* gtk/gtkcombobox.c: (gtk_combo_box_set_popup_widget),
-	(gtk_combo_box_menu_setup):
-	Set names on the popup widgets to make them themable. (#414975, 
-	Benjamin Berg)
-
-2007-04-20  Michael Natterer  <mitch at imendio.com>
-
 	* gtk/gtkscrolledwindow.c: back out "keep focussed child visible
 	when size changes".
 

Deleted: projects/haf/tags/gtk+2.0/2.10.6-0osso11/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog	2007-04-24 21:31:24 UTC (rev 11272)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/debian/changelog	2007-04-25 08:02:57 UTC (rev 11278)
@@ -1,924 +0,0 @@
-gtk+2.0 (2:2.10.6-0osso10) unstable; urgency=low
-
-  * Don't close menus on clicks on their border area.
-  * Fix treeview focusing with button press.
-  * Add "maemo-position-theming" style property, used in sapwood to add
-    positioning data to the matching rules.
-
- -- Xan Lopez <xan.lopez at nokia.com>  Mon, 16 Apr 2007 11:07:02 +0300
-
-gtk+2.0 (2:2.10.6-0osso9) unstable; urgency=low
-
-  * HILDON_GTK_INPUT_MODE_DICTIONARY added
-  * GtkMenuItem background drawn around the submenu arrow (needs theme update
-    for correct looks)
-  * Do not use GTK_WINDOW_TYPE_HINT_MENU for all menus (needs fix for MB#1141
-    for correct behavior)
-  * API documentation updates.
-  * debian/rules: Do not compress index.sgml files so that gtkdoc-fixxref can
-    access those and generate better cross reference when building hildon API
-    docs.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 29 Mar 2007 17:16:37 +0300
-
-gtk+2.0 (2:2.10.6-0osso8) unstable; urgency=low
-
-  *** NOTE: starting with this version we are ABI incompatible with maemo gtk+
-   2.6 ***
-
-  * Remove all the stubs from the header files.
-  * Add MAEMO_CHANGES protection to the DISABLE_XSHM feature.
-  * Stop supporting TYPE_HINT_MESSAGE. TYPE_HINT_NOTIFICATION is the new
-    black.
-
- -- Xan Lopez <xan.lopez at nokia.com>  Tue, 13 Mar 2007 16:51:16 +0200
-
-gtk+2.0 (2:2.10.6-0osso7) experimental; urgency=low
-
-  * Back out maemo icon theme load order patch.
-
- -- Xan Lopez <xan.lopez at nokia.com>  Mon,  5 Mar 2007 17:31:20 +0200
-
-gtk+2.0 (2:2.10.6-0osso6) experimental; urgency=low
-
-  * Menu changes to menu item drawing when there's a submenu
-  * Use full widget width for popup in combombox when using list-mode 
-  * Back out checkboxmode from cellrenderertoggle
-  * Pop down combobox with F4 and F5
-  * GtkIconView selection drawing fixes
-  * Adapt progressbar minimum height to maemo specs
-
- -- Xan Lopez <xan.lopez at nokia.com>  Thu, 22 Feb 2007 12:39:00 +0200
-
-gtk+2.0 (2:2.10.6-0osso5) experimental; urgency=low
-
-  * 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)
-  * Fixes: NB#38065 input method not return to VKB mode when connection is set
-    to offline mode and hw keyboard is actived
-  * Added gdk_event_request_motions () and use it all over the code
-  * Add GTK_BUTTONBOX_CENTER mode for GtkButtonBox and use it in GtkDialog
-  * Fix a problem with large ythickness in GtkFrame
-  * Add tree-view-separator-area style property for GtkButton, used to reserve
-    space between headers and content area in treeview
-  * Port over remaining logic changes in GtkMenu from maemo-gtk-2.6 (select
-    first item on opening, automatic popdown of obscured menus, ...)
-  * Reduce scratch image sizes
-  * Add content-area-spacing style property for GtkDialog
-  * Fix extension events
-
- -- Xan Lopez <xan.lopez at nokia.com>  Fri, 16 Feb 2007 15:22:32 +0200
-
-gtk+2.0 (2:2.10.6-0osso4) experimental; urgency=low
-
-  NOTE: Please remember you need to add "MAEMO_CHANGES" to your compilation
-  flags if you're using any of the Maemo GTK+ API.
-  See http://maemo.org/maemowiki/MaemoGtk210Overview for a review of the API.
-
-  * Pen dragging suport for GtkTreeView
-  * autodimmed property for GtkComboBox
-  * Fix scroll arrow backgrounds painting
-
- -- Xan Lopez <xan.lopez at nokia.com>  Tue,  6 Feb 2007 12:11:16 +0200
-
-gtk+2.0 (2:2.10.6-0osso3) experimental; urgency=low
-
-  * Backport from trunk:
-    - GtkComboBox keynav.
-    - Infrastructure and notification of failed navigation.
-    - GtkProgressBar style properties.
-    - GtkWidget::insensitive-press signal.
-    - gtkrc files parsing order.
-    - revert generic disabling of PRELIGHT state.
-    - Change GtkMenu window type, auto-select first item, various
-      drawing updates.
-  * Misc:
-    - Change MAEMO_CHANGES comments to #ifdef/#endif to allow conditionalized
-      inclusion of maemo-gtk changes during compilation.
-
- -- Xan Lopez <xan.lopez at nokia.com>  Wed, 31 Jan 2007 15:12:14 +0200
-
-gtk+2.0 (2:2.10.6-0osso2) unstable; urgency=low
-
-  * Restore API compatibility with maemo gtk+ 2.6
-
-  * Add "fill-level" property to GtkRange
-
-  * Export symbols for implementing GtkFileChooser interface outside gtk:
-    - hildon_gtk_file_chooser_install_properties
-    - gtk/gtkfilesystemmodel.h, gtk/gtkfilechooserprivate.h,
-      gtk/gtkfilechooserutils.h
-  * Add stubs for removed / replaced API:
-    - gtk_widget_{get,set}_hildon_focus_handling
-    - osso_gtk_range_{get,set}_stream_indicator
-    - osso_gtk_range_{get,set}_stream_position
-    - gtk_style_lookup_logical_color
-    - gtk_text_buffer_{get,set}_can_paste_rich_text
-    - gtk_text_buffer_{get,set}_rich_text_format
-    - hildon_gtk_file_system_create
-    - gtk_file_system_render_icon
-    - hildon_gtk_button_set_depressed
-    - close signal (GtkMenuShell)
-    - "checkbox-mode" (GtkCellRendererToggle)
-  * Empty stubs:
-    - hildon_gtk_text_view_{get,set}_input_mode
-    - gtk_window_{get,set}_prev_focus_widget
-    - osso_gtk_button_set_detail_from_attach_flags
-    - osso_gtk_button_attach_details
-    - hildon_gtk_entry_{get,set}_input_mode
-    - invalid-input signal (GtkEntry)
-  * Restore the maemo API:
-    - tap'n'hold (GtkWidget, GtkContainer, GtkTreeView)
-    - insensitive-press signal (GtkWidget, GtkToolButton)
-    - row-insensitive signal (GtkTreeView)
-    - gtk_im_context_{show,hide}
-    - hildon_gtk_im_context_{show,hide}
-    - hildon_gtk_im_context_has_selection
-    - hildon_gtk_im_context_{copy,cut,paste}
-    - HILDON_ICON_SIZE_{26,40,50,64}
-
-  * debian/rules:
-    - do not install .cvsignore files in gtk2.0-examples package
-    - Prefer HW floating points (via DEB_BUILD_OPTIONS=vfp)
-  * debian/control: Build-Depend on libtool >= 1.5.12 to handle four digits in
-    version
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 15 Jan 2007 18:27:03 +0200
-
-gtk+2.0 (2:2.10.6-0osso1) unstable; urgency=low
-
-  * Upgrade to 2.10.6 ** ALL MAEMO PATCHES DROPPED
-    - debian/control:
-      + Build-Depend on libglib2.0-dev >= 2.12.0, libpango1.0-dev >= 1.12.0,
-        libatk1.0-dev >= 1.9.0, libcairo2-dev >= 1.2.0
-      + libgtk2.0-dev: updated depends versions, depend on libcairo2-dev
-  * debian/libgtk2.0-0.files: Remove maemo-gtk-im-switch which is not in
-    upstream
-  * debian/rules: update shlibs to >= 2:2.10.6
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  3 Nov 2006 15:03:54 +0200
-
-gtk+2.0 (2:2.6.10-2.osso21) unstable; urgency=low
-
-  [ Tommi Komulainen ]
-  * Fixes: NB#37295 Scrolling through calendar is too fast using hardkeys
-  * Help sapwood to fix NB#35602
-
-  [ Xan López ]
-  * Fixes: NB#43257 accounts ; account setup ; "googlemail.co.uk" is cut off
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 26 Oct 2006 15:00:18 +0300
-
-gtk+2.0 (2:2.6.10-2.osso20) unstable; urgency=low
-
-  [ Tommi Komulainen ]
-  * Fixes: NB#43513 Menus are set transient to the wrong window
-
-  [ Xan López ]
-  * Fixes: NB#42621 Text is not correctly aligned in HildonNote notifications
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 17 Oct 2006 16:26:52 +0300
-
-gtk+2.0 (2:2.6.10-2.osso19) unstable; urgency=low
-
-  * Fixes: NB#41981 GtkTreeSelection does not pick up the initial selection
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  6 Oct 2006 23:54:48 +0300
-
-gtk+2.0 (2:2.6.10-2.osso18) unstable; urgency=low
-
-    * Fixes: NB#42165 GtkComboBox prevents parent window from having its
-    background painted
-
- -- Xan Lopez <xan.lopez at nokia.com>  Wed,  4 Oct 2006 15:27:43 +0300
-
-gtk+2.0 (2:2.6.10-2.osso17) unstable; urgency=low
-
-  * The previous tag had some experimental code, making a proper release now.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon,  2 Oct 2006 11:17:24 +0300
-
-gtk+2.0 (2:2.6.10-2.osso16) unstable; urgency=low
-
-  * Fixes: NB#41908 update_checkbox_mode function in Maemo modified gtk leaks
-    memory
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon,  2 Oct 2006 11:17:24 +0300
-
-gtk+2.0 (2:2.6.10-2.osso15) unstable; urgency=low
-
-  * The CodeCamp release.
-
-  [ Tommi Komulainen ]
-  * Allow disabling XSHM usage by setting GDK_DISABLE_XSHM environment
-    variable (for NB#22173)
-  * Increase treeview column header resizing area width
-  * Fixes: NB#4379 GtkMenu - Initial focus missing on the menuitem.
-  * Fixes: NB#18559 NOKGTK-48 GtkScrolledWindow: not handling hiding child
-    widgets
-  * Fixes: NB#22069 Focus indicated incorrectly in the file manager
-  * Fixes: NB#22403 No API to de-initialize tap-and-hold i.e. to get rid of
-    the associated 40KB animation
-  * Fixes: NB#31766 GtkTreeView scrollbar redrawn when adding/removing rows in
-    collapsed branches
-  * Fixes: NB#33725 GtkArrow graphics are clipped
-  * Fixes: NB#36935 Checkbox in ListViews cannot be checked with HW key
-  * Fixes: NB#40428 AF-BAT:Calendar pop-up does not reflect the correct
-    first_weekday on changing region.
-  * Fixes: NB#41002 Tap and hold menu can cause a segmentation fault with
-    specific widget configuration
-
-  [ Xan López ]
-  * Fixes: NB#23025 GtkCalendar arrows not shown correctly
-  * Fixes: NB#37326 The Separator for combobox doesn't work
-  * Fixes: NB#38922 "Cursur" is getting bold when tab space key
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 22 Sep 2006 17:27:57 +0300
-
-gtk+2.0 (2:2.6.10-2.osso14) unstable; urgency=low
-
-  [ Tommi Komulainen ]
-  * Extension events are now always enabled for touchscreen
-  * Package new style debugging symbols (Fixes: NB#40541)
-    - debian/control.in:
-      + rename libgtk2.0-dbg to libgtk2.0-0-dbg
-      (Conflicts: and Replaces: libgtk2.0-dbg)
-    - debian/rules:
-      + remove extra cruft that used to handle debug versions of libraries
-      + adjust to new package name
-      + call dh_strip with --dbg-package=libgtk2.0-$(soname)
-    - debian/libgtk2.0-dbg.dirs, debian/libgtk2.0-dbg.files: removed
-  * Fixes: NB#22354 Minor memory leak in Gtk selection handling
-  * Fixes: NB#40033 Menu HW key does not close combobox popup
-
-  [ Xan López ]
-  * Fixes: NB#3490 TreeView not scrolling to first row
-  * Fixes: NB#22230 GtkNoteBook: Right arrow head is not shown when the
-    caption text of tab is very long.
-  * Fixes: NB#31582 "grab-notify" signal not correctly propagated for internal children
-  * Fixes: NB#36265, MB#759 "Close" button is different in GtkAboutDialog
-  * Fixes: NB#40316 Combobox leaks treeview
-  * Fixes: NB#40560 Ellipsized label width is not correctly computed.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 18 Sep 2006 13:44:53 +0300
-
-gtk+2.0 (2:2.6.10-2.osso13) unstable; urgency=low
-
-  * Fixes: NB#11656 Withdrawn windows staying around
-  * Fixes: NB#23240 _gtk_im_module_get_default_context_id returns a duplicated
-    string as const char *
-  * Fixes: NB#37624 Focus in the content pane is not consistent with user
-    action
-  * Fixes: NB#39901 Tapping on dimmed row loses focus
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 11 Sep 2006 14:45:38 +0300
-
-gtk+2.0 (2:2.6.10-2.osso12) unstable; urgency=low
-
-  * Fixes: NB#35221 Having a property to set the png compression level would
-    be convenient.
-  * Fixes: NB#39784 Tap'n'hold on selected non-focused row clears selection
-  * Fixes: NB#37442,NB#37456 scrolling to the top/bottom of a file tree
-    doesn't scroll enough for the extreme of the selection
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  7 Sep 2006 18:31:38 +0300
-
-gtk+2.0 (2:2.6.10-2.osso11) unstable; urgency=low
-
-  * Fixes: NB#30986,NB#37050,NB#37495 GtkComboBox popup remains when switching
-    to home using the hardware button
-  * Fixes: NB#33737 Formattings are lost at destination with copy-paste
-    operation
-  * Fixes: NB#37624,NB#37868 dimmed items in gtktreeview shouldn't be
-    focusable
-  * Fixes: NB#38982 Blinking behavior is different for centered alignment.
-  * Partially fixes NB#21506
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  7 Sep 2006 12:45:15 +0300
-
-gtk+2.0 (2:2.6.10-2.osso10) unstable; urgency=low
-
-  * Fixes: NB#34004,NB#36078 combobox doesn't move to selected value in the
-    first time active
-  * Fixes: NB#34112 Popup in GtkComboBoxEntry when pressing return
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 28 Aug 2006 16:41:58 +0300
-
-gtk+2.0 (2:2.6.10-2.osso9) unstable; urgency=low
-
-  * Fixes: MB#724 submenu disappears immediately when popped up
-  * Fixes: NB#29343 GtkTreeView emits 'row-activated' signals inconsistently
-  * Fixes: NB#31719 "insensitive press" or similar signal not working on
-    disabled combobox
-  * Fixes: NB#33601 Addressbook and file manager: CSM are too agressively
-    dimmed
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 24 Aug 2006 11:03:03 +0300
-
-gtk+2.0 (2:2.6.10-2.osso8) unstable; urgency=low
-
-  * debian/control.in: remove obsolete xlibs-dev from Build-Depends
-  * Correctly checks for RANDR and SYNC extensions
-  * Fixes: NB#33120 AF-BAT:Calendar date labels are not updated when
-    switching languages
-  * Fixes: MB#707 GtkButton Images won't show if the button is created without
-    a label
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 20 Jul 2006 12:23:44 +0300
-
-gtk+2.0 (2:2.6.10-2.osso7) unstable; urgency=low
-
-  * Proper fix for NB#26600
-  * Fixes: NB#32507 Filemanager crashes when backup files are deleted from the
-    MMC card
-  * Fixes: NB#34607 Bookmarks application crashed.
-  * Fixes: NB#34609 File manager crashes after folder has been renamed from
-    leftside file view
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 12 Jul 2006 10:49:13 +0300
-
-gtk+2.0 (2:2.6.10-2.osso6) unstable; urgency=low
-
-  * Make combobox popup as wide as the combobox itself to avoid truncations.
-  * Small optimizations to progress bar painting.
-  * Fixes: NB#32657 Critical warning in gtktreemodelfilter (fixed upstream)
-  * Fixes: NB#26099 Unable to set text in activity mode of gtkprogressbar.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  7 Jul 2006 11:21:02 +0300
-
-gtk+2.0 (2:2.6.10-2.osso5) unstable; urgency=low
-
-  * debian/rules:
-    - CFLAGS += -g
-  * Fixes: NB#21938 Valgrind warning on opening Calendar widget
-  * Fixes: NB#32491 calendar labels language
-  * Fixes: NB#32566 GtkComboBox: insensitive rows are selectable using L&R
-    keys
-  * Fixes: NB#32573 [regression] no scroll bar when opening history of entered
-    URL's
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 13 Jun 2006 16:16:58 +0300
-
-gtk+2.0 (2:2.6.10-2.osso4) unstable; urgency=low
-
-  * Feature: Dynamically showing and hiding keyboard shortcuts.
-    (OSSO129887, OSSO129888)
-  * Bugs fixed:
-    NB#31455: Ellipsizing column headers ellipsize too eagerly
-    NB#31471: GtkTreeView: Icon in same column after ellipsizing text not
-              visible
-    NB#31497: GtkCellRendererText: Automatic ellipsizing truncated initially
-    NB#31695: Wrong folder is opened when double clicking a folder in MMC file
-              list view
-    NB#31696: Drag doesn't start if stylus leaves the widget before crossing
-              dnd threshold
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  9 Jun 2006 10:55:37 +0300
-
-gtk+2.0 (2:2.6.10-2.osso3.1) unstable; urgency=low
-
-  * debian/rules:
-    - do make install to debian/tmp first and then move only listed files to
-      right packages instead of putting everything to libgtk2.0-0, unless
-      otherwise mentioned, 
-  * debian/libgtk2.0-0.files:
-    - list the files we want
-  * Really fixes NB#31174
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  1 Jun 2006 08:53:15 +0300
-
-gtk+2.0 (2:2.6.10-2.osso3) unstable; urgency=low
-
-  * debian/libgtk2.0-dev.files: Kill .la files
-  * Bugs fixed:
-    NB#31174: /usr/lib/libgdk_pixbuf-2.0.la and
-              /usr/lib/libgdk_pixbuf_xlib-2.0.la should be removed from
-              library libgtk2.0-dev
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 30 May 2006 11:23:07 +0300
-
-gtk+2.0 (2:2.6.10-2.osso2) unstable; urgency=low
-
-  * Bugs fixed:
-    NB#30557: GtkHButtonBox is broken in modified gtk (GtkAboutDialog)
-    NB#31061: PANGO_ELLIPSIZE_MIDDLE mode does not work in gtkcellrenderertext
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 29 May 2006 19:13:01 +0300
-
-gtk+2.0 (2:2.6.10-2.osso1) unstable; urgency=low
-
-  * UI change: discontinuous selection in treeview
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 22 May 2006 17:16:46 +0300
-
-gtk+2.0 (2:2.6.10-1.osso17) unstable; urgency=low
-
-  * Bugs fixed:
-    NB#10197: API documentation is missing for the modified GTK.
-    NB#21875: tap'n'hold drag threshold calculated wrong
-    NB#24051: GtkWidgetPrivate and signal connections in gtkwidget.c
-    NB#25347: Glib CRITICAL error when changing theme while showing an
-              animation
-    NB#29142: Leak in gdk_drag_find_window_for_screen() when using Desktop
-              layout mode
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 19 May 2006 18:50:25 +0300
-
-gtk+2.0 (2:2.6.10-1.osso16) unstable; urgency=low
-
-  * debian/rules:
-    - Enable parallel builds (Thanks Alexander)
-    - Re-enable thumb mode
-  * Really fixes N#28529
-  * Bugs fixed:
-    NB#26453: apply thumb code generation for GTK+
-    NB#26600: FileManager crashes when the memory card is removed during a
-              backup operation.
-    NB#28149: GtkComboBox width is not determined according to the longest
-              string of it
-    NB#28529: Theming needs the arrow_width to be used even in list moce
-    NB#29115: GtkEntryCompletion: scrollbar is displayed when not needed
-    NB#29346: Applications crash when switching input method module
-    NB#29357: Notes loses focus to the combobox in the toolbar
-    NB#29420: GtkCombobox popup opened down
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 12 May 2006 16:26:50 +0300
-
-gtk+2.0 (2:2.6.10-1.osso15) unstable; urgency=low
-
-  * Bugs fixed:
-    N#21360: Colour copy paste does not work correctly in all cases
-    N#22469: Selection not behaving consistently with Copy command
-    N#25311: GtkTreeView paints far too much when new items are inserted
-    N#25460: Unexpected behavior upon choosing group membership by drag and
-             drop
-    N#28279: Internal GtkTreeView function check_if_can_focus_idle is called
-             after the view has been destroyed
-    N#28529: Theming needs the arrow_width to be used even in list moce
-    N#28612: Combobox focus grab closes IM
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  5 May 2006 14:47:29 +0300
-
-gtk+2.0 (2:2.6.10-1.osso14) unstable; urgency=low
-
-  * debian/rules: disable thumb support temporarily
-  * Close the entry completion window when VKB is hidden
-  * Bugs fixed:
-    N#26867: Unable to use input-method on the first attempt when
-             autocompletion list is open
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 26 Apr 2006 13:19:29 +0300
-
-gtk+2.0 (2:2.6.10-1.osso13) unstable; urgency=low
-
-  * Fixes compilation problems with glib 2.10
-  * debian/rules (CFLAGS, LDFLAGS): Really enable thumb code 
-  * Bugs fixed:
-    N#22694: Hildon modifications done into gtk_tree_view_row_changed cause
-             lot's of unneeded accesses to model
-    N#23018: Words entered in passwords field are shown in word completion and
-             gets added to dictionary
-    N#25274: Small UI glitch in GTKComboBoxEntry when getting focus
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 24 Apr 2006 10:59:50 +0300
-
-gtk+2.0 (2:2.6.10-1.osso12) unstable; urgency=low
-
-  * debian/rules (LINGUAS): disable en_GB locale as well to save footprint
-    (it's not benefiting anyone anyway when the fallback is practically en_US)
-  * debian/rules (CFLAGS): Use soft-float and thumb mode if it enabled
-  * Bugs fixed:
-    N#25803: GtkWindow should remove its weak reference on
-             priv->prev_focus_widget
-    N#26453: apply thumb code generation for GTK+
-    N#26464: gdk-pixbuf problem with some specially crafted images
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 13 Apr 2006 16:53:13 +0300
-
-gtk+2.0 (2:2.6.10-1.osso11) unstable; urgency=low
-
-  * Widgets updated to comply with Hildon theming:
-    - GtkComboBox (in appear-as-list mode)
-    - GtkEntryCompletion
-    - GtkExpander
-    - GtkFileChooserButton
-  * Performance:
-    - GtkImage animation optimization removed as it breaks blinking icons in
-      TN. As a result applications displaying progress animations will take a
-      small performance hit.
-  * IM context documentation improvements
-  * Bugs fixed:
-    N#25361: Autocompletion choice drops down and blocks IM window
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed,  5 Apr 2006 19:26:42 +0300
-
-gtk+2.0 (2:2.6.10-1.osso10) unstable; urgency=low
-
-  * UI change: Collapse folders only when tapping on already focused folder.
-  * Bugs fixed:
-    N#22537: Fileselection widget crashes when traversing through a hierarchy
-             of folders
-    N#22807: NOKGTK-58 GtkTreeView calculates cell sizes very inefficiently
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 24 Mar 2006 19:31:31 +0200
-
-gtk+2.0 (2:2.6.10-1.osso9) unstable; urgency=low
-
-  * debian/libgtk2.0-{common,dev}.files: Move localisation for property
-    descriptions (gtk20-properties.mo) in the -dev package as it has little
-    value outside GUI builders.
-  * Memory optimizations
-  * Bugs fixed:
-    N#20679: Valgrind warnings from the Gtk
-    N#24266: Device hanges on trying to opening context menu
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 16 Mar 2006 17:40:51 +0200
-
-gtk+2.0 (2:2.6.10-1.osso8) unstable; urgency=low
-
-  * Bugs fixed:
-    M#353: Toolbars without icons are invisible in icon-only mode
-    N#21336: Gtk loses memory on D&D selections
-    N#21857: hildon-fm leaks gdk_text properties on D&D
-    N#23669: The Alpha shortcut buttons are not visible in the main view
-    N#23240: _gtk_im_module_get_default_context_id returns a duplicated string
-             as const char *
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue,  7 Mar 2006 18:46:30 +0200
-
-gtk+2.0 (2:2.6.10-1.osso7) unstable; urgency=low
-
-  * Most if not all custom additions tagged with 'Since:' tags to enable
-    gtk-doc indexing
-  * Avoid needlessly loading iconv:
-    - Drop legacy window manager hints support (WM_NAME, WM_ICON_NAME, ...)
-      only set the newer EWMH hints (_NET_WM_NAME, ...)
-    - Don't try ISO-8859-1 -> UTF-8 conversion for ASCII comments in PNGs
-  * debian/rules: remove build-stamp on clean
-  * Bugs fixed:
-    22651: File manager crashes when selected sorting is "Type" on memory card
-           content
-    23182: Obsolete window title property and PNG comment charset conversions
-           wastes almost 100KB per application because iconv() is required
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 23 Feb 2006 14:19:30 +0200
-
-gtk+2.0 (2:2.6.10-1.osso6) unstable; urgency=low
-
-  * GtkTreeStore API addition to benefit GtkFileSystemMemory:
-    - gtk_tree_store_insert_with_values
-    - gtk_tree_store_insert_with_valuesv
-  * Bugs fixed:
-    M#352: GtkViewPort not releasing signal handlers on destruction / Gnome
-           Bugzilla #325869
-    N#22693: GDK warning when using GtkEntry
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 22 Feb 2006 12:28:18 +0200
-
-gtk+2.0 (2:2.6.10-1.osso5) unstable; urgency=low
-
-  * GtkIMContext API addition for passing more events through IM context:
-    - hildon_gtk_im_context_filter_event added
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 16 Feb 2006 19:05:59 +0200
-
-gtk+2.0 (2:2.6.10-1.osso4) unstable; urgency=low
-
-  * Export a couple of private symbols for hildon. 
-  * debian/rules: export LINGUAS to build only en_GB catalogs as the rest is
-    useless.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 31 Jan 2006 19:00:32 +0200
-
-gtk+2.0 (2:2.6.10-1.osso3) unstable; urgency=low
-
-  * GtkIMContext API additions:
-    - GtkIMContext extensions redesigned
-    - backwards compatibility supported
-    - debian/rules: update shlibs
-  * Fix module loading so that two theme engines (both derived from the pixbuf
-    engine) can be used at the same time.
-  * GtkLabel API/ABI change: remove unused functions and properties:
-    - GtkLabel::translatable (get_translatable, set_translatable)
-    - gtk_label_retranslate
-  * Stop exporting private symbols:
-    - anything begining with an underscore
-    - tap_and_hold_remove_timer (in gtkwidget.c)
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 31 Jan 2006 14:58:34 +0200
-
-gtk+2.0 (2:2.6.10-1.osso2) unstable; urgency=low
-
-  * Backport GtkWindow::urgency-hint from 2.8
-    - debian/rules: update shlibs
-  * Begin using the new g_slice_*() API
-    - debian/control.in: Build-Depends: libglib2.0-dev (>= 2.6.6-1osso2)
-
-  * Bugfixes merged from IT-2005:
-    13454: HW keys - OGS - problem with UP and LEFT keys when OK button is
-           focused
-    18225: TN and status bar menus do not close in certain case
-    20212: Long touch animation circling: bias-aligned?
-    20552: GtkTreeView sometimes actives items after drag'n'drop
-    21366: Minor memory leak in Chess when file selector is destroyed
-    21542: Minor memory leak in filetree/treeview update
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 11 Jan 2006 18:21:14 +0200
-
-gtk+2.0 (2:2.6.10-1.osso1) unstable; urgency=low
-
-  * Upgrade to gtk+ 2.6.10
-    - GtkCalendar and GtkMenuShell ABI changes to restore compatibility with
-      upstream
-  * debian/*: redo packaging to build directly from svn trunk
-  * static libraries removed to simplify the build (they were unused anyway)
-  * debian/rules: configure with --disable-gtk-doc as the docs won't build
-    properly with currently available tools
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  2 Dec 2005 18:11:33 +0200
-
-gtk+2.0 (2:2.6.4-1.osso76) unstable; urgency=low
-
-  * Updated fix for bug 20810 to not remove builtin stock icons, depends on
-    bug 21042.
-
-  * Bugs fixed:
-    20677: Minor memory leak in Gtk Treeview
-    21039: gtk+ builtin stock icons are missing
-
-  * Together with update to hildon-libs fixes:
-    19283: Control panel - The vaules entered is not saved
-    19648: Hildon Date Editor widget detects values too high
-
-  * debian/rules: API addition to GtkCalendar, update shlibs
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  3 Nov 2005 14:45:59 +0200
-
-gtk+2.0 (2:2.6.4-1.osso75) unstable; urgency=low
-
-  * Bugs fixed:
-    20317: GtkTextView: alignment problems
-    20810: Gtk allocates >30k memory for Stock icons that are never used
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 26 Oct 2005 18:31:34 +0300
-
-gtk+2.0 (2:2.6.4-1.osso74) unstable; urgency=low
-
-  * Bugs fixed:
-    20725: Search application crashes
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 20 Oct 2005 17:18:29 +0300
-
-gtk+2.0 (2:2.6.4-1.osso73) unstable; urgency=low
-
-  * Bugs fixed:
-    20302: NOKGTK-51 Sometimes all folders or files are not shown
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 18 Oct 2005 16:23:07 +0300
-
-gtk+2.0 (2:2.6.4-1.osso72) unstable; urgency=low
-
-  * Bugs fixed, once again:
-    17314: NOKGTK-51 GtkTreeModelSort does HUGE amount of unneccesary calls to
-           sort function
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed,  5 Oct 2005 19:18:10 +0300
-
-gtk+2.0 (2:2.6.4-1.osso71) unstable; urgency=low
-
-  * Bugs fixed:
-    19035: Submenu does not get focus correctly
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed,  5 Oct 2005 18:57:05 +0300
-
-gtk+2.0 (2:2.6.4-1.osso70) unstable; urgency=low
-
-  * Bugs fixed:
-    20154: GdkPixbuf: libjpeg buffered mode wastes memory
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon,  3 Oct 2005 16:42:45 +0300
-
-gtk+2.0 (2:2.6.4-1.osso69) unstable; urgency=low
-
-  * Bugs fixed:
-    19943: Small memory leak from Gtk treeview on each fileselector opening
-    20050: GtkImage leaks animation frames
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 30 Sep 2005 18:39:37 +0300
-
-gtk+2.0 (2:2.6.4-1.osso68) unstable; urgency=low
-
-  * Bugs fixed:
-    19981: treeview leaks memory
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 28 Sep 2005 17:35:49 +0300
-
-gtk+2.0 (2:2.6.4-1.osso67) unstable; urgency=low
-
-  * Bugs fixed:
-    16999: Password entry not behaving consistent with
-    gtk_entry_set_visibility()
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 28 Sep 2005 14:57:38 +0300
-
-gtk+2.0 (2:2.6.4-1.osso66) unstable; urgency=low
-
-  * debian/patches/bug19667.diff: Added
-  * Bugs fixed:
-    19667: GtkCellRendererPixbuf memory leak.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 23 Sep 2005 19:14:28 +0300
-
-gtk+2.0 (2:2.6.4-1.osso65) unstable; urgency=low
-
-  * debian/patches/bug19195.diff: Added
-  * Bugs fixed:
-    19195: Tap-n-hold animation leaks animation iterators
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 21 Sep 2005 12:39:58 +0300
-
-gtk+2.0 (2:2.6.4-1.osso64) unstable; urgency=low
-
-  * debian/patches/bug19416.diff: Added
-  * Bugs fixed:
-    19416: Audo file invisible in file selection widget
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 19 Sep 2005 15:54:44 +0300
-
-gtk+2.0 (2:2.6.4-1.osso63) unstable; urgency=low
-
-  * debian/patches/bug17314.diff: Added
-  * Bugs, hopefully for the last time, fixed:
-    17314: NOKGTK-51 GtkTreeModelSort does HUGE amount of unneccesary calls to
-           sort function
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 15 Sep 2005 19:10:57 +0300
-
-gtk+2.0 (2:2.6.4-1.osso62) unstable; urgency=low
-
-  * Bugs fixed:
-    18455: Incorrect focus handling between Menu and System modal dialog
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed, 14 Sep 2005 18:23:04 +0300
-
-gtk+2.0 (2:2.6.4-1.osso61) unstable; urgency=low
-
-  * Bugs fixed:
-    19117: Display blanked due to the Hildon File selection widget crash on
-           closing the MMC cover
-    19120: Input Method Main Menu disappears on tapping on menu items
-  * Bugs reopened: 17314, 18455
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 13 Sep 2005 13:19:47 +0300
-
-gtk+2.0 (2:2.6.4-1.osso60) unstable; urgency=low
-
-  * Fix small memory leak.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 12 Sep 2005 12:33:59 +0300
-
-gtk+2.0 (2:2.6.4-1.osso59) unstable; urgency=low
-
-  * Bugs fixed:
-    17314: NOKGTK-51 GtkTreeModelSort does HUGE amount of unneccesary calls to
-           sort function
-    18597: TRUE Long connection does not show in connectivity settings window
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  8 Sep 2005 17:58:11 +0300
-
-gtk+2.0 (2:2.6.4-1.osso58) unstable; urgency=low
-
-  * Really fix 16761
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  8 Sep 2005 13:53:51 +0300
-
-gtk+2.0 (2:2.6.4-1.osso57) unstable; urgency=low
-
-  * Bugs fixed:
-    18455: Incorrect focus handling between Menu and System modal dialog
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  8 Sep 2005 12:16:01 +0300
-
-gtk+2.0 (2:2.6.4-1.osso56) unstable; urgency=low
-
-  * Bugs fixed:
-    11711: On opening the submenu sometimes the Main menu dissapears.
-    16744: E-mail application crashes sometimes when tapped on Bold toolbar
-           item
-    16761: AFW Stress Testing: VKB does not disappear when Find tool bar is
-           closed
-    18433: Gtk/Glib critical warning are thrown at runtime when fileselection
-           dialog is opened
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Wed,  7 Sep 2005 18:12:35 +0300
-
-gtk+2.0 (2:2.6.4-1.osso55) unstable; urgency=low
-
-  * debian/patches/001_im-switch.diff: Added
-  * Add support for runtime input method switching (and hardware keyboards)
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon,  5 Sep 2005 18:53:25 +0300
-
-gtk+2.0 (2:2.6.4-1.osso54) unstable; urgency=low
-
-  * debian/patches/bug18487.diff: Added
-  * Bugs fixed:
-    18487: Crafted BMPs crash libpixbufloader-bmp.so
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  1 Sep 2005 14:56:10 +0300
-
-gtk+2.0 (2:2.6.4-1.osso53) unstable; urgency=low
-
-  * Bugs fixed:
-    17117: Layout problems in HWR Teach
-    18260: MMC not visible in file selector
-  * Bugs reopened: 17314
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 30 Aug 2005 17:27:34 +0300
-
-gtk+2.0 (2:2.6.4-1.osso52) unstable; urgency=low
-
-  * Bugs fixed:
-    16593: AFW Stress Testing: Menu disappears when we continuously navigate
-           between the menu items containing submenus
-    17314: NOKGTK-51 GtkTreeModelSort does HUGE amount of unneccesary calls to
-           sort function
-    17568: Desktop theme doesn't change (always) when theme is changed on
-           first bootup after flashing.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 25 Aug 2005 11:53:14 +0300
-
-gtk+2.0 (2:2.6.4-1.osso51) unstable; urgency=low
-
-  * debian/patches/bug17078-io-ico.diff: Removed, integrated in the big patch.
-  * debian/update-gtk-immodules.in:
-    - module version is 2.4.0.
-  * Bugs fixed:
-     8922: Errors during post-inst of Gtk 2.6
-    12176: it_IT Control Panel Date Time: Calendar view in English
-    16485: AFW Stress Testing: Device reboots on using the Web shortcut
-           details menu item in Home application menu.
-    17717: Autocapitalization in GtkEntry secret mode should be removed
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 22 Aug 2005 17:03:32 +0300
-
-gtk+2.0 (2:2.6.4-1.osso50) unstable; urgency=low
-
-  * debian/patches/bug17078-io-ico.diff: Added
-  * Bugs fixed:
-    17078: LibPixbufLoaderIco crashes when opening attached .ico image
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 18 Aug 2005 15:35:00 +0300
-
-gtk+2.0 (2:2.6.4-1.osso49) unstable; urgency=low
-
-  * debian/patches/*: replaced per-file patches with single diff.
-  * Bugs fixed:
-    16733: Strange auto-cap behavir with inverted question & exclamation marks
-    11711: On opening the submenu sometimes the Main menu dissapears.
-    10856: Modified GtkTreeView do not draw drag'n'drop destination row.
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 16 Aug 2005 11:41:43 +0300
-
-gtk+2.0 (2:2.6.4-1.osso48) unstable; urgency=low
-
-  * Bugs fixed:
-    13757: NOKGTK-44 Blank space appears in single line editor widgets when
-           selecting text by tapping
-    15422: 'File format not supported' error (should be OOM) for valid but
-           large 'image/jpeg' files
-    16736: NOKGTK-47 Crash in rich text deserialization
-
-  * debian/patches/gtkhbbox.c.diff: Fix crash when GtkHButtonBox is empty
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu, 11 Aug 2005 10:53:05 +0300
-
-gtk+2.0 (2:2.6.4-1.osso46) unstable; urgency=low
-
-  * Bugs fixed:
-     1883: Minor Code Review Comments For Gtkmenushell
-     8307: MMC is shown in multiple levels
-    10684: NOKGTK-22 Treeview (or filechooser specific) crash when editing
-    10856: Modified GtkTreeView does not draw drag'n'drop
-    11797: Problem with Search bookmark dalog appearance
-    13431: Opening submenus quickly causes problems
-    13838: choice list is too narrow in browser/toolbar
-    14611: Auto-capitalisation turns ON unexpectedly
-    14765: en-GB, , es-MX 2005-24, Search - Sort results by - choice list
-           items truncated
-    16060: GtkComboBox: Eating up key-press-event for GDK_Left
-    16417: <ESC> key closes all menu levels at once
-    16571: Critical warnings thrown upon creation of GtkTreeView
-    16576: Runtime critical warnings due to HildonTimeEditor
-
-  * Fixed (partially?)
-     8891: NOKGTK-38 copy/paste functionality not working fine
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon,  8 Aug 2005 15:52:19 +0300
-
-gtk+2.0 (2:2.6.4-1.osso34.1) unstable; urgency=low
-
-  * Maemo dev release
-
- -- Tommi Komulainen <tommi.komulainen at nokia.com>  Mon, 27 Jun 2005 13:41:16 +0300

Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso11/debian/changelog (from rev 11273, projects/haf/trunk/gtk+/debian/changelog)

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombo.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombo.c	2007-04-24 21:31:24 UTC (rev 11272)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombo.c	2007-04-25 08:02:57 UTC (rev 11278)
@@ -939,7 +939,6 @@
 		    G_CALLBACK (gtk_combo_popup_button_leave), combo);
 
   combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_widget_set_name (combo->popwin, "gtk-combo-popup-window");
   gtk_window_set_type_hint (GTK_WINDOW (combo->popwin), GDK_WINDOW_TYPE_HINT_COMBO);
   g_object_ref (combo->popwin);
   gtk_window_set_resizable (GTK_WINDOW (combo->popwin), FALSE);

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombobox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2007-04-24 21:31:24 UTC (rev 11272)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombobox.c	2007-04-25 08:02:57 UTC (rev 11278)
@@ -1320,7 +1320,9 @@
 	  GtkWidget *toplevel;
 	  
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-          gtk_widget_set_name (combo_box->priv->popup_window, "gtk-combobox-popup-window");
+#ifdef MAEMO_CHANGES
+          gtk_widget_set_name (combo_box->priv->popup_window, "hildon-combobox-window"); 
+#endif /* MAEMO_CHANGES */
 
 	  gtk_window_set_type_hint (GTK_WINDOW (combo_box->priv->popup_window),
 				    GDK_WINDOW_TYPE_HINT_COMBO);
@@ -2696,8 +2698,6 @@
 
   /* create our funky menu */
   menu = gtk_menu_new ();
-  gtk_widget_set_name (menu, "gtk-combobox-popup-menu");
-  
   g_signal_connect (menu, "key_press_event",
 		    G_CALLBACK (gtk_combo_box_menu_key_press), combo_box);
   gtk_combo_box_set_popup_widget (combo_box, menu);

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtktogglebutton.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktogglebutton.c	2007-04-24 21:31:24 UTC (rev 11272)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtktogglebutton.c	2007-04-25 08:02:57 UTC (rev 11278)
@@ -138,6 +138,8 @@
   toggle_button->active = FALSE;
   toggle_button->draw_indicator = FALSE;
   GTK_BUTTON (toggle_button)->depress_on_activate = TRUE;
+
+  g_debug ("GTKTOGGLEBUTTON INIT");
 }
 
 


More information about the maemo-commits mailing list