Merge lp:~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Rodrigo Moya]

[Robert Ancell (robert-ancell)]

Two issues:
- The gtk-builder-convert and gtk-update-icon-cache programs need to be versioned so they don't conflict with the GTK2 versions
- The symbols file shouldn't have -1ubuntu1 on the symbol versions

review: Needs Fixing

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-23 05:22:09 +0000
+++ debian/changelog	2011-01-14 13:47:10 +0000
@@ -1,3 +1,30 @@
+gtk+3.0 (2.99.2-1ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/015_default-fallback-icon-theme.patch:
+  * debian/patches/043_ubuntu_menu_proxy.patch:
+  * debian/patches/071_no_offscreen_widgets_grabbing.patch:
+  * debian/patches/072_indicator_menu_update.patch:
+  * debian/patches/091_bugzilla_tooltip_refresh.patch:
+    - Rebased patches
+  * debian/patches/004_gir_with_separate_build_tree.patch:
+  * debian/patches/005_support_disabling_x11_extensions.patch:
+  * debian/patches/061_use_pdf_as_default_printing_standard.patch:
+  * debian/patches/074_expose_active_menu_item.patch:
+  * debian/patches/093_dso_link_issues.patch:
+  * debian/patches/094_gtkprint_test_fix.patch:
+    - Remove upstreamed and obsolete patches
+  * debian/libgtk3.0-0.install.in:
+  * debian/libgtk3.0-bin.install.in:
+  * debian/libgtk3.0-dev.install.in:
+  * debian/libgtk3.0-dev.manpages:
+    - Fix to install correct files
+  * debian/libgtk3.0-0.symbols:
+  * debian/libgail3.0-0.symbols:
+    - Updated to new API
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 13 Jan 2011 16:05:39 +0100
+
 gtk+3.0 (2.91.7-1ubuntu1) natty; urgency=low
 
   * Merge with Debian experimental, remaining Ubuntu changes:

=== modified file 'debian/control'
--- debian/control	2010-12-23 05:22:09 +0000
+++ debian/control	2011-01-14 13:47:10 +0000
@@ -43,7 +43,8 @@
                gawk,
                xsltproc,
                shared-mime-info
-Build-Depends-Indep: docbook-xml,
+Build-Depends-Indep: gtk-doc-tools (>= 1.8),
+                     docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
                      libatk1.0-doc,

=== modified file 'debian/control.in'
--- debian/control.in	2010-12-23 05:22:09 +0000
+++ debian/control.in	2011-01-14 13:47:10 +0000
@@ -43,7 +43,8 @@
                gawk,
                xsltproc,
                shared-mime-info
-Build-Depends-Indep: docbook-xml,
+Build-Depends-Indep: gtk-doc-tools (>= 1.8),
+                     docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
                      libatk1.0-doc,

=== modified file 'debian/libgail3.0-0.symbols'
--- debian/libgail3.0-0.symbols	2010-10-14 13:59:32 +0000
+++ debian/libgail3.0-0.symbols	2011-01-14 13:47:10 +0000
@@ -1,6 +1,5 @@
 libgailutil-3.0.so.0 libgail3.0-0 #MINVER#
  gail_misc_add_attribute@Base 2.90.5
- gail_misc_add_to_attr_set@Base 2.90.5
  gail_misc_buffer_get_run_attributes@Base 2.90.5
  gail_misc_get_default_attributes@Base 2.90.5
  gail_misc_get_extents_from_pango_rectangle@Base 2.90.5

=== modified file 'debian/libgtk3.0-0.install.in'
--- debian/libgtk3.0-0.install.in	2010-10-14 13:59:32 +0000
+++ debian/libgtk3.0-0.install.in	2011-01-14 13:47:10 +0000
@@ -1,7 +1,7 @@
 # from the shared flavor
 debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@
 debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@
-debian/install/shared/usr/bin/gtk-update-icon-cache-3.0 @LIBDIR@/@SHARED_PKG@
+debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
 debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
 debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
 debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@

=== modified file 'debian/libgtk3.0-0.symbols'
--- debian/libgtk3.0-0.symbols	2010-12-23 05:15:15 +0000
+++ debian/libgtk3.0-0.symbols	2011-01-14 13:47:10 +0000
@@ -58,9 +58,11 @@
  gdk_device_get_n_axes@Base 2.91.6
  gdk_device_get_n_keys@Base 2.91.6
  gdk_device_get_name@Base 2.91.6
+ gdk_device_get_position@Base 2.99.2-1ubuntu1
  gdk_device_get_source@Base 2.91.6
  gdk_device_get_state@Base 2.91.6
  gdk_device_get_type@Base 2.91.6
+ gdk_device_get_window_at_position@Base 2.99.2-1ubuntu1
  gdk_device_grab@Base 2.91.6
  gdk_device_grab_info_libgtk_only@Base 2.91.6
  gdk_device_list_axes@Base 2.91.6
@@ -72,7 +74,6 @@
  gdk_device_set_axis_use@Base 2.91.6
  gdk_device_set_key@Base 2.91.6
  gdk_device_set_mode@Base 2.91.6
- gdk_device_set_source@Base 2.91.6
  gdk_device_type_get_type@Base 2.91.6
  gdk_device_ungrab@Base 2.91.6
  gdk_device_warp@Base 2.91.7
@@ -88,7 +89,6 @@
  gdk_display_get_default_group@Base 2.91.6
  gdk_display_get_default_screen@Base 2.91.6
  gdk_display_get_device_manager@Base 2.91.6
- gdk_display_get_device_state@Base 2.91.6
  gdk_display_get_event@Base 2.91.6
  gdk_display_get_maximal_cursor_size@Base 2.91.6
  gdk_display_get_n_screens@Base 2.91.6
@@ -96,7 +96,6 @@
  gdk_display_get_pointer@Base 2.91.6
  gdk_display_get_screen@Base 2.91.6
  gdk_display_get_type@Base 2.91.6
- gdk_display_get_window_at_device_position@Base 2.91.6
  gdk_display_get_window_at_pointer@Base 2.91.6
  gdk_display_has_pending@Base 2.91.7
  gdk_display_is_closed@Base 2.91.6
@@ -116,10 +115,8 @@
  gdk_display_pointer_ungrab@Base 2.91.6
  gdk_display_put_event@Base 2.91.6
  gdk_display_request_selection_notification@Base 2.91.6
- gdk_display_set_device_hooks@Base 2.91.6
  gdk_display_set_double_click_distance@Base 2.91.6
  gdk_display_set_double_click_time@Base 2.91.6
- gdk_display_set_pointer_hooks@Base 2.91.6
  gdk_display_store_clipboard@Base 2.91.6
  gdk_display_supports_clipboard_persistence@Base 2.91.6
  gdk_display_supports_composite@Base 2.91.6
@@ -307,7 +304,6 @@
  gdk_selection_send_notify@Base 2.91.6
  gdk_selection_send_notify_for_display@Base 2.91.6
  gdk_set_double_click_time@Base 2.91.6
- gdk_set_pointer_hooks@Base 2.91.6
  gdk_set_program_class@Base 2.91.6
  gdk_set_show_events@Base 2.91.6
  gdk_setting_action_get_type@Base 2.91.6
@@ -928,19 +924,6 @@
  gtk_cell_area_apply_attributes@Base 2.91.7
  gtk_cell_area_attribute_connect@Base 2.91.7
  gtk_cell_area_attribute_disconnect@Base 2.91.7
- gtk_cell_area_box_context_copy@Base 2.91.7
- gtk_cell_area_box_context_get_group_height@Base 2.91.7
- gtk_cell_area_box_context_get_group_height_for_width@Base 2.91.7
- gtk_cell_area_box_context_get_group_width@Base 2.91.7
- gtk_cell_area_box_context_get_group_width_for_height@Base 2.91.7
- gtk_cell_area_box_context_get_heights@Base 2.91.7
- gtk_cell_area_box_context_get_orientation_allocs@Base 2.91.7
- gtk_cell_area_box_context_get_type@Base 2.91.7
- gtk_cell_area_box_context_get_widths@Base 2.91.7
- gtk_cell_area_box_context_push_group_height@Base 2.91.7
- gtk_cell_area_box_context_push_group_height_for_width@Base 2.91.7
- gtk_cell_area_box_context_push_group_width@Base 2.91.7
- gtk_cell_area_box_context_push_group_width_for_height@Base 2.91.7
  gtk_cell_area_box_get_spacing@Base 2.91.7
  gtk_cell_area_box_get_type@Base 2.91.7
  gtk_cell_area_box_init_groups@Base 2.91.7
@@ -1065,19 +1048,22 @@
  gtk_cell_renderer_toggle_set_activatable@Base 2.91.6
  gtk_cell_renderer_toggle_set_active@Base 2.91.6
  gtk_cell_renderer_toggle_set_radio@Base 2.91.6
- gtk_cell_view_get_desired_height_for_width_of_row@Base 2.91.6
- gtk_cell_view_get_desired_width_of_row@Base 2.91.6
  gtk_cell_view_get_displayed_row@Base 2.91.6
+ gtk_cell_view_get_draw_sensitive@Base 2.99.2-1ubuntu1
+ gtk_cell_view_get_fit_model@Base 2.99.2-1ubuntu1
  gtk_cell_view_get_model@Base 2.91.6
  gtk_cell_view_get_size_of_row@Base 2.91.6
  gtk_cell_view_get_type@Base 2.91.6
  gtk_cell_view_new@Base 2.91.6
+ gtk_cell_view_new_with_context@Base 2.99.2-1ubuntu1
  gtk_cell_view_new_with_markup@Base 2.91.6
  gtk_cell_view_new_with_pixbuf@Base 2.91.6
  gtk_cell_view_new_with_text@Base 2.91.6
  gtk_cell_view_set_background_color@Base 2.91.6
  gtk_cell_view_set_background_rgba@Base 2.91.6
  gtk_cell_view_set_displayed_row@Base 2.91.6
+ gtk_cell_view_set_draw_sensitive@Base 2.99.2-1ubuntu1
+ gtk_cell_view_set_fit_model@Base 2.99.2-1ubuntu1
  gtk_cell_view_set_model@Base 2.91.6
  gtk_check_button_get_type@Base 2.91.6
  gtk_check_button_new@Base 2.91.6
@@ -1163,6 +1149,7 @@
  gtk_color_selection_set_previous_alpha@Base 2.91.6
  gtk_color_selection_set_previous_color@Base 2.91.6
  gtk_color_selection_set_previous_rgba@Base 2.91.6
+ gtk_combo_box_cell_layout_get_area@Base 2.99.2-1ubuntu1
  gtk_combo_box_get_active@Base 2.91.6
  gtk_combo_box_get_active_id@Base 2.91.6
  gtk_combo_box_get_active_iter@Base 2.91.6
@@ -1182,6 +1169,8 @@
  gtk_combo_box_get_type@Base 2.91.6
  gtk_combo_box_get_wrap_width@Base 2.91.6
  gtk_combo_box_new@Base 2.91.6
+ gtk_combo_box_new_with_area@Base 2.99.2-1ubuntu1
+ gtk_combo_box_new_with_area_and_entry@Base 2.99.2-1ubuntu1
  gtk_combo_box_new_with_entry@Base 2.91.6
  gtk_combo_box_new_with_model@Base 2.91.6
  gtk_combo_box_new_with_model_and_entry@Base 2.91.6
@@ -1792,6 +1781,7 @@
  gtk_icon_view_get_visible_range@Base 2.91.6
  gtk_icon_view_item_activated@Base 2.91.6
  gtk_icon_view_new@Base 2.91.6
+ gtk_icon_view_new_with_area@Base 2.99.2-1ubuntu1
  gtk_icon_view_new_with_model@Base 2.91.6
  gtk_icon_view_path_is_selected@Base 2.91.6
  gtk_icon_view_scroll_to_path@Base 2.91.6
@@ -2024,6 +2014,7 @@
  gtk_menu_item_deselect@Base 2.91.6
  gtk_menu_item_get_accel_path@Base 2.91.6
  gtk_menu_item_get_label@Base 2.91.6
+ gtk_menu_item_get_reserve_indicator@Base 2.99.2-1ubuntu1
  gtk_menu_item_get_right_justified@Base 2.91.6
  gtk_menu_item_get_submenu@Base 2.91.6
  gtk_menu_item_get_type@Base 2.91.6
@@ -2034,6 +2025,7 @@
  gtk_menu_item_select@Base 2.91.6
  gtk_menu_item_set_accel_path@Base 2.91.6
  gtk_menu_item_set_label@Base 2.91.6
+ gtk_menu_item_set_reserve_indicator@Base 2.99.2-1ubuntu1
  gtk_menu_item_set_right_justified@Base 2.91.6
  gtk_menu_item_set_submenu@Base 2.91.6
  gtk_menu_item_set_use_underline@Base 2.91.6
@@ -2058,6 +2050,7 @@
  gtk_menu_shell_cancel@Base 2.91.6
  gtk_menu_shell_deactivate@Base 2.91.6
  gtk_menu_shell_deselect@Base 2.91.6
+ gtk_menu_shell_get_parent_shell@Base 2.99.2-1ubuntu1
  gtk_menu_shell_get_selected_item@Base 2.91.6
  gtk_menu_shell_get_take_focus@Base 2.91.6
  gtk_menu_shell_get_type@Base 2.91.6
@@ -2150,6 +2143,19 @@
  gtk_notebook_set_tab_reorderable@Base 2.91.6
  gtk_notebook_tab_get_type@Base 2.91.6
  gtk_number_up_layout_get_type@Base 2.91.6
+ gtk_numerable_icon_get_background_gicon@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_get_background_icon_name@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_get_count@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_get_label@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_get_style_context@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_get_type@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_new@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_new_with_style_context@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_set_background_gicon@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_set_background_icon_name@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_set_count@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_set_label@Base 2.99.2-1ubuntu1
+ gtk_numerable_icon_set_style_context@Base 2.99.2-1ubuntu1
  gtk_offscreen_window_get_pixbuf@Base 2.91.6
  gtk_offscreen_window_get_surface@Base 2.91.6
  gtk_offscreen_window_get_type@Base 2.91.6
@@ -2507,6 +2513,8 @@
  gtk_printer_option_widget_new@Base 2.91.6
  gtk_printer_option_widget_set_source@Base 2.91.6
  gtk_printer_request_details@Base 2.91.6
+ gtk_printer_set_accepts_pdf@Base 2.99.2-1ubuntu1
+ gtk_printer_set_accepts_ps@Base 2.99.2-1ubuntu1
  gtk_printer_set_description@Base 2.91.6
  gtk_printer_set_has_details@Base 2.91.6
  gtk_printer_set_icon_name@Base 2.91.6
@@ -2534,11 +2542,6 @@
  gtk_progress_bar_set_show_text@Base 2.91.6
  gtk_progress_bar_set_text@Base 2.91.6
  gtk_propagate_event@Base 2.91.6
- gtk_quit_add@Base 2.91.6
- gtk_quit_add_destroy@Base 2.91.6
- gtk_quit_add_full@Base 2.91.6
- gtk_quit_remove@Base 2.91.6
- gtk_quit_remove_by_data@Base 2.91.6
  gtk_radio_action_get_current_value@Base 2.91.6
  gtk_radio_action_get_group@Base 2.91.6
  gtk_radio_action_get_type@Base 2.91.6
@@ -2585,7 +2588,6 @@
  gtk_range_get_slider_range@Base 2.91.6
  gtk_range_get_slider_size_fixed@Base 2.91.6
  gtk_range_get_type@Base 2.91.6
- gtk_range_get_update_policy@Base 2.91.6
  gtk_range_get_upper_stepper_sensitivity@Base 2.91.6
  gtk_range_get_value@Base 2.91.6
  gtk_range_set_adjustment@Base 2.91.6
@@ -2599,7 +2601,6 @@
  gtk_range_set_restrict_to_fill_level@Base 2.91.6
  gtk_range_set_show_fill_level@Base 2.91.6
  gtk_range_set_slider_size_fixed@Base 2.91.6
- gtk_range_set_update_policy@Base 2.91.6
  gtk_range_set_upper_stepper_sensitivity@Base 2.91.6
  gtk_range_set_value@Base 2.91.6
  gtk_rc_add_default_file@Base 2.91.6
@@ -2826,6 +2827,7 @@
  gtk_selection_data_free@Base 2.91.6
  gtk_selection_data_get_data@Base 2.91.6
  gtk_selection_data_get_data_type@Base 2.91.6
+ gtk_selection_data_get_data_with_length@Base 2.99.2-1ubuntu1
  gtk_selection_data_get_display@Base 2.91.6
  gtk_selection_data_get_format@Base 2.91.6
  gtk_selection_data_get_length@Base 2.91.6
@@ -2976,6 +2978,7 @@
  gtk_style_context_add_provider@Base 2.91.6
  gtk_style_context_add_provider_for_screen@Base 2.91.6
  gtk_style_context_add_region@Base 2.91.6
+ gtk_style_context_cancel_animations@Base 2.99.2-1ubuntu1
  gtk_style_context_get@Base 2.91.6
  gtk_style_context_get_background_color@Base 2.91.6
  gtk_style_context_get_border@Base 2.91.6
@@ -3013,6 +3016,7 @@
  gtk_style_context_reset_widgets@Base 2.91.6
  gtk_style_context_restore@Base 2.91.6
  gtk_style_context_save@Base 2.91.6
+ gtk_style_context_scroll_animations@Base 2.99.2-1ubuntu1
  gtk_style_context_set_background@Base 2.91.6
  gtk_style_context_set_direction@Base 2.91.6
  gtk_style_context_set_junction_sides@Base 2.91.6
@@ -3435,9 +3439,6 @@
  gtk_text_view_starts_display_line@Base 2.91.6
  gtk_text_view_window_to_buffer_coords@Base 2.91.6
  gtk_text_window_type_get_type@Base 2.91.6
- gtk_theme_engine_create_rc_style@Base 2.91.6
- gtk_theme_engine_get@Base 2.91.6
- gtk_theme_engine_get_type@Base 2.91.6
  gtk_theming_engine_get@Base 2.91.6
  gtk_theming_engine_get_background_color@Base 2.91.6
  gtk_theming_engine_get_border@Base 2.91.6
@@ -3656,6 +3657,7 @@
  gtk_tree_model_iter_next@Base 2.91.6
  gtk_tree_model_iter_nth_child@Base 2.91.6
  gtk_tree_model_iter_parent@Base 2.91.6
+ gtk_tree_model_iter_previous@Base 2.99.2-1ubuntu1
  gtk_tree_model_ref_node@Base 2.91.6
  gtk_tree_model_row_changed@Base 2.91.6
  gtk_tree_model_row_deleted@Base 2.91.6
@@ -3869,6 +3871,7 @@
  gtk_tree_view_insert_column@Base 2.91.6
  gtk_tree_view_insert_column_with_attributes@Base 2.91.6
  gtk_tree_view_insert_column_with_data_func@Base 2.91.6
+ gtk_tree_view_is_blank_at_pos@Base 2.99.2-1ubuntu1
  gtk_tree_view_is_rubber_banding_active@Base 2.91.6
  gtk_tree_view_map_expanded_rows@Base 2.91.6
  gtk_tree_view_move_column_after@Base 2.91.6
@@ -3930,7 +3933,6 @@
  gtk_ui_manager_remove_ui@Base 2.91.6
  gtk_ui_manager_set_add_tearoffs@Base 2.91.6
  gtk_unit_get_type@Base 2.91.6
- gtk_update_type_get_type@Base 2.91.6
  gtk_vbox_get_type@Base 2.91.6
  gtk_vbox_new@Base 2.91.6
  gtk_vbutton_box_get_type@Base 2.91.6
@@ -3994,6 +3996,7 @@
  gtk_widget_get_composite_name@Base 2.91.6
  gtk_widget_get_default_direction@Base 2.91.6
  gtk_widget_get_default_style@Base 2.91.6
+ gtk_widget_get_device_enabled@Base 2.99.2-1ubuntu1
  gtk_widget_get_device_events@Base 2.91.6
  gtk_widget_get_direction@Base 2.91.6
  gtk_widget_get_display@Base 2.91.6
@@ -4140,6 +4143,7 @@
  gtk_widget_set_child_visible@Base 2.91.6
  gtk_widget_set_composite_name@Base 2.91.6
  gtk_widget_set_default_direction@Base 2.91.6
+ gtk_widget_set_device_enabled@Base 2.99.2-1ubuntu1
  gtk_widget_set_device_events@Base 2.91.6
  gtk_widget_set_direction@Base 2.91.6
  gtk_widget_set_double_buffered@Base 2.91.6
@@ -4214,10 +4218,8 @@
  gtk_window_get_destroy_with_parent@Base 2.91.6
  gtk_window_get_focus@Base 2.91.6
  gtk_window_get_focus_on_map@Base 2.91.6
- gtk_window_get_frame_dimensions@Base 2.91.6
  gtk_window_get_gravity@Base 2.91.6
  gtk_window_get_group@Base 2.91.6
- gtk_window_get_has_frame@Base 2.91.6
  gtk_window_get_has_resize_grip@Base 2.91.6
  gtk_window_get_icon@Base 2.91.6
  gtk_window_get_icon_list@Base 2.91.6
@@ -4283,11 +4285,10 @@
  gtk_window_set_destroy_with_parent@Base 2.91.6
  gtk_window_set_focus@Base 2.91.6
  gtk_window_set_focus_on_map@Base 2.91.6
- gtk_window_set_frame_dimensions@Base 2.91.6
  gtk_window_set_geometry_hints@Base 2.91.6
  gtk_window_set_gravity@Base 2.91.6
- gtk_window_set_has_frame@Base 2.91.6
  gtk_window_set_has_resize_grip@Base 2.91.6
+ gtk_window_set_has_user_ref_count@Base 2.99.2-1ubuntu1
  gtk_window_set_icon@Base 2.91.6
  gtk_window_set_icon_from_file@Base 2.91.6
  gtk_window_set_icon_list@Base 2.91.6

=== modified file 'debian/libgtk3.0-bin.install.in'
--- debian/libgtk3.0-bin.install.in	2010-10-14 13:59:32 +0000
+++ debian/libgtk3.0-bin.install.in	2011-01-14 13:47:10 +0000
@@ -1,4 +1,4 @@
 # from the shared flavor
-docs/reference/gtk/gtk-update-icon-cache-@APIVER@.1 usr/share/man/man1
+docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1
 docs/reference/gtk/gtk-query-immodules-@APIVER@.1 usr/share/man/man1
 debian/update-icon-caches usr/sbin

=== modified file 'debian/libgtk3.0-dev.install.in'
--- debian/libgtk3.0-dev.install.in	2010-12-23 05:15:15 +0000
+++ debian/libgtk3.0-dev.install.in	2011-01-14 13:47:10 +0000
@@ -1,5 +1,5 @@
 # from the shared flavor
-debian/install/shared/usr/bin/gtk-builder-convert-3.0 usr/bin
+debian/install/shared/usr/bin/gtk-builder-convert usr/bin
 debian/install/shared/usr/include/gtk* usr/include
 debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@
 debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@

=== modified file 'debian/libgtk3.0-dev.manpages'
--- debian/libgtk3.0-dev.manpages	2010-10-14 13:59:32 +0000
+++ debian/libgtk3.0-dev.manpages	2011-01-14 13:47:10 +0000
@@ -1,1 +1,1 @@
-docs/reference/gtk/gtk-builder-convert-3.0.1
+docs/reference/gtk/gtk-builder-convert.1

=== removed file 'debian/patches/004_gir_with_separate_build_tree.patch'
--- debian/patches/004_gir_with_separate_build_tree.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/004_gir_with_separate_build_tree.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-From 08a6671a928cae3b0bea998b310f2088c346b24b Mon Sep 17 00:00:00 2001
-From: Martin Pitt <[e-mail]>
-Date: Thu, 2 Dec 2010 16:57:19 +0100
-Subject: [PATCH 2/2] fix building introspection with a separate build directory
-
-When using a separate build tree, gdk/gdkenumtypes.h gets generated in the
-build dir, not in the source dir. Therefore we need to add the build directory
-to the include search path when building the GIRs, so that gdk/gdk.h can
-actually find <gdk/gdkenumtypes.h>.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=636043
----
- gdk/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: gtk+-2.91.7/gdk/Makefile.am
-===================================================================
---- gtk+-2.91.7.orig/gdk/Makefile.am	2010-12-22 09:36:42.000000000 +1100
-+++ gtk+-2.91.7/gdk/Makefile.am	2010-12-22 13:17:44.613372002 +1100
-@@ -33,6 +33,7 @@
- 	-DG_LOG_DOMAIN=\"Gdk\"		\
- 	-DGDK_COMPILATION		\
- 	-I$(top_srcdir)			\
-+	-I$(top_builddir)		\
- 	-I$(top_builddir)/gdk		\
- 	$(GTK_DEBUG_FLAGS)		\
- 	$(GDK_DEP_CFLAGS)

=== removed file 'debian/patches/005_support_disabling_x11_extensions.patch'
--- debian/patches/005_support_disabling_x11_extensions.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/005_support_disabling_x11_extensions.patch	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=612918
-Author: Cyril Brulebois <[e-mail]>
-
-Support disabling X11 extensions
-
-Index: gtk+-2.91.7/configure.ac
-===================================================================
---- gtk+-2.91.7.orig/configure.ac	2010-12-22 13:17:41.573372000 +1100
-+++ gtk+-2.91.7/configure.ac	2010-12-22 13:17:46.143372001 +1100
-@@ -246,6 +246,18 @@
-               [AC_HELP_STRING([--enable-xinerama],
- 	                      [support xinerama extension if available [default=yes]])],,
-               [enable_xinerama="yes"])
-+AC_ARG_ENABLE(xrandr,
-+	      [AC_HELP_STRING([--enable-xrandr],
-+			      [support XRandR extension if available [default=yes]])])
-+AC_ARG_ENABLE(xfixes,
-+	      [AC_HELP_STRING([--enable-xfixes],
-+			      [support XFixes extension if available [default=yes]])])
-+AC_ARG_ENABLE(xcomposite,
-+	      [AC_HELP_STRING([--enable-xcomposite],
-+			      [support X Composite extension if available [default=yes]])])
-+AC_ARG_ENABLE(xdamage,
-+	      [AC_HELP_STRING([--enable-xdamage],
-+			      [support X Damage extension if available [default=yes]])])
- AC_ARG_ENABLE(rebuilds,
-               [AC_HELP_STRING([--disable-rebuilds],
-                               [disable all source autogeneration rules])],,
-@@ -1038,7 +1050,8 @@
-   AM_CONDITIONAL(XINPUT_2,     test "x$have_xinput2" = "xyes")
- 
-   # Check for the RANDR extension
--  if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
-+  if test x"$enable_xrandr" != xno && \
-+     $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
-      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
- 
-      X_PACKAGES="$X_PACKAGES xrandr"
-@@ -1054,7 +1067,8 @@
- 
-   # Checks for XFixes extension
- 
--  if $PKG_CONFIG --exists xfixes ; then
-+  if test x"$enable_xfixes" != xno && \
-+     $PKG_CONFIG --exists xfixes ; then
-     AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
- 
-     X_PACKAGES="$X_PACKAGES xfixes"
-@@ -1063,7 +1077,8 @@
- 
-   # Checks for Xcomposite extension
- 
--  if $PKG_CONFIG --exists xcomposite ; then
-+  if test x"$enable_xcomposite" != xno && \
-+     $PKG_CONFIG --exists xcomposite ; then
-     AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
- 
-     X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -1072,7 +1087,7 @@
- 
-   # Checks for Xdamage extension
- 
--  if $PKG_CONFIG --exists xdamage ; then
-+  if test x"$enable_xdamage" != xno && $PKG_CONFIG --exists xdamage ; then
-     AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
- 
-     X_PACKAGES="$X_PACKAGES xdamage"

=== modified file 'debian/patches/015_default-fallback-icon-theme.patch'
--- debian/patches/015_default-fallback-icon-theme.patch	2010-12-23 05:15:15 +0000
+++ debian/patches/015_default-fallback-icon-theme.patch	2011-01-14 13:47:10 +0000
@@ -1,11 +1,13 @@
+diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
+index 5d17d5f..b047b36 100644
 --- a/gtk/gtksettings.c
 +++ b/gtk/gtksettings.c
-@@ -371,7 +371,7 @@
+@@ -385,7 +385,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                               g_param_spec_string ("gtk-fallback-icon-theme",
- 								  P_("Fallback Icon Theme Name"),
- 								  P_("Name of a icon theme to fall back to"),
--								  NULL,
-+								  "gnome",
- 								  GTK_PARAM_READWRITE),
+                                                                   P_("Fallback Icon Theme Name"),
+                                                                   P_("Name of a icon theme to fall back to"),
+-                                                                  NULL,
++                                                                  "gnome",
+                                                                   GTK_PARAM_READWRITE),
                                               NULL);
    g_assert (result == PROP_FALLBACK_ICON_THEME);

=== modified file 'debian/patches/043_ubuntu_menu_proxy.patch'
--- debian/patches/043_ubuntu_menu_proxy.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/043_ubuntu_menu_proxy.patch	2011-01-14 13:47:10 +0000
@@ -137,8 +137,8 @@
  #include "gtkbuildable.h"
  #include "gtkactivatable.h"
  #include "gtkintl.h"
-@@ -1662,7 +1663,18 @@
- 				  widget);
+@@ -1715,7 +1715,18 @@
+       gtk_menu_shell_select_item (GTK_MENU_SHELL (parent), widget);
      }
    else
 -    g_signal_emit (widget, menu_item_signals[ACTIVATE_ITEM], 0);
@@ -154,7 +154,7 @@
 +          g_signal_emit (widget, menu_item_signals[ACTIVATE_ITEM], 0);
 +        }
 +    }
-   
+ 
    return TRUE;
  }
 Index: gtk+-2.91.7/gtk/gtkmenushell.c
@@ -162,8 +162,8 @@
 --- gtk+-2.91.7.orig/gtk/gtkmenushell.c	2010-12-22 03:36:05.000000000 +1100
 +++ gtk+-2.91.7/gtk/gtkmenushell.c	2010-12-22 13:23:11.843372001 +1100
 @@ -36,6 +36,7 @@
- #include "gtkmenuitem.h"
- #include "gtkmenushell.h"
+ #include "gtkmenuitemprivate.h"
+ #include "gtkmenushellprivate.h"
  #include "gtkmenuprivate.h"
 +#include "ubuntumenuproxy.h"
  #include "gtkmnemonichash.h"
@@ -179,19 +179,9 @@
  };
  
  /* Terminology:
-@@ -135,6 +137,9 @@
- 
-   GdkDevice *grab_pointer;
- 
-+  UbuntuMenuProxy *proxy;
-+  gboolean         local;
-+
-   guint take_focus : 1;
-   guint activated_submenu : 1;
-   /* This flag is a crutch to keep mnemonics in the same menu
-@@ -383,6 +388,14 @@
- 							 TRUE,
- 							 GTK_PARAM_READWRITE));
+@@ -365,6 +367,14 @@
+                                                          TRUE,
+                                                          GTK_PARAM_READWRITE));
  
 +  g_object_class_install_property (object_class,
 +                                   PROP_LOCAL,
@@ -204,7 +194,7 @@
    g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate));
  }
  
-@@ -393,6 +406,22 @@
+@@ -375,6 +385,22 @@
  }
  
  static void
@@ -226,11 +216,11 @@
 +static void
  gtk_menu_shell_init (GtkMenuShell *menu_shell)
  {
-   GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);
-@@ -410,6 +439,13 @@
-   priv->key_hash = NULL;
+   GtkMenuShellPrivate *priv;
+@@ -384,6 +410,13 @@
+                                       GtkMenuShellPrivate);
+   menu_shell->priv = priv;
    priv->take_focus = TRUE;
-   priv->activated_submenu = FALSE;
 +  priv->proxy = ubuntu_menu_proxy_get ();
 +  priv->local = FALSE;
 +
@@ -241,11 +231,11 @@
  }
  
  static void
-@@ -419,12 +455,16 @@
+@@ -393,12 +426,16 @@
                               GParamSpec   *pspec)
  {
    GtkMenuShell *menu_shell = GTK_MENU_SHELL (object);
-+  GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (object);
++  GtkMenuShellPrivate *priv = menu_shell->priv;
  
    switch (prop_id)
      {
@@ -258,11 +248,11 @@
      default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
-@@ -438,12 +478,23 @@
-                              GParamSpec  *pspec)
+@@ -412,12 +449,23 @@
+                              GParamSpec *pspec)
  {
    GtkMenuShell *menu_shell = GTK_MENU_SHELL (object);
-+  GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);
++  GtkMenuShellPrivate *priv = menu_shell->priv;
 +  gboolean local;
  
    switch (prop_id)
@@ -282,9 +272,9 @@
      default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
-@@ -456,6 +507,13 @@
+@@ -432,6 +480,13 @@
    GtkMenuShell *menu_shell = GTK_MENU_SHELL (object);
-   GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);
+   GtkMenuShellPrivate *priv = menu_shell->priv;
  
 +  if (priv->proxy != NULL)
 +    {
@@ -296,8 +286,8 @@
    if (priv->mnemonic_hash)
      _gtk_mnemonic_hash_free (priv->mnemonic_hash);
    if (priv->key_hash)
-@@ -495,14 +553,24 @@
- 		       gint          position)
+@@ -467,14 +522,24 @@
+                        gint          position)
  {
    GtkMenuShellClass *class;
 +  GtkMenuShellPrivate *priv;
@@ -307,7 +297,7 @@
  
    class = GTK_MENU_SHELL_GET_CLASS (menu_shell);
  
-+  priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);
++  priv = menu_shell->priv;
 +
    if (class->insert)
      class->insert (menu_shell, child, position);
@@ -321,7 +311,7 @@
  }
  
  static void
-@@ -1908,3 +1976,23 @@
+@@ -1868,6 +1933,26 @@
        g_object_notify (G_OBJECT (menu_shell), "take-focus");
      }
  }
@@ -333,7 +323,7 @@
 +
 +  g_return_val_if_fail (GTK_IS_MENU_SHELL (shell), FALSE);
 +
-+  priv = GTK_MENU_SHELL_GET_PRIVATE (shell);
++  priv = shell->priv;
 +
 +  if (priv->proxy && !ubuntu_menu_proxy_show_local (priv->proxy))
 +    {
@@ -345,6 +335,9 @@
 +
 +  return FALSE;
 +}
+ 
+ /**
+  * gtk_menu_shell_get_selected_item:
 Index: gtk+-2.91.7/gtk/gtkwindow.c
 ===================================================================
 --- gtk+-2.91.7.orig/gtk/gtkwindow.c	2010-12-22 04:07:05.000000000 +1100
@@ -655,7 +648,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ gtk+-2.91.7/gtk/ubuntumenuproxy.h	2010-12-22 13:23:11.853372001 +1100
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,73 @@
 +/*
 + * Copyright (C) 2010 Canonical, Ltd.
 + *
@@ -685,7 +678,6 @@
 +#define __UBUNTU_MENU_PROXY_H__
 +
 +#include <gtk/gtkwidget.h>
-+#include <gtk/gtktypeutils.h>
 +
 +G_BEGIN_DECLS
 +
@@ -1017,3 +1009,25 @@
 +G_END_DECLS
 +
 +#endif /* __UBUNTU_MENU_PROXY_MODULE_H__ */
+diff --git a/gtk/gtkmenushellprivate.h b/gtk/gtkmenushellprivate.h
+index 6015f0c..50b5ed1 100644
+--- a/gtk/gtkmenushellprivate.h
++++ b/gtk/gtkmenushellprivate.h
+@@ -24,6 +24,7 @@
+ #include <gtk/gtkmenushell.h>
+ #include <gtk/gtkmnemonichash.h>
+ #include <gtk/gtkkeyhash.h>
++#include "ubuntumenuproxy.h"
+ 
+ 
+ G_BEGIN_DECLS
+@@ -54,6 +54,9 @@ struct _GtkMenuShellPrivate
+   GtkKeyHash *key_hash;
+ 
+   GdkDevice *grab_pointer;
++
++  UbuntuMenuProxy *proxy;
++  gboolean local;
+ };
+ 
+ void        _gtk_menu_shell_select_last      (GtkMenuShell *menu_shell,

=== removed file 'debian/patches/061_use_pdf_as_default_printing_standard.patch'
--- debian/patches/061_use_pdf_as_default_printing_standard.patch	2010-12-23 05:15:15 +0000
+++ debian/patches/061_use_pdf_as_default_printing_standard.patch	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-Index: gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c
-===================================================================
---- gtk+3.0-2.90.5.orig/modules/printbackends/cups/gtkprintbackendcups.c	2010-06-28 01:19:39.000000000 +0200
-+++ gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c	2010-07-30 19:12:53.163085281 +0200
-@@ -344,8 +344,9 @@
-  
-   /* TODO: check if it is a ps or pdf printer */
-   
--  surface = cairo_ps_surface_create_for_stream  (_cairo_write_to_cups, cache_io, width, height);
-+  surface = cairo_pdf_surface_create_for_stream  (_cairo_write_to_cups, cache_io, width, height);
- 
-+  /*
-   ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
- 
-   if (ppd_file != NULL)
-@@ -403,6 +404,7 @@
- 
-   if (level == 3)
-     cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
-+  */
- 
-   cairo_surface_set_fallback_resolution (surface,
-                                          2.0 * gtk_print_settings_get_printer_lpi (settings),
-Index: gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c
-===================================================================
---- gtk+3.0-2.90.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c	2010-06-16 17:27:06.000000000 +0200
-+++ gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c	2010-07-30 19:12:53.171184913 +0200
-@@ -31,6 +31,8 @@
- #include <cairo.h>
- #include <cairo-ps.h>
- 
-+#include <cairo-pdf.h>
-+
- #include <glib/gi18n-lib.h>
- 
- #include <gtk/gtk.h>
-@@ -209,7 +211,7 @@
- {
-   cairo_surface_t *surface;
-   
--  surface = cairo_ps_surface_create_for_stream (_cairo_write, cache_io, width, height);
-+  surface = cairo_pdf_surface_create_for_stream (_cairo_write, cache_io, width, height);
- 
-   cairo_surface_set_fallback_resolution (surface,
-                                          2.0 * gtk_print_settings_get_printer_lpi (settings),

=== modified file 'debian/patches/071_no_offscreen_widgets_grabbing.patch'
--- debian/patches/071_no_offscreen_widgets_grabbing.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/071_no_offscreen_widgets_grabbing.patch	2011-01-14 13:47:10 +0000
@@ -5,15 +5,15 @@
 ===================================================================
 --- gtk+-2.91.7.orig/gtk/gtkmain.c	2010-12-22 04:34:49.000000000 +1100
 +++ gtk+-2.91.7/gtk/gtkmain.c	2010-12-22 13:23:20.563372002 +1100
-@@ -1950,9 +1950,14 @@
+@@ -2165,9 +2165,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;
--  
+-
 +  GtkWidget *toplevel;
 +
    g_return_if_fail (widget != NULL);
--  
+-
 +
 +  toplevel = gtk_widget_get_toplevel (widget);
 +  if (toplevel && gdk_window_get_window_type (gtk_widget_get_window (toplevel)) == GDK_WINDOW_OFFSCREEN)

=== modified file 'debian/patches/072_indicator_menu_update.patch'
--- debian/patches/072_indicator_menu_update.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/072_indicator_menu_update.patch	2011-01-14 13:47:10 +0000
@@ -80,9 +80,9 @@
    /**
     * GtkMenuItem:right-justified:
     *
-@@ -1204,6 +1225,11 @@
+@@ -1242,6 +1265,11 @@
        if (gtk_widget_get_parent (GTK_WIDGET (menu_item)))
- 	gtk_widget_queue_resize (GTK_WIDGET (menu_item));
+         gtk_widget_queue_resize (GTK_WIDGET (menu_item));
  
 +      if(submenu == NULL)
 +        g_signal_emit_by_name (menu_item, "submenu-removed");

=== removed file 'debian/patches/074_expose_active_menu_item.patch'
--- debian/patches/074_expose_active_menu_item.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/074_expose_active_menu_item.patch	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-From 646f6ef30e4b01b1f2ebbdb8ab507ee7d174a460 Mon Sep 17 00:00:00 2001
-From: Didier Roche <[e-mail]>
-Date: Thu, 7 Oct 2010 16:39:33 +0200
-Subject: [PATCH] add a function to expose GtkMenuShell::active_menu_item
-
-We can have some cases where we want to know which is the selected
-menuitem in a GtkMenuShell before it became activated.
-Adding a gtk_menu_shell_get_selected_item to the API to get it.
----
- gtk/gtk.symbols    |    1 +
- gtk/gtkmenushell.c |   21 +++++++++++++++++++++
- gtk/gtkmenushell.h |    1 +
- 3 files changed, 23 insertions(+), 0 deletions(-)
-
-Index: gtk+-2.91.7/gtk/gtk.symbols
-===================================================================
---- gtk+-2.91.7.orig/gtk/gtk.symbols	2010-12-22 13:23:15.483372000 +1100
-+++ gtk+-2.91.7/gtk/gtk.symbols	2010-12-22 13:25:30.173372001 +1100
-@@ -1501,6 +1501,7 @@
- gtk_menu_shell_cancel
- gtk_menu_shell_deactivate
- gtk_menu_shell_deselect
-+gtk_menu_shell_get_selected_item
- gtk_menu_shell_get_take_focus
- gtk_menu_shell_get_type G_GNUC_CONST
- gtk_menu_shell_insert
-Index: gtk+-2.91.7/gtk/gtkmenushell.c
-===================================================================
---- gtk+-2.91.7.orig/gtk/gtkmenushell.c	2010-12-22 13:23:21.983372001 +1100
-+++ gtk+-2.91.7/gtk/gtkmenushell.c	2010-12-22 13:25:30.173372001 +1100
-@@ -1348,6 +1348,27 @@
-     }
- }
- 
-+/**
-+ * gtk_menu_shell_get_selected_item:
-+ * @menu_shell: a #GtkMenuShell
-+ *
-+ * Retrieves a pointer to the selected menuitem, or %NULL
-+ * if there is no menuitem selected. A selected menuitem is
-+ * one that is displayed in the prelight state for that menu.
-+ *
-+ * Return value: a #GtkWidget or %NULL in case there is no
-+ * selected menuitem
-+ *
-+ * Since: 2.24
-+ **/
-+GtkWidget *
-+gtk_menu_shell_get_selected_item (GtkMenuShell *menu_shell)
-+{
-+  g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), NULL);
-+
-+  return menu_shell->active_menu_item;
-+}
-+
- void
- gtk_menu_shell_activate_item (GtkMenuShell      *menu_shell,
- 			      GtkWidget         *menu_item,
-Index: gtk+-2.91.7/gtk/gtkmenushell.h
-===================================================================
---- gtk+-2.91.7.orig/gtk/gtkmenushell.h	2010-12-22 03:36:05.000000000 +1100
-+++ gtk+-2.91.7/gtk/gtkmenushell.h	2010-12-22 13:25:30.173372001 +1100
-@@ -114,6 +114,7 @@
- void  gtk_menu_shell_activate_item     (GtkMenuShell *menu_shell,
- 					GtkWidget    *menu_item,
- 					gboolean      force_deactivate);
-+GtkWidget *gtk_menu_shell_get_selected_item (GtkMenuShell *menu_shell);
- void  gtk_menu_shell_select_first      (GtkMenuShell *menu_shell,
- 					gboolean      search_sensitive);
- void _gtk_menu_shell_select_last       (GtkMenuShell *menu_shell,

=== modified file 'debian/patches/091_bugzilla_tooltip_refresh.patch'
--- debian/patches/091_bugzilla_tooltip_refresh.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/091_bugzilla_tooltip_refresh.patch	2011-01-14 13:47:10 +0000
@@ -63,7 +63,7 @@
 +static void
  gtk_tooltip_init (GtkTooltip *tooltip)
  {
-   GtkStyle *style;
+   GtkStyleContext *context;
 @@ -199,8 +237,12 @@
    tooltip->last_window = NULL;
  
@@ -91,7 +91,7 @@
    tooltip->custom_widget = NULL;
  }
  
-@@ -583,19 +632,209 @@
+@@ -596,6 +645,169 @@
    gtk_widget_queue_draw (tooltip->window);
  }
  
@@ -260,57 +260,7 @@
 +
  static gboolean
  gtk_tooltip_paint_window (GtkTooltip *tooltip,
--                          cairo_t    *cr)
-+                          cairo_t    *context)
- {
--  gtk_paint_flat_box (gtk_widget_get_style (tooltip->window),
--		      cr,
--		      GTK_STATE_NORMAL,
--		      GTK_SHADOW_OUT,
--		      tooltip->window,
--		      "tooltip",
--		      0, 0,
--                      gtk_widget_get_allocated_width (tooltip->window),
--                      gtk_widget_get_allocated_height (tooltip->window));
-+  gboolean new_style;
-+
-+  gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL);
-+
-+  if (new_style)
-+    {
-+      cairo_surface_t *surface;
-+      cairo_t         *cr;
-+
-+      cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
-+      surface = cairo_surface_create_similar (cairo_get_target (context),
-+                                              CAIRO_CONTENT_COLOR_ALPHA,
-+                                               gtk_widget_get_allocated_width (tooltip->window),
-+                                               gtk_widget_get_allocated_height (tooltip->window));
-+      cr = cairo_create (surface);
-+      fill_background (tooltip->window, cr);
-+      cairo_destroy (cr);
-+
-+      cairo_set_source_surface (context, surface, 0, 0);
-+      cairo_paint (context);
-+      cairo_surface_destroy (surface);
-+
-+      update_shape (tooltip);
-+    }
-+  else
-+    {
-+      gtk_paint_flat_box (gtk_widget_get_style (tooltip->window),
-+                           context,
-+                          GTK_STATE_NORMAL,
-+                          GTK_SHADOW_OUT,
-+                          tooltip->window,
-+                          "tooltip",
-+                          0, 0,
-+                           gtk_widget_get_allocated_width (tooltip->window),
-+                           gtk_widget_get_allocated_height (tooltip->window));
-+    }
- 
-   return FALSE;
- }
+                           cairo_t    *cr)
 Index: gtk+-2.91.7/gtk/gtkwidget.c
 ===================================================================
 --- gtk+-2.91.7.orig/gtk/gtkwidget.c	2010-12-22 13:23:15.483372000 +1100

=== removed file 'debian/patches/093_dso_link_issues.patch'
--- debian/patches/093_dso_link_issues.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/093_dso_link_issues.patch	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-From f4419be0d68c84ea94488bf1c75c4b6f767b8773 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <[e-mail]>
-Date: Wed, 22 Dec 2010 15:01:50 +1100
-Subject: [PATCH] Fix DSO link issues
-
----
- demos/Makefile.am          |    1 +
- demos/gtk-demo/Makefile.am |    1 +
- docs/tools/Makefile.am     |    2 ++
- gtk/tests/Makefile.am      |    1 +
- perf/Makefile.am           |    1 +
- tests/Makefile.am          |    1 +
- 6 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/demos/Makefile.am b/demos/Makefile.am
-index efdd0b1..dc6fcb6 100644
---- a/demos/Makefile.am
-+++ b/demos/Makefile.am
-@@ -16,6 +16,7 @@ DEPS = \
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.0.la	\
-+	$(top_builddir)/gdk/libgdk-3.0.la	\
- 	$(GTK_DEP_LIBS)				\
- 	$(MATH_LIB)
- 
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 1a5a677..5385dcb 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -59,6 +59,7 @@ DEPS = \
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.0.la	\
-+	$(top_builddir)/gdk/libgdk-3.0.la	\
- 	$(GTK_DEP_LIBS)				\
- 	-lm
- 
-diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
-index d008afc..c4a1c8b 100644
---- a/docs/tools/Makefile.am
-+++ b/docs/tools/Makefile.am
-@@ -13,7 +13,9 @@ DEPS = \
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.0.la	\
-+	$(top_builddir)/gdk/libgdk-3.0.la	\
- 	$(GTK_DEP_LIBS)				\
-+	$(GDK_DEP_LIBS)				\
- 	-lm
- 
- if USE_X11
-diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
-index 35105d3..34367ee 100644
---- a/gtk/tests/Makefile.am
-+++ b/gtk/tests/Makefile.am
-@@ -15,6 +15,7 @@ DEPS = \
- 
- progs_ldadd = \
- 	$(top_builddir)/gtk/libgtk-3.0.la	\
-+	$(top_builddir)/gdk/libgdk-3.0.la	\
- 	$(GTK_DEP_LIBS)
- 
- noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
-diff --git a/perf/Makefile.am b/perf/Makefile.am
-index 3b2c0b0..18e45f4 100644
---- a/perf/Makefile.am
-+++ b/perf/Makefile.am
-@@ -15,6 +15,7 @@ DEPS = \
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.0.la	\
-+	$(top_builddir)/gdk/libgdk-3.0.la	\
- 	$(GTK_DEP_LIBS)
- 
- noinst_PROGRAMS	= 	\
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 744796b..fc4b58e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -16,6 +16,7 @@ DEPS = \
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.0.la	\
-+	$(top_builddir)/gdk/libgdk-3.0.la	\
- 	$(GTK_DEP_LIBS)				\
- 	-lm
- 
--- 
-1.7.2.3
-

=== removed file 'debian/patches/094_gtkprint_test_fix.patch'
--- debian/patches/094_gtkprint_test_fix.patch	2010-12-22 07:44:26 +0000
+++ debian/patches/094_gtkprint_test_fix.patch	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-From 2013e23c4bfc5dd8a154325f8dde865acec9cc42 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <[e-mail]>
-Date: Wed, 22 Dec 2010 15:36:47 +1100
-Subject: [PATCH] Use getters and setters for GtkPrintJob in gtkprintbackendtest.c
-
----
- modules/printbackends/test/gtkprintbackendtest.c |   30 +++++++++++----------
- 1 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/modules/printbackends/test/gtkprintbackendtest.c b/modules/printbackends/test/gtkprintbackendtest.c
-index f40c03c..14c8e52 100644
---- a/modules/printbackends/test/gtkprintbackendtest.c
-+++ b/modules/printbackends/test/gtkprintbackendtest.c
-@@ -525,25 +525,27 @@ test_printer_prepare_for_print (GtkPrinter       *printer,
- {
-   gdouble scale;
- 
--  print_job->print_pages = gtk_print_settings_get_print_pages (settings);
--  print_job->page_ranges = NULL;
--  print_job->num_page_ranges = 0;
-+  gtk_print_job_set_pages (print_job, gtk_print_settings_get_print_pages (settings));
-+  gtk_print_job_set_page_ranges (print_job, NULL, 0);
-   
--  if (print_job->print_pages == GTK_PRINT_PAGES_RANGES)
--    print_job->page_ranges =
--      gtk_print_settings_get_page_ranges (settings,
--					  &print_job->num_page_ranges);
--  
--  print_job->collate = gtk_print_settings_get_collate (settings);
--  print_job->reverse = gtk_print_settings_get_reverse (settings);
--  print_job->num_copies = gtk_print_settings_get_n_copies (settings);
-+  if (gtk_print_job_get_pages (print_job) == GTK_PRINT_PAGES_RANGES)
-+    {
-+      GtkPageRange *page_ranges;
-+      gint num_page_ranges;
-+      page_ranges = gtk_print_settings_get_page_ranges (settings, &num_page_ranges);
-+      gtk_print_job_set_page_ranges (print_job, page_ranges, num_page_ranges);
-+    }
-+
-+  gtk_print_job_set_collate (print_job, gtk_print_settings_get_collate (settings));
-+  gtk_print_job_set_reverse (print_job, gtk_print_settings_get_reverse (settings));
-+  gtk_print_job_set_num_copies (print_job, gtk_print_settings_get_n_copies (settings));
- 
-   scale = gtk_print_settings_get_scale (settings);
-   if (scale != 100.0)
--    print_job->scale = scale/100.0;
-+    gtk_print_job_set_scale (print_job, scale/100.0);
- 
--  print_job->page_set = gtk_print_settings_get_page_set (settings);
--  print_job->rotate_to_orientation = TRUE;
-+  gtk_print_job_set_page_set (print_job, gtk_print_settings_get_page_set (settings));
-+  gtk_print_job_set_rotate (print_job, TRUE);
- }
- 
- static gboolean
--- 
-1.7.2.3
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-23 05:15:15 +0000
+++ debian/patches/series	2011-01-14 13:47:10 +0000
@@ -1,9 +1,7 @@
 001_static-linking-dont-query-immodules.patch
 002_static-linking-dont-build-perf.patch
-003_gdk.pc_privates.patch
+#003_gdk.pc_privates.patch
 004_git_add_missing_include.patch
-004_gir_with_separate_build_tree.patch
-005_support_disabling_x11_extensions.patch
 006_reenable_pixbuf_engine.patch
 015_default-fallback-icon-theme.patch
 022_disable-viqr-im-for-vi-locale.patch
@@ -11,15 +9,11 @@
 042_treeview_single-focus.patch
 043_ubuntu_menu_proxy.patch
 060_ignore-random-icons.patch
-061_use_pdf_as_default_printing_standard.patch
 062_ubuntu-set-grab-add.patch
 065_gir_set_packages.patch
 071_no_offscreen_widgets_grabbing.patch
 072_indicator_menu_update.patch
 073_treeview_almost_fixed.patch
-074_expose_active_menu_item.patch
 075_expose_gdkwidget_for_gtkrange.patch
 091_bugzilla_tooltip_refresh.patch
 092_default_to_xdg_document_dir.patch
-093_dso_link_issues.patch
-094_gtkprint_test_fix.patch