Merge lp:~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release into lp:~ubuntu-desktop/gtk/ubuntugtk3
- Natty (11.04)
- 2_99_2_release
- Merge into ubuntugtk3
Proposed by
Rodrigo Moya
Status: | Merged |
---|---|
Merged at revision: | 36 |
Proposed branch: | lp:~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release |
Merge into: | lp:~ubuntu-desktop/gtk/ubuntugtk3 |
Diff against target: |
1200 lines (+140/-509) 21 files modified
debian/changelog (+27/-0) debian/control (+2/-1) debian/control.in (+2/-1) debian/libgail3.0-0.symbols (+0/-1) debian/libgtk3.0-0.install.in (+1/-1) debian/libgtk3.0-0.symbols (+37/-36) debian/libgtk3.0-bin.install.in (+1/-1) debian/libgtk3.0-dev.install.in (+1/-1) debian/libgtk3.0-dev.manpages (+1/-1) debian/patches/004_gir_with_separate_build_tree.patch (+0/-27) debian/patches/005_support_disabling_x11_extensions.patch (+0/-67) debian/patches/015_default-fallback-icon-theme.patch (+8/-6) debian/patches/043_ubuntu_menu_proxy.patch (+51/-37) debian/patches/061_use_pdf_as_default_printing_standard.patch (+0/-45) debian/patches/071_no_offscreen_widgets_grabbing.patch (+3/-3) debian/patches/072_indicator_menu_update.patch (+2/-2) debian/patches/074_expose_active_menu_item.patch (+0/-70) debian/patches/091_bugzilla_tooltip_refresh.patch (+3/-53) debian/patches/093_dso_link_issues.patch (+0/-91) debian/patches/094_gtkprint_test_fix.patch (+0/-58) debian/patches/series (+1/-7) |
To merge this branch: | bzr merge lp:~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell | Needs Fixing | ||
Review via email: mp+46259@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2010-12-23 05:22:09 +0000 | |||
3 | +++ debian/changelog 2011-01-14 13:47:10 +0000 | |||
4 | @@ -1,3 +1,30 @@ | |||
5 | 1 | gtk+3.0 (2.99.2-1ubuntu1) UNRELEASED; urgency=low | ||
6 | 2 | |||
7 | 3 | * New upstream release | ||
8 | 4 | * debian/patches/015_default-fallback-icon-theme.patch: | ||
9 | 5 | * debian/patches/043_ubuntu_menu_proxy.patch: | ||
10 | 6 | * debian/patches/071_no_offscreen_widgets_grabbing.patch: | ||
11 | 7 | * debian/patches/072_indicator_menu_update.patch: | ||
12 | 8 | * debian/patches/091_bugzilla_tooltip_refresh.patch: | ||
13 | 9 | - Rebased patches | ||
14 | 10 | * debian/patches/004_gir_with_separate_build_tree.patch: | ||
15 | 11 | * debian/patches/005_support_disabling_x11_extensions.patch: | ||
16 | 12 | * debian/patches/061_use_pdf_as_default_printing_standard.patch: | ||
17 | 13 | * debian/patches/074_expose_active_menu_item.patch: | ||
18 | 14 | * debian/patches/093_dso_link_issues.patch: | ||
19 | 15 | * debian/patches/094_gtkprint_test_fix.patch: | ||
20 | 16 | - Remove upstreamed and obsolete patches | ||
21 | 17 | * debian/libgtk3.0-0.install.in: | ||
22 | 18 | * debian/libgtk3.0-bin.install.in: | ||
23 | 19 | * debian/libgtk3.0-dev.install.in: | ||
24 | 20 | * debian/libgtk3.0-dev.manpages: | ||
25 | 21 | - Fix to install correct files | ||
26 | 22 | * debian/libgtk3.0-0.symbols: | ||
27 | 23 | * debian/libgail3.0-0.symbols: | ||
28 | 24 | - Updated to new API | ||
29 | 25 | |||
30 | 26 | -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 13 Jan 2011 16:05:39 +0100 | ||
31 | 27 | |||
32 | 1 | gtk+3.0 (2.91.7-1ubuntu1) natty; urgency=low | 28 | gtk+3.0 (2.91.7-1ubuntu1) natty; urgency=low |
33 | 2 | 29 | ||
34 | 3 | * Merge with Debian experimental, remaining Ubuntu changes: | 30 | * Merge with Debian experimental, remaining Ubuntu changes: |
35 | 4 | 31 | ||
36 | === modified file 'debian/control' | |||
37 | --- debian/control 2010-12-23 05:22:09 +0000 | |||
38 | +++ debian/control 2011-01-14 13:47:10 +0000 | |||
39 | @@ -43,7 +43,8 @@ | |||
40 | 43 | gawk, | 43 | gawk, |
41 | 44 | xsltproc, | 44 | xsltproc, |
42 | 45 | shared-mime-info | 45 | shared-mime-info |
44 | 46 | Build-Depends-Indep: docbook-xml, | 46 | Build-Depends-Indep: gtk-doc-tools (>= 1.8), |
45 | 47 | docbook-xml, | ||
46 | 47 | docbook-utils, | 48 | docbook-utils, |
47 | 48 | libglib2.0-doc, | 49 | libglib2.0-doc, |
48 | 49 | libatk1.0-doc, | 50 | libatk1.0-doc, |
49 | 50 | 51 | ||
50 | === modified file 'debian/control.in' | |||
51 | --- debian/control.in 2010-12-23 05:22:09 +0000 | |||
52 | +++ debian/control.in 2011-01-14 13:47:10 +0000 | |||
53 | @@ -43,7 +43,8 @@ | |||
54 | 43 | gawk, | 43 | gawk, |
55 | 44 | xsltproc, | 44 | xsltproc, |
56 | 45 | shared-mime-info | 45 | shared-mime-info |
58 | 46 | Build-Depends-Indep: docbook-xml, | 46 | Build-Depends-Indep: gtk-doc-tools (>= 1.8), |
59 | 47 | docbook-xml, | ||
60 | 47 | docbook-utils, | 48 | docbook-utils, |
61 | 48 | libglib2.0-doc, | 49 | libglib2.0-doc, |
62 | 49 | libatk1.0-doc, | 50 | libatk1.0-doc, |
63 | 50 | 51 | ||
64 | === modified file 'debian/libgail3.0-0.symbols' | |||
65 | --- debian/libgail3.0-0.symbols 2010-10-14 13:59:32 +0000 | |||
66 | +++ debian/libgail3.0-0.symbols 2011-01-14 13:47:10 +0000 | |||
67 | @@ -1,6 +1,5 @@ | |||
68 | 1 | libgailutil-3.0.so.0 libgail3.0-0 #MINVER# | 1 | libgailutil-3.0.so.0 libgail3.0-0 #MINVER# |
69 | 2 | gail_misc_add_attribute@Base 2.90.5 | 2 | gail_misc_add_attribute@Base 2.90.5 |
70 | 3 | gail_misc_add_to_attr_set@Base 2.90.5 | ||
71 | 4 | gail_misc_buffer_get_run_attributes@Base 2.90.5 | 3 | gail_misc_buffer_get_run_attributes@Base 2.90.5 |
72 | 5 | gail_misc_get_default_attributes@Base 2.90.5 | 4 | gail_misc_get_default_attributes@Base 2.90.5 |
73 | 6 | gail_misc_get_extents_from_pango_rectangle@Base 2.90.5 | 5 | gail_misc_get_extents_from_pango_rectangle@Base 2.90.5 |
74 | 7 | 6 | ||
75 | === modified file 'debian/libgtk3.0-0.install.in' | |||
76 | --- debian/libgtk3.0-0.install.in 2010-10-14 13:59:32 +0000 | |||
77 | +++ debian/libgtk3.0-0.install.in 2011-01-14 13:47:10 +0000 | |||
78 | @@ -1,7 +1,7 @@ | |||
79 | 1 | # from the shared flavor | 1 | # from the shared flavor |
80 | 2 | debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ | 2 | debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ |
81 | 3 | debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ | 3 | debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ |
83 | 4 | debian/install/shared/usr/bin/gtk-update-icon-cache-3.0 @LIBDIR@/@SHARED_PKG@ | 4 | debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ |
84 | 5 | debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules | 5 | debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules |
85 | 6 | debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends | 6 | debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends |
86 | 7 | debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ | 7 | debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ |
87 | 8 | 8 | ||
88 | === modified file 'debian/libgtk3.0-0.symbols' | |||
89 | --- debian/libgtk3.0-0.symbols 2010-12-23 05:15:15 +0000 | |||
90 | +++ debian/libgtk3.0-0.symbols 2011-01-14 13:47:10 +0000 | |||
91 | @@ -58,9 +58,11 @@ | |||
92 | 58 | gdk_device_get_n_axes@Base 2.91.6 | 58 | gdk_device_get_n_axes@Base 2.91.6 |
93 | 59 | gdk_device_get_n_keys@Base 2.91.6 | 59 | gdk_device_get_n_keys@Base 2.91.6 |
94 | 60 | gdk_device_get_name@Base 2.91.6 | 60 | gdk_device_get_name@Base 2.91.6 |
95 | 61 | gdk_device_get_position@Base 2.99.2-1ubuntu1 | ||
96 | 61 | gdk_device_get_source@Base 2.91.6 | 62 | gdk_device_get_source@Base 2.91.6 |
97 | 62 | gdk_device_get_state@Base 2.91.6 | 63 | gdk_device_get_state@Base 2.91.6 |
98 | 63 | gdk_device_get_type@Base 2.91.6 | 64 | gdk_device_get_type@Base 2.91.6 |
99 | 65 | gdk_device_get_window_at_position@Base 2.99.2-1ubuntu1 | ||
100 | 64 | gdk_device_grab@Base 2.91.6 | 66 | gdk_device_grab@Base 2.91.6 |
101 | 65 | gdk_device_grab_info_libgtk_only@Base 2.91.6 | 67 | gdk_device_grab_info_libgtk_only@Base 2.91.6 |
102 | 66 | gdk_device_list_axes@Base 2.91.6 | 68 | gdk_device_list_axes@Base 2.91.6 |
103 | @@ -72,7 +74,6 @@ | |||
104 | 72 | gdk_device_set_axis_use@Base 2.91.6 | 74 | gdk_device_set_axis_use@Base 2.91.6 |
105 | 73 | gdk_device_set_key@Base 2.91.6 | 75 | gdk_device_set_key@Base 2.91.6 |
106 | 74 | gdk_device_set_mode@Base 2.91.6 | 76 | gdk_device_set_mode@Base 2.91.6 |
107 | 75 | gdk_device_set_source@Base 2.91.6 | ||
108 | 76 | gdk_device_type_get_type@Base 2.91.6 | 77 | gdk_device_type_get_type@Base 2.91.6 |
109 | 77 | gdk_device_ungrab@Base 2.91.6 | 78 | gdk_device_ungrab@Base 2.91.6 |
110 | 78 | gdk_device_warp@Base 2.91.7 | 79 | gdk_device_warp@Base 2.91.7 |
111 | @@ -88,7 +89,6 @@ | |||
112 | 88 | gdk_display_get_default_group@Base 2.91.6 | 89 | gdk_display_get_default_group@Base 2.91.6 |
113 | 89 | gdk_display_get_default_screen@Base 2.91.6 | 90 | gdk_display_get_default_screen@Base 2.91.6 |
114 | 90 | gdk_display_get_device_manager@Base 2.91.6 | 91 | gdk_display_get_device_manager@Base 2.91.6 |
115 | 91 | gdk_display_get_device_state@Base 2.91.6 | ||
116 | 92 | gdk_display_get_event@Base 2.91.6 | 92 | gdk_display_get_event@Base 2.91.6 |
117 | 93 | gdk_display_get_maximal_cursor_size@Base 2.91.6 | 93 | gdk_display_get_maximal_cursor_size@Base 2.91.6 |
118 | 94 | gdk_display_get_n_screens@Base 2.91.6 | 94 | gdk_display_get_n_screens@Base 2.91.6 |
119 | @@ -96,7 +96,6 @@ | |||
120 | 96 | gdk_display_get_pointer@Base 2.91.6 | 96 | gdk_display_get_pointer@Base 2.91.6 |
121 | 97 | gdk_display_get_screen@Base 2.91.6 | 97 | gdk_display_get_screen@Base 2.91.6 |
122 | 98 | gdk_display_get_type@Base 2.91.6 | 98 | gdk_display_get_type@Base 2.91.6 |
123 | 99 | gdk_display_get_window_at_device_position@Base 2.91.6 | ||
124 | 100 | gdk_display_get_window_at_pointer@Base 2.91.6 | 99 | gdk_display_get_window_at_pointer@Base 2.91.6 |
125 | 101 | gdk_display_has_pending@Base 2.91.7 | 100 | gdk_display_has_pending@Base 2.91.7 |
126 | 102 | gdk_display_is_closed@Base 2.91.6 | 101 | gdk_display_is_closed@Base 2.91.6 |
127 | @@ -116,10 +115,8 @@ | |||
128 | 116 | gdk_display_pointer_ungrab@Base 2.91.6 | 115 | gdk_display_pointer_ungrab@Base 2.91.6 |
129 | 117 | gdk_display_put_event@Base 2.91.6 | 116 | gdk_display_put_event@Base 2.91.6 |
130 | 118 | gdk_display_request_selection_notification@Base 2.91.6 | 117 | gdk_display_request_selection_notification@Base 2.91.6 |
131 | 119 | gdk_display_set_device_hooks@Base 2.91.6 | ||
132 | 120 | gdk_display_set_double_click_distance@Base 2.91.6 | 118 | gdk_display_set_double_click_distance@Base 2.91.6 |
133 | 121 | gdk_display_set_double_click_time@Base 2.91.6 | 119 | gdk_display_set_double_click_time@Base 2.91.6 |
134 | 122 | gdk_display_set_pointer_hooks@Base 2.91.6 | ||
135 | 123 | gdk_display_store_clipboard@Base 2.91.6 | 120 | gdk_display_store_clipboard@Base 2.91.6 |
136 | 124 | gdk_display_supports_clipboard_persistence@Base 2.91.6 | 121 | gdk_display_supports_clipboard_persistence@Base 2.91.6 |
137 | 125 | gdk_display_supports_composite@Base 2.91.6 | 122 | gdk_display_supports_composite@Base 2.91.6 |
138 | @@ -307,7 +304,6 @@ | |||
139 | 307 | gdk_selection_send_notify@Base 2.91.6 | 304 | gdk_selection_send_notify@Base 2.91.6 |
140 | 308 | gdk_selection_send_notify_for_display@Base 2.91.6 | 305 | gdk_selection_send_notify_for_display@Base 2.91.6 |
141 | 309 | gdk_set_double_click_time@Base 2.91.6 | 306 | gdk_set_double_click_time@Base 2.91.6 |
142 | 310 | gdk_set_pointer_hooks@Base 2.91.6 | ||
143 | 311 | gdk_set_program_class@Base 2.91.6 | 307 | gdk_set_program_class@Base 2.91.6 |
144 | 312 | gdk_set_show_events@Base 2.91.6 | 308 | gdk_set_show_events@Base 2.91.6 |
145 | 313 | gdk_setting_action_get_type@Base 2.91.6 | 309 | gdk_setting_action_get_type@Base 2.91.6 |
146 | @@ -928,19 +924,6 @@ | |||
147 | 928 | gtk_cell_area_apply_attributes@Base 2.91.7 | 924 | gtk_cell_area_apply_attributes@Base 2.91.7 |
148 | 929 | gtk_cell_area_attribute_connect@Base 2.91.7 | 925 | gtk_cell_area_attribute_connect@Base 2.91.7 |
149 | 930 | gtk_cell_area_attribute_disconnect@Base 2.91.7 | 926 | gtk_cell_area_attribute_disconnect@Base 2.91.7 |
150 | 931 | gtk_cell_area_box_context_copy@Base 2.91.7 | ||
151 | 932 | gtk_cell_area_box_context_get_group_height@Base 2.91.7 | ||
152 | 933 | gtk_cell_area_box_context_get_group_height_for_width@Base 2.91.7 | ||
153 | 934 | gtk_cell_area_box_context_get_group_width@Base 2.91.7 | ||
154 | 935 | gtk_cell_area_box_context_get_group_width_for_height@Base 2.91.7 | ||
155 | 936 | gtk_cell_area_box_context_get_heights@Base 2.91.7 | ||
156 | 937 | gtk_cell_area_box_context_get_orientation_allocs@Base 2.91.7 | ||
157 | 938 | gtk_cell_area_box_context_get_type@Base 2.91.7 | ||
158 | 939 | gtk_cell_area_box_context_get_widths@Base 2.91.7 | ||
159 | 940 | gtk_cell_area_box_context_push_group_height@Base 2.91.7 | ||
160 | 941 | gtk_cell_area_box_context_push_group_height_for_width@Base 2.91.7 | ||
161 | 942 | gtk_cell_area_box_context_push_group_width@Base 2.91.7 | ||
162 | 943 | gtk_cell_area_box_context_push_group_width_for_height@Base 2.91.7 | ||
163 | 944 | gtk_cell_area_box_get_spacing@Base 2.91.7 | 927 | gtk_cell_area_box_get_spacing@Base 2.91.7 |
164 | 945 | gtk_cell_area_box_get_type@Base 2.91.7 | 928 | gtk_cell_area_box_get_type@Base 2.91.7 |
165 | 946 | gtk_cell_area_box_init_groups@Base 2.91.7 | 929 | gtk_cell_area_box_init_groups@Base 2.91.7 |
166 | @@ -1065,19 +1048,22 @@ | |||
167 | 1065 | gtk_cell_renderer_toggle_set_activatable@Base 2.91.6 | 1048 | gtk_cell_renderer_toggle_set_activatable@Base 2.91.6 |
168 | 1066 | gtk_cell_renderer_toggle_set_active@Base 2.91.6 | 1049 | gtk_cell_renderer_toggle_set_active@Base 2.91.6 |
169 | 1067 | gtk_cell_renderer_toggle_set_radio@Base 2.91.6 | 1050 | gtk_cell_renderer_toggle_set_radio@Base 2.91.6 |
170 | 1068 | gtk_cell_view_get_desired_height_for_width_of_row@Base 2.91.6 | ||
171 | 1069 | gtk_cell_view_get_desired_width_of_row@Base 2.91.6 | ||
172 | 1070 | gtk_cell_view_get_displayed_row@Base 2.91.6 | 1051 | gtk_cell_view_get_displayed_row@Base 2.91.6 |
173 | 1052 | gtk_cell_view_get_draw_sensitive@Base 2.99.2-1ubuntu1 | ||
174 | 1053 | gtk_cell_view_get_fit_model@Base 2.99.2-1ubuntu1 | ||
175 | 1071 | gtk_cell_view_get_model@Base 2.91.6 | 1054 | gtk_cell_view_get_model@Base 2.91.6 |
176 | 1072 | gtk_cell_view_get_size_of_row@Base 2.91.6 | 1055 | gtk_cell_view_get_size_of_row@Base 2.91.6 |
177 | 1073 | gtk_cell_view_get_type@Base 2.91.6 | 1056 | gtk_cell_view_get_type@Base 2.91.6 |
178 | 1074 | gtk_cell_view_new@Base 2.91.6 | 1057 | gtk_cell_view_new@Base 2.91.6 |
179 | 1058 | gtk_cell_view_new_with_context@Base 2.99.2-1ubuntu1 | ||
180 | 1075 | gtk_cell_view_new_with_markup@Base 2.91.6 | 1059 | gtk_cell_view_new_with_markup@Base 2.91.6 |
181 | 1076 | gtk_cell_view_new_with_pixbuf@Base 2.91.6 | 1060 | gtk_cell_view_new_with_pixbuf@Base 2.91.6 |
182 | 1077 | gtk_cell_view_new_with_text@Base 2.91.6 | 1061 | gtk_cell_view_new_with_text@Base 2.91.6 |
183 | 1078 | gtk_cell_view_set_background_color@Base 2.91.6 | 1062 | gtk_cell_view_set_background_color@Base 2.91.6 |
184 | 1079 | gtk_cell_view_set_background_rgba@Base 2.91.6 | 1063 | gtk_cell_view_set_background_rgba@Base 2.91.6 |
185 | 1080 | gtk_cell_view_set_displayed_row@Base 2.91.6 | 1064 | gtk_cell_view_set_displayed_row@Base 2.91.6 |
186 | 1065 | gtk_cell_view_set_draw_sensitive@Base 2.99.2-1ubuntu1 | ||
187 | 1066 | gtk_cell_view_set_fit_model@Base 2.99.2-1ubuntu1 | ||
188 | 1081 | gtk_cell_view_set_model@Base 2.91.6 | 1067 | gtk_cell_view_set_model@Base 2.91.6 |
189 | 1082 | gtk_check_button_get_type@Base 2.91.6 | 1068 | gtk_check_button_get_type@Base 2.91.6 |
190 | 1083 | gtk_check_button_new@Base 2.91.6 | 1069 | gtk_check_button_new@Base 2.91.6 |
191 | @@ -1163,6 +1149,7 @@ | |||
192 | 1163 | gtk_color_selection_set_previous_alpha@Base 2.91.6 | 1149 | gtk_color_selection_set_previous_alpha@Base 2.91.6 |
193 | 1164 | gtk_color_selection_set_previous_color@Base 2.91.6 | 1150 | gtk_color_selection_set_previous_color@Base 2.91.6 |
194 | 1165 | gtk_color_selection_set_previous_rgba@Base 2.91.6 | 1151 | gtk_color_selection_set_previous_rgba@Base 2.91.6 |
195 | 1152 | gtk_combo_box_cell_layout_get_area@Base 2.99.2-1ubuntu1 | ||
196 | 1166 | gtk_combo_box_get_active@Base 2.91.6 | 1153 | gtk_combo_box_get_active@Base 2.91.6 |
197 | 1167 | gtk_combo_box_get_active_id@Base 2.91.6 | 1154 | gtk_combo_box_get_active_id@Base 2.91.6 |
198 | 1168 | gtk_combo_box_get_active_iter@Base 2.91.6 | 1155 | gtk_combo_box_get_active_iter@Base 2.91.6 |
199 | @@ -1182,6 +1169,8 @@ | |||
200 | 1182 | gtk_combo_box_get_type@Base 2.91.6 | 1169 | gtk_combo_box_get_type@Base 2.91.6 |
201 | 1183 | gtk_combo_box_get_wrap_width@Base 2.91.6 | 1170 | gtk_combo_box_get_wrap_width@Base 2.91.6 |
202 | 1184 | gtk_combo_box_new@Base 2.91.6 | 1171 | gtk_combo_box_new@Base 2.91.6 |
203 | 1172 | gtk_combo_box_new_with_area@Base 2.99.2-1ubuntu1 | ||
204 | 1173 | gtk_combo_box_new_with_area_and_entry@Base 2.99.2-1ubuntu1 | ||
205 | 1185 | gtk_combo_box_new_with_entry@Base 2.91.6 | 1174 | gtk_combo_box_new_with_entry@Base 2.91.6 |
206 | 1186 | gtk_combo_box_new_with_model@Base 2.91.6 | 1175 | gtk_combo_box_new_with_model@Base 2.91.6 |
207 | 1187 | gtk_combo_box_new_with_model_and_entry@Base 2.91.6 | 1176 | gtk_combo_box_new_with_model_and_entry@Base 2.91.6 |
208 | @@ -1792,6 +1781,7 @@ | |||
209 | 1792 | gtk_icon_view_get_visible_range@Base 2.91.6 | 1781 | gtk_icon_view_get_visible_range@Base 2.91.6 |
210 | 1793 | gtk_icon_view_item_activated@Base 2.91.6 | 1782 | gtk_icon_view_item_activated@Base 2.91.6 |
211 | 1794 | gtk_icon_view_new@Base 2.91.6 | 1783 | gtk_icon_view_new@Base 2.91.6 |
212 | 1784 | gtk_icon_view_new_with_area@Base 2.99.2-1ubuntu1 | ||
213 | 1795 | gtk_icon_view_new_with_model@Base 2.91.6 | 1785 | gtk_icon_view_new_with_model@Base 2.91.6 |
214 | 1796 | gtk_icon_view_path_is_selected@Base 2.91.6 | 1786 | gtk_icon_view_path_is_selected@Base 2.91.6 |
215 | 1797 | gtk_icon_view_scroll_to_path@Base 2.91.6 | 1787 | gtk_icon_view_scroll_to_path@Base 2.91.6 |
216 | @@ -2024,6 +2014,7 @@ | |||
217 | 2024 | gtk_menu_item_deselect@Base 2.91.6 | 2014 | gtk_menu_item_deselect@Base 2.91.6 |
218 | 2025 | gtk_menu_item_get_accel_path@Base 2.91.6 | 2015 | gtk_menu_item_get_accel_path@Base 2.91.6 |
219 | 2026 | gtk_menu_item_get_label@Base 2.91.6 | 2016 | gtk_menu_item_get_label@Base 2.91.6 |
220 | 2017 | gtk_menu_item_get_reserve_indicator@Base 2.99.2-1ubuntu1 | ||
221 | 2027 | gtk_menu_item_get_right_justified@Base 2.91.6 | 2018 | gtk_menu_item_get_right_justified@Base 2.91.6 |
222 | 2028 | gtk_menu_item_get_submenu@Base 2.91.6 | 2019 | gtk_menu_item_get_submenu@Base 2.91.6 |
223 | 2029 | gtk_menu_item_get_type@Base 2.91.6 | 2020 | gtk_menu_item_get_type@Base 2.91.6 |
224 | @@ -2034,6 +2025,7 @@ | |||
225 | 2034 | gtk_menu_item_select@Base 2.91.6 | 2025 | gtk_menu_item_select@Base 2.91.6 |
226 | 2035 | gtk_menu_item_set_accel_path@Base 2.91.6 | 2026 | gtk_menu_item_set_accel_path@Base 2.91.6 |
227 | 2036 | gtk_menu_item_set_label@Base 2.91.6 | 2027 | gtk_menu_item_set_label@Base 2.91.6 |
228 | 2028 | gtk_menu_item_set_reserve_indicator@Base 2.99.2-1ubuntu1 | ||
229 | 2037 | gtk_menu_item_set_right_justified@Base 2.91.6 | 2029 | gtk_menu_item_set_right_justified@Base 2.91.6 |
230 | 2038 | gtk_menu_item_set_submenu@Base 2.91.6 | 2030 | gtk_menu_item_set_submenu@Base 2.91.6 |
231 | 2039 | gtk_menu_item_set_use_underline@Base 2.91.6 | 2031 | gtk_menu_item_set_use_underline@Base 2.91.6 |
232 | @@ -2058,6 +2050,7 @@ | |||
233 | 2058 | gtk_menu_shell_cancel@Base 2.91.6 | 2050 | gtk_menu_shell_cancel@Base 2.91.6 |
234 | 2059 | gtk_menu_shell_deactivate@Base 2.91.6 | 2051 | gtk_menu_shell_deactivate@Base 2.91.6 |
235 | 2060 | gtk_menu_shell_deselect@Base 2.91.6 | 2052 | gtk_menu_shell_deselect@Base 2.91.6 |
236 | 2053 | gtk_menu_shell_get_parent_shell@Base 2.99.2-1ubuntu1 | ||
237 | 2061 | gtk_menu_shell_get_selected_item@Base 2.91.6 | 2054 | gtk_menu_shell_get_selected_item@Base 2.91.6 |
238 | 2062 | gtk_menu_shell_get_take_focus@Base 2.91.6 | 2055 | gtk_menu_shell_get_take_focus@Base 2.91.6 |
239 | 2063 | gtk_menu_shell_get_type@Base 2.91.6 | 2056 | gtk_menu_shell_get_type@Base 2.91.6 |
240 | @@ -2150,6 +2143,19 @@ | |||
241 | 2150 | gtk_notebook_set_tab_reorderable@Base 2.91.6 | 2143 | gtk_notebook_set_tab_reorderable@Base 2.91.6 |
242 | 2151 | gtk_notebook_tab_get_type@Base 2.91.6 | 2144 | gtk_notebook_tab_get_type@Base 2.91.6 |
243 | 2152 | gtk_number_up_layout_get_type@Base 2.91.6 | 2145 | gtk_number_up_layout_get_type@Base 2.91.6 |
244 | 2146 | gtk_numerable_icon_get_background_gicon@Base 2.99.2-1ubuntu1 | ||
245 | 2147 | gtk_numerable_icon_get_background_icon_name@Base 2.99.2-1ubuntu1 | ||
246 | 2148 | gtk_numerable_icon_get_count@Base 2.99.2-1ubuntu1 | ||
247 | 2149 | gtk_numerable_icon_get_label@Base 2.99.2-1ubuntu1 | ||
248 | 2150 | gtk_numerable_icon_get_style_context@Base 2.99.2-1ubuntu1 | ||
249 | 2151 | gtk_numerable_icon_get_type@Base 2.99.2-1ubuntu1 | ||
250 | 2152 | gtk_numerable_icon_new@Base 2.99.2-1ubuntu1 | ||
251 | 2153 | gtk_numerable_icon_new_with_style_context@Base 2.99.2-1ubuntu1 | ||
252 | 2154 | gtk_numerable_icon_set_background_gicon@Base 2.99.2-1ubuntu1 | ||
253 | 2155 | gtk_numerable_icon_set_background_icon_name@Base 2.99.2-1ubuntu1 | ||
254 | 2156 | gtk_numerable_icon_set_count@Base 2.99.2-1ubuntu1 | ||
255 | 2157 | gtk_numerable_icon_set_label@Base 2.99.2-1ubuntu1 | ||
256 | 2158 | gtk_numerable_icon_set_style_context@Base 2.99.2-1ubuntu1 | ||
257 | 2153 | gtk_offscreen_window_get_pixbuf@Base 2.91.6 | 2159 | gtk_offscreen_window_get_pixbuf@Base 2.91.6 |
258 | 2154 | gtk_offscreen_window_get_surface@Base 2.91.6 | 2160 | gtk_offscreen_window_get_surface@Base 2.91.6 |
259 | 2155 | gtk_offscreen_window_get_type@Base 2.91.6 | 2161 | gtk_offscreen_window_get_type@Base 2.91.6 |
260 | @@ -2507,6 +2513,8 @@ | |||
261 | 2507 | gtk_printer_option_widget_new@Base 2.91.6 | 2513 | gtk_printer_option_widget_new@Base 2.91.6 |
262 | 2508 | gtk_printer_option_widget_set_source@Base 2.91.6 | 2514 | gtk_printer_option_widget_set_source@Base 2.91.6 |
263 | 2509 | gtk_printer_request_details@Base 2.91.6 | 2515 | gtk_printer_request_details@Base 2.91.6 |
264 | 2516 | gtk_printer_set_accepts_pdf@Base 2.99.2-1ubuntu1 | ||
265 | 2517 | gtk_printer_set_accepts_ps@Base 2.99.2-1ubuntu1 | ||
266 | 2510 | gtk_printer_set_description@Base 2.91.6 | 2518 | gtk_printer_set_description@Base 2.91.6 |
267 | 2511 | gtk_printer_set_has_details@Base 2.91.6 | 2519 | gtk_printer_set_has_details@Base 2.91.6 |
268 | 2512 | gtk_printer_set_icon_name@Base 2.91.6 | 2520 | gtk_printer_set_icon_name@Base 2.91.6 |
269 | @@ -2534,11 +2542,6 @@ | |||
270 | 2534 | gtk_progress_bar_set_show_text@Base 2.91.6 | 2542 | gtk_progress_bar_set_show_text@Base 2.91.6 |
271 | 2535 | gtk_progress_bar_set_text@Base 2.91.6 | 2543 | gtk_progress_bar_set_text@Base 2.91.6 |
272 | 2536 | gtk_propagate_event@Base 2.91.6 | 2544 | gtk_propagate_event@Base 2.91.6 |
273 | 2537 | gtk_quit_add@Base 2.91.6 | ||
274 | 2538 | gtk_quit_add_destroy@Base 2.91.6 | ||
275 | 2539 | gtk_quit_add_full@Base 2.91.6 | ||
276 | 2540 | gtk_quit_remove@Base 2.91.6 | ||
277 | 2541 | gtk_quit_remove_by_data@Base 2.91.6 | ||
278 | 2542 | gtk_radio_action_get_current_value@Base 2.91.6 | 2545 | gtk_radio_action_get_current_value@Base 2.91.6 |
279 | 2543 | gtk_radio_action_get_group@Base 2.91.6 | 2546 | gtk_radio_action_get_group@Base 2.91.6 |
280 | 2544 | gtk_radio_action_get_type@Base 2.91.6 | 2547 | gtk_radio_action_get_type@Base 2.91.6 |
281 | @@ -2585,7 +2588,6 @@ | |||
282 | 2585 | gtk_range_get_slider_range@Base 2.91.6 | 2588 | gtk_range_get_slider_range@Base 2.91.6 |
283 | 2586 | gtk_range_get_slider_size_fixed@Base 2.91.6 | 2589 | gtk_range_get_slider_size_fixed@Base 2.91.6 |
284 | 2587 | gtk_range_get_type@Base 2.91.6 | 2590 | gtk_range_get_type@Base 2.91.6 |
285 | 2588 | gtk_range_get_update_policy@Base 2.91.6 | ||
286 | 2589 | gtk_range_get_upper_stepper_sensitivity@Base 2.91.6 | 2591 | gtk_range_get_upper_stepper_sensitivity@Base 2.91.6 |
287 | 2590 | gtk_range_get_value@Base 2.91.6 | 2592 | gtk_range_get_value@Base 2.91.6 |
288 | 2591 | gtk_range_set_adjustment@Base 2.91.6 | 2593 | gtk_range_set_adjustment@Base 2.91.6 |
289 | @@ -2599,7 +2601,6 @@ | |||
290 | 2599 | gtk_range_set_restrict_to_fill_level@Base 2.91.6 | 2601 | gtk_range_set_restrict_to_fill_level@Base 2.91.6 |
291 | 2600 | gtk_range_set_show_fill_level@Base 2.91.6 | 2602 | gtk_range_set_show_fill_level@Base 2.91.6 |
292 | 2601 | gtk_range_set_slider_size_fixed@Base 2.91.6 | 2603 | gtk_range_set_slider_size_fixed@Base 2.91.6 |
293 | 2602 | gtk_range_set_update_policy@Base 2.91.6 | ||
294 | 2603 | gtk_range_set_upper_stepper_sensitivity@Base 2.91.6 | 2604 | gtk_range_set_upper_stepper_sensitivity@Base 2.91.6 |
295 | 2604 | gtk_range_set_value@Base 2.91.6 | 2605 | gtk_range_set_value@Base 2.91.6 |
296 | 2605 | gtk_rc_add_default_file@Base 2.91.6 | 2606 | gtk_rc_add_default_file@Base 2.91.6 |
297 | @@ -2826,6 +2827,7 @@ | |||
298 | 2826 | gtk_selection_data_free@Base 2.91.6 | 2827 | gtk_selection_data_free@Base 2.91.6 |
299 | 2827 | gtk_selection_data_get_data@Base 2.91.6 | 2828 | gtk_selection_data_get_data@Base 2.91.6 |
300 | 2828 | gtk_selection_data_get_data_type@Base 2.91.6 | 2829 | gtk_selection_data_get_data_type@Base 2.91.6 |
301 | 2830 | gtk_selection_data_get_data_with_length@Base 2.99.2-1ubuntu1 | ||
302 | 2829 | gtk_selection_data_get_display@Base 2.91.6 | 2831 | gtk_selection_data_get_display@Base 2.91.6 |
303 | 2830 | gtk_selection_data_get_format@Base 2.91.6 | 2832 | gtk_selection_data_get_format@Base 2.91.6 |
304 | 2831 | gtk_selection_data_get_length@Base 2.91.6 | 2833 | gtk_selection_data_get_length@Base 2.91.6 |
305 | @@ -2976,6 +2978,7 @@ | |||
306 | 2976 | gtk_style_context_add_provider@Base 2.91.6 | 2978 | gtk_style_context_add_provider@Base 2.91.6 |
307 | 2977 | gtk_style_context_add_provider_for_screen@Base 2.91.6 | 2979 | gtk_style_context_add_provider_for_screen@Base 2.91.6 |
308 | 2978 | gtk_style_context_add_region@Base 2.91.6 | 2980 | gtk_style_context_add_region@Base 2.91.6 |
309 | 2981 | gtk_style_context_cancel_animations@Base 2.99.2-1ubuntu1 | ||
310 | 2979 | gtk_style_context_get@Base 2.91.6 | 2982 | gtk_style_context_get@Base 2.91.6 |
311 | 2980 | gtk_style_context_get_background_color@Base 2.91.6 | 2983 | gtk_style_context_get_background_color@Base 2.91.6 |
312 | 2981 | gtk_style_context_get_border@Base 2.91.6 | 2984 | gtk_style_context_get_border@Base 2.91.6 |
313 | @@ -3013,6 +3016,7 @@ | |||
314 | 3013 | gtk_style_context_reset_widgets@Base 2.91.6 | 3016 | gtk_style_context_reset_widgets@Base 2.91.6 |
315 | 3014 | gtk_style_context_restore@Base 2.91.6 | 3017 | gtk_style_context_restore@Base 2.91.6 |
316 | 3015 | gtk_style_context_save@Base 2.91.6 | 3018 | gtk_style_context_save@Base 2.91.6 |
317 | 3019 | gtk_style_context_scroll_animations@Base 2.99.2-1ubuntu1 | ||
318 | 3016 | gtk_style_context_set_background@Base 2.91.6 | 3020 | gtk_style_context_set_background@Base 2.91.6 |
319 | 3017 | gtk_style_context_set_direction@Base 2.91.6 | 3021 | gtk_style_context_set_direction@Base 2.91.6 |
320 | 3018 | gtk_style_context_set_junction_sides@Base 2.91.6 | 3022 | gtk_style_context_set_junction_sides@Base 2.91.6 |
321 | @@ -3435,9 +3439,6 @@ | |||
322 | 3435 | gtk_text_view_starts_display_line@Base 2.91.6 | 3439 | gtk_text_view_starts_display_line@Base 2.91.6 |
323 | 3436 | gtk_text_view_window_to_buffer_coords@Base 2.91.6 | 3440 | gtk_text_view_window_to_buffer_coords@Base 2.91.6 |
324 | 3437 | gtk_text_window_type_get_type@Base 2.91.6 | 3441 | gtk_text_window_type_get_type@Base 2.91.6 |
325 | 3438 | gtk_theme_engine_create_rc_style@Base 2.91.6 | ||
326 | 3439 | gtk_theme_engine_get@Base 2.91.6 | ||
327 | 3440 | gtk_theme_engine_get_type@Base 2.91.6 | ||
328 | 3441 | gtk_theming_engine_get@Base 2.91.6 | 3442 | gtk_theming_engine_get@Base 2.91.6 |
329 | 3442 | gtk_theming_engine_get_background_color@Base 2.91.6 | 3443 | gtk_theming_engine_get_background_color@Base 2.91.6 |
330 | 3443 | gtk_theming_engine_get_border@Base 2.91.6 | 3444 | gtk_theming_engine_get_border@Base 2.91.6 |
331 | @@ -3656,6 +3657,7 @@ | |||
332 | 3656 | gtk_tree_model_iter_next@Base 2.91.6 | 3657 | gtk_tree_model_iter_next@Base 2.91.6 |
333 | 3657 | gtk_tree_model_iter_nth_child@Base 2.91.6 | 3658 | gtk_tree_model_iter_nth_child@Base 2.91.6 |
334 | 3658 | gtk_tree_model_iter_parent@Base 2.91.6 | 3659 | gtk_tree_model_iter_parent@Base 2.91.6 |
335 | 3660 | gtk_tree_model_iter_previous@Base 2.99.2-1ubuntu1 | ||
336 | 3659 | gtk_tree_model_ref_node@Base 2.91.6 | 3661 | gtk_tree_model_ref_node@Base 2.91.6 |
337 | 3660 | gtk_tree_model_row_changed@Base 2.91.6 | 3662 | gtk_tree_model_row_changed@Base 2.91.6 |
338 | 3661 | gtk_tree_model_row_deleted@Base 2.91.6 | 3663 | gtk_tree_model_row_deleted@Base 2.91.6 |
339 | @@ -3869,6 +3871,7 @@ | |||
340 | 3869 | gtk_tree_view_insert_column@Base 2.91.6 | 3871 | gtk_tree_view_insert_column@Base 2.91.6 |
341 | 3870 | gtk_tree_view_insert_column_with_attributes@Base 2.91.6 | 3872 | gtk_tree_view_insert_column_with_attributes@Base 2.91.6 |
342 | 3871 | gtk_tree_view_insert_column_with_data_func@Base 2.91.6 | 3873 | gtk_tree_view_insert_column_with_data_func@Base 2.91.6 |
343 | 3874 | gtk_tree_view_is_blank_at_pos@Base 2.99.2-1ubuntu1 | ||
344 | 3872 | gtk_tree_view_is_rubber_banding_active@Base 2.91.6 | 3875 | gtk_tree_view_is_rubber_banding_active@Base 2.91.6 |
345 | 3873 | gtk_tree_view_map_expanded_rows@Base 2.91.6 | 3876 | gtk_tree_view_map_expanded_rows@Base 2.91.6 |
346 | 3874 | gtk_tree_view_move_column_after@Base 2.91.6 | 3877 | gtk_tree_view_move_column_after@Base 2.91.6 |
347 | @@ -3930,7 +3933,6 @@ | |||
348 | 3930 | gtk_ui_manager_remove_ui@Base 2.91.6 | 3933 | gtk_ui_manager_remove_ui@Base 2.91.6 |
349 | 3931 | gtk_ui_manager_set_add_tearoffs@Base 2.91.6 | 3934 | gtk_ui_manager_set_add_tearoffs@Base 2.91.6 |
350 | 3932 | gtk_unit_get_type@Base 2.91.6 | 3935 | gtk_unit_get_type@Base 2.91.6 |
351 | 3933 | gtk_update_type_get_type@Base 2.91.6 | ||
352 | 3934 | gtk_vbox_get_type@Base 2.91.6 | 3936 | gtk_vbox_get_type@Base 2.91.6 |
353 | 3935 | gtk_vbox_new@Base 2.91.6 | 3937 | gtk_vbox_new@Base 2.91.6 |
354 | 3936 | gtk_vbutton_box_get_type@Base 2.91.6 | 3938 | gtk_vbutton_box_get_type@Base 2.91.6 |
355 | @@ -3994,6 +3996,7 @@ | |||
356 | 3994 | gtk_widget_get_composite_name@Base 2.91.6 | 3996 | gtk_widget_get_composite_name@Base 2.91.6 |
357 | 3995 | gtk_widget_get_default_direction@Base 2.91.6 | 3997 | gtk_widget_get_default_direction@Base 2.91.6 |
358 | 3996 | gtk_widget_get_default_style@Base 2.91.6 | 3998 | gtk_widget_get_default_style@Base 2.91.6 |
359 | 3999 | gtk_widget_get_device_enabled@Base 2.99.2-1ubuntu1 | ||
360 | 3997 | gtk_widget_get_device_events@Base 2.91.6 | 4000 | gtk_widget_get_device_events@Base 2.91.6 |
361 | 3998 | gtk_widget_get_direction@Base 2.91.6 | 4001 | gtk_widget_get_direction@Base 2.91.6 |
362 | 3999 | gtk_widget_get_display@Base 2.91.6 | 4002 | gtk_widget_get_display@Base 2.91.6 |
363 | @@ -4140,6 +4143,7 @@ | |||
364 | 4140 | gtk_widget_set_child_visible@Base 2.91.6 | 4143 | gtk_widget_set_child_visible@Base 2.91.6 |
365 | 4141 | gtk_widget_set_composite_name@Base 2.91.6 | 4144 | gtk_widget_set_composite_name@Base 2.91.6 |
366 | 4142 | gtk_widget_set_default_direction@Base 2.91.6 | 4145 | gtk_widget_set_default_direction@Base 2.91.6 |
367 | 4146 | gtk_widget_set_device_enabled@Base 2.99.2-1ubuntu1 | ||
368 | 4143 | gtk_widget_set_device_events@Base 2.91.6 | 4147 | gtk_widget_set_device_events@Base 2.91.6 |
369 | 4144 | gtk_widget_set_direction@Base 2.91.6 | 4148 | gtk_widget_set_direction@Base 2.91.6 |
370 | 4145 | gtk_widget_set_double_buffered@Base 2.91.6 | 4149 | gtk_widget_set_double_buffered@Base 2.91.6 |
371 | @@ -4214,10 +4218,8 @@ | |||
372 | 4214 | gtk_window_get_destroy_with_parent@Base 2.91.6 | 4218 | gtk_window_get_destroy_with_parent@Base 2.91.6 |
373 | 4215 | gtk_window_get_focus@Base 2.91.6 | 4219 | gtk_window_get_focus@Base 2.91.6 |
374 | 4216 | gtk_window_get_focus_on_map@Base 2.91.6 | 4220 | gtk_window_get_focus_on_map@Base 2.91.6 |
375 | 4217 | gtk_window_get_frame_dimensions@Base 2.91.6 | ||
376 | 4218 | gtk_window_get_gravity@Base 2.91.6 | 4221 | gtk_window_get_gravity@Base 2.91.6 |
377 | 4219 | gtk_window_get_group@Base 2.91.6 | 4222 | gtk_window_get_group@Base 2.91.6 |
378 | 4220 | gtk_window_get_has_frame@Base 2.91.6 | ||
379 | 4221 | gtk_window_get_has_resize_grip@Base 2.91.6 | 4223 | gtk_window_get_has_resize_grip@Base 2.91.6 |
380 | 4222 | gtk_window_get_icon@Base 2.91.6 | 4224 | gtk_window_get_icon@Base 2.91.6 |
381 | 4223 | gtk_window_get_icon_list@Base 2.91.6 | 4225 | gtk_window_get_icon_list@Base 2.91.6 |
382 | @@ -4283,11 +4285,10 @@ | |||
383 | 4283 | gtk_window_set_destroy_with_parent@Base 2.91.6 | 4285 | gtk_window_set_destroy_with_parent@Base 2.91.6 |
384 | 4284 | gtk_window_set_focus@Base 2.91.6 | 4286 | gtk_window_set_focus@Base 2.91.6 |
385 | 4285 | gtk_window_set_focus_on_map@Base 2.91.6 | 4287 | gtk_window_set_focus_on_map@Base 2.91.6 |
386 | 4286 | gtk_window_set_frame_dimensions@Base 2.91.6 | ||
387 | 4287 | gtk_window_set_geometry_hints@Base 2.91.6 | 4288 | gtk_window_set_geometry_hints@Base 2.91.6 |
388 | 4288 | gtk_window_set_gravity@Base 2.91.6 | 4289 | gtk_window_set_gravity@Base 2.91.6 |
389 | 4289 | gtk_window_set_has_frame@Base 2.91.6 | ||
390 | 4290 | gtk_window_set_has_resize_grip@Base 2.91.6 | 4290 | gtk_window_set_has_resize_grip@Base 2.91.6 |
391 | 4291 | gtk_window_set_has_user_ref_count@Base 2.99.2-1ubuntu1 | ||
392 | 4291 | gtk_window_set_icon@Base 2.91.6 | 4292 | gtk_window_set_icon@Base 2.91.6 |
393 | 4292 | gtk_window_set_icon_from_file@Base 2.91.6 | 4293 | gtk_window_set_icon_from_file@Base 2.91.6 |
394 | 4293 | gtk_window_set_icon_list@Base 2.91.6 | 4294 | gtk_window_set_icon_list@Base 2.91.6 |
395 | 4294 | 4295 | ||
396 | === modified file 'debian/libgtk3.0-bin.install.in' | |||
397 | --- debian/libgtk3.0-bin.install.in 2010-10-14 13:59:32 +0000 | |||
398 | +++ debian/libgtk3.0-bin.install.in 2011-01-14 13:47:10 +0000 | |||
399 | @@ -1,4 +1,4 @@ | |||
400 | 1 | # from the shared flavor | 1 | # from the shared flavor |
402 | 2 | docs/reference/gtk/gtk-update-icon-cache-@APIVER@.1 usr/share/man/man1 | 2 | docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1 |
403 | 3 | docs/reference/gtk/gtk-query-immodules-@APIVER@.1 usr/share/man/man1 | 3 | docs/reference/gtk/gtk-query-immodules-@APIVER@.1 usr/share/man/man1 |
404 | 4 | debian/update-icon-caches usr/sbin | 4 | debian/update-icon-caches usr/sbin |
405 | 5 | 5 | ||
406 | === modified file 'debian/libgtk3.0-dev.install.in' | |||
407 | --- debian/libgtk3.0-dev.install.in 2010-12-23 05:15:15 +0000 | |||
408 | +++ debian/libgtk3.0-dev.install.in 2011-01-14 13:47:10 +0000 | |||
409 | @@ -1,5 +1,5 @@ | |||
410 | 1 | # from the shared flavor | 1 | # from the shared flavor |
412 | 2 | debian/install/shared/usr/bin/gtk-builder-convert-3.0 usr/bin | 2 | debian/install/shared/usr/bin/gtk-builder-convert usr/bin |
413 | 3 | debian/install/shared/usr/include/gtk* usr/include | 3 | debian/install/shared/usr/include/gtk* usr/include |
414 | 4 | debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@ | 4 | debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@ |
415 | 5 | debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@ | 5 | debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@ |
416 | 6 | 6 | ||
417 | === modified file 'debian/libgtk3.0-dev.manpages' | |||
418 | --- debian/libgtk3.0-dev.manpages 2010-10-14 13:59:32 +0000 | |||
419 | +++ debian/libgtk3.0-dev.manpages 2011-01-14 13:47:10 +0000 | |||
420 | @@ -1,1 +1,1 @@ | |||
422 | 1 | docs/reference/gtk/gtk-builder-convert-3.0.1 | 1 | docs/reference/gtk/gtk-builder-convert.1 |
423 | 2 | 2 | ||
424 | === removed file 'debian/patches/004_gir_with_separate_build_tree.patch' | |||
425 | --- debian/patches/004_gir_with_separate_build_tree.patch 2010-12-22 07:44:26 +0000 | |||
426 | +++ debian/patches/004_gir_with_separate_build_tree.patch 1970-01-01 00:00:00 +0000 | |||
427 | @@ -1,27 +0,0 @@ | |||
428 | 1 | From 08a6671a928cae3b0bea998b310f2088c346b24b Mon Sep 17 00:00:00 2001 | ||
429 | 2 | From: Martin Pitt <martin.pitt@ubuntu.com> | ||
430 | 3 | Date: Thu, 2 Dec 2010 16:57:19 +0100 | ||
431 | 4 | Subject: [PATCH 2/2] fix building introspection with a separate build directory | ||
432 | 5 | |||
433 | 6 | When using a separate build tree, gdk/gdkenumtypes.h gets generated in the | ||
434 | 7 | build dir, not in the source dir. Therefore we need to add the build directory | ||
435 | 8 | to the include search path when building the GIRs, so that gdk/gdk.h can | ||
436 | 9 | actually find <gdk/gdkenumtypes.h>. | ||
437 | 10 | |||
438 | 11 | https://bugzilla.gnome.org/show_bug.cgi?id=636043 | ||
439 | 12 | --- | ||
440 | 13 | gdk/Makefile.am | 1 + | ||
441 | 14 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
442 | 15 | |||
443 | 16 | Index: gtk+-2.91.7/gdk/Makefile.am | ||
444 | 17 | =================================================================== | ||
445 | 18 | --- gtk+-2.91.7.orig/gdk/Makefile.am 2010-12-22 09:36:42.000000000 +1100 | ||
446 | 19 | +++ gtk+-2.91.7/gdk/Makefile.am 2010-12-22 13:17:44.613372002 +1100 | ||
447 | 20 | @@ -33,6 +33,7 @@ | ||
448 | 21 | -DG_LOG_DOMAIN=\"Gdk\" \ | ||
449 | 22 | -DGDK_COMPILATION \ | ||
450 | 23 | -I$(top_srcdir) \ | ||
451 | 24 | + -I$(top_builddir) \ | ||
452 | 25 | -I$(top_builddir)/gdk \ | ||
453 | 26 | $(GTK_DEBUG_FLAGS) \ | ||
454 | 27 | $(GDK_DEP_CFLAGS) | ||
455 | 28 | 0 | ||
456 | === removed file 'debian/patches/005_support_disabling_x11_extensions.patch' | |||
457 | --- debian/patches/005_support_disabling_x11_extensions.patch 2010-12-22 07:44:26 +0000 | |||
458 | +++ debian/patches/005_support_disabling_x11_extensions.patch 1970-01-01 00:00:00 +0000 | |||
459 | @@ -1,67 +0,0 @@ | |||
460 | 1 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=612918 | ||
461 | 2 | Author: Cyril Brulebois <kibi@debian.org> | ||
462 | 3 | |||
463 | 4 | Support disabling X11 extensions | ||
464 | 5 | |||
465 | 6 | Index: gtk+-2.91.7/configure.ac | ||
466 | 7 | =================================================================== | ||
467 | 8 | --- gtk+-2.91.7.orig/configure.ac 2010-12-22 13:17:41.573372000 +1100 | ||
468 | 9 | +++ gtk+-2.91.7/configure.ac 2010-12-22 13:17:46.143372001 +1100 | ||
469 | 10 | @@ -246,6 +246,18 @@ | ||
470 | 11 | [AC_HELP_STRING([--enable-xinerama], | ||
471 | 12 | [support xinerama extension if available [default=yes]])],, | ||
472 | 13 | [enable_xinerama="yes"]) | ||
473 | 14 | +AC_ARG_ENABLE(xrandr, | ||
474 | 15 | + [AC_HELP_STRING([--enable-xrandr], | ||
475 | 16 | + [support XRandR extension if available [default=yes]])]) | ||
476 | 17 | +AC_ARG_ENABLE(xfixes, | ||
477 | 18 | + [AC_HELP_STRING([--enable-xfixes], | ||
478 | 19 | + [support XFixes extension if available [default=yes]])]) | ||
479 | 20 | +AC_ARG_ENABLE(xcomposite, | ||
480 | 21 | + [AC_HELP_STRING([--enable-xcomposite], | ||
481 | 22 | + [support X Composite extension if available [default=yes]])]) | ||
482 | 23 | +AC_ARG_ENABLE(xdamage, | ||
483 | 24 | + [AC_HELP_STRING([--enable-xdamage], | ||
484 | 25 | + [support X Damage extension if available [default=yes]])]) | ||
485 | 26 | AC_ARG_ENABLE(rebuilds, | ||
486 | 27 | [AC_HELP_STRING([--disable-rebuilds], | ||
487 | 28 | [disable all source autogeneration rules])],, | ||
488 | 29 | @@ -1038,7 +1050,8 @@ | ||
489 | 30 | AM_CONDITIONAL(XINPUT_2, test "x$have_xinput2" = "xyes") | ||
490 | 31 | |||
491 | 32 | # Check for the RANDR extension | ||
492 | 33 | - if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then | ||
493 | 34 | + if test x"$enable_xrandr" != xno && \ | ||
494 | 35 | + $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then | ||
495 | 36 | AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) | ||
496 | 37 | |||
497 | 38 | X_PACKAGES="$X_PACKAGES xrandr" | ||
498 | 39 | @@ -1054,7 +1067,8 @@ | ||
499 | 40 | |||
500 | 41 | # Checks for XFixes extension | ||
501 | 42 | |||
502 | 43 | - if $PKG_CONFIG --exists xfixes ; then | ||
503 | 44 | + if test x"$enable_xfixes" != xno && \ | ||
504 | 45 | + $PKG_CONFIG --exists xfixes ; then | ||
505 | 46 | AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) | ||
506 | 47 | |||
507 | 48 | X_PACKAGES="$X_PACKAGES xfixes" | ||
508 | 49 | @@ -1063,7 +1077,8 @@ | ||
509 | 50 | |||
510 | 51 | # Checks for Xcomposite extension | ||
511 | 52 | |||
512 | 53 | - if $PKG_CONFIG --exists xcomposite ; then | ||
513 | 54 | + if test x"$enable_xcomposite" != xno && \ | ||
514 | 55 | + $PKG_CONFIG --exists xcomposite ; then | ||
515 | 56 | AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension]) | ||
516 | 57 | |||
517 | 58 | X_PACKAGES="$X_PACKAGES xcomposite" | ||
518 | 59 | @@ -1072,7 +1087,7 @@ | ||
519 | 60 | |||
520 | 61 | # Checks for Xdamage extension | ||
521 | 62 | |||
522 | 63 | - if $PKG_CONFIG --exists xdamage ; then | ||
523 | 64 | + if test x"$enable_xdamage" != xno && $PKG_CONFIG --exists xdamage ; then | ||
524 | 65 | AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension]) | ||
525 | 66 | |||
526 | 67 | X_PACKAGES="$X_PACKAGES xdamage" | ||
527 | 68 | 0 | ||
528 | === modified file 'debian/patches/015_default-fallback-icon-theme.patch' | |||
529 | --- debian/patches/015_default-fallback-icon-theme.patch 2010-12-23 05:15:15 +0000 | |||
530 | +++ debian/patches/015_default-fallback-icon-theme.patch 2011-01-14 13:47:10 +0000 | |||
531 | @@ -1,11 +1,13 @@ | |||
532 | 1 | diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c | ||
533 | 2 | index 5d17d5f..b047b36 100644 | ||
534 | 1 | --- a/gtk/gtksettings.c | 3 | --- a/gtk/gtksettings.c |
535 | 2 | +++ b/gtk/gtksettings.c | 4 | +++ b/gtk/gtksettings.c |
537 | 3 | @@ -371,7 +371,7 @@ | 5 | @@ -385,7 +385,7 @@ gtk_settings_class_init (GtkSettingsClass *class) |
538 | 4 | g_param_spec_string ("gtk-fallback-icon-theme", | 6 | g_param_spec_string ("gtk-fallback-icon-theme", |
544 | 5 | P_("Fallback Icon Theme Name"), | 7 | P_("Fallback Icon Theme Name"), |
545 | 6 | P_("Name of a icon theme to fall back to"), | 8 | P_("Name of a icon theme to fall back to"), |
546 | 7 | - NULL, | 9 | - NULL, |
547 | 8 | + "gnome", | 10 | + "gnome", |
548 | 9 | GTK_PARAM_READWRITE), | 11 | GTK_PARAM_READWRITE), |
549 | 10 | NULL); | 12 | NULL); |
550 | 11 | g_assert (result == PROP_FALLBACK_ICON_THEME); | 13 | g_assert (result == PROP_FALLBACK_ICON_THEME); |
551 | 12 | 14 | ||
552 | === modified file 'debian/patches/043_ubuntu_menu_proxy.patch' | |||
553 | --- debian/patches/043_ubuntu_menu_proxy.patch 2010-12-22 07:44:26 +0000 | |||
554 | +++ debian/patches/043_ubuntu_menu_proxy.patch 2011-01-14 13:47:10 +0000 | |||
555 | @@ -137,8 +137,8 @@ | |||
556 | 137 | #include "gtkbuildable.h" | 137 | #include "gtkbuildable.h" |
557 | 138 | #include "gtkactivatable.h" | 138 | #include "gtkactivatable.h" |
558 | 139 | #include "gtkintl.h" | 139 | #include "gtkintl.h" |
561 | 140 | @@ -1662,7 +1663,18 @@ | 140 | @@ -1715,7 +1715,18 @@ |
562 | 141 | widget); | 141 | gtk_menu_shell_select_item (GTK_MENU_SHELL (parent), widget); |
563 | 142 | } | 142 | } |
564 | 143 | else | 143 | else |
565 | 144 | - g_signal_emit (widget, menu_item_signals[ACTIVATE_ITEM], 0); | 144 | - g_signal_emit (widget, menu_item_signals[ACTIVATE_ITEM], 0); |
566 | @@ -154,7 +154,7 @@ | |||
567 | 154 | + g_signal_emit (widget, menu_item_signals[ACTIVATE_ITEM], 0); | 154 | + g_signal_emit (widget, menu_item_signals[ACTIVATE_ITEM], 0); |
568 | 155 | + } | 155 | + } |
569 | 156 | + } | 156 | + } |
571 | 157 | 157 | ||
572 | 158 | return TRUE; | 158 | return TRUE; |
573 | 159 | } | 159 | } |
574 | 160 | Index: gtk+-2.91.7/gtk/gtkmenushell.c | 160 | Index: gtk+-2.91.7/gtk/gtkmenushell.c |
575 | @@ -162,8 +162,8 @@ | |||
576 | 162 | --- gtk+-2.91.7.orig/gtk/gtkmenushell.c 2010-12-22 03:36:05.000000000 +1100 | 162 | --- gtk+-2.91.7.orig/gtk/gtkmenushell.c 2010-12-22 03:36:05.000000000 +1100 |
577 | 163 | +++ gtk+-2.91.7/gtk/gtkmenushell.c 2010-12-22 13:23:11.843372001 +1100 | 163 | +++ gtk+-2.91.7/gtk/gtkmenushell.c 2010-12-22 13:23:11.843372001 +1100 |
578 | 164 | @@ -36,6 +36,7 @@ | 164 | @@ -36,6 +36,7 @@ |
581 | 165 | #include "gtkmenuitem.h" | 165 | #include "gtkmenuitemprivate.h" |
582 | 166 | #include "gtkmenushell.h" | 166 | #include "gtkmenushellprivate.h" |
583 | 167 | #include "gtkmenuprivate.h" | 167 | #include "gtkmenuprivate.h" |
584 | 168 | +#include "ubuntumenuproxy.h" | 168 | +#include "ubuntumenuproxy.h" |
585 | 169 | #include "gtkmnemonichash.h" | 169 | #include "gtkmnemonichash.h" |
586 | @@ -179,19 +179,9 @@ | |||
587 | 179 | }; | 179 | }; |
588 | 180 | 180 | ||
589 | 181 | /* Terminology: | 181 | /* Terminology: |
603 | 182 | @@ -135,6 +137,9 @@ | 182 | @@ -365,6 +367,14 @@ |
604 | 183 | 183 | TRUE, | |
605 | 184 | GdkDevice *grab_pointer; | 184 | GTK_PARAM_READWRITE)); |
593 | 185 | |||
594 | 186 | + UbuntuMenuProxy *proxy; | ||
595 | 187 | + gboolean local; | ||
596 | 188 | + | ||
597 | 189 | guint take_focus : 1; | ||
598 | 190 | guint activated_submenu : 1; | ||
599 | 191 | /* This flag is a crutch to keep mnemonics in the same menu | ||
600 | 192 | @@ -383,6 +388,14 @@ | ||
601 | 193 | TRUE, | ||
602 | 194 | GTK_PARAM_READWRITE)); | ||
606 | 195 | 185 | ||
607 | 196 | + g_object_class_install_property (object_class, | 186 | + g_object_class_install_property (object_class, |
608 | 197 | + PROP_LOCAL, | 187 | + PROP_LOCAL, |
609 | @@ -204,7 +194,7 @@ | |||
610 | 204 | g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate)); | 194 | g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate)); |
611 | 205 | } | 195 | } |
612 | 206 | 196 | ||
614 | 207 | @@ -393,6 +406,22 @@ | 197 | @@ -375,6 +385,22 @@ |
615 | 208 | } | 198 | } |
616 | 209 | 199 | ||
617 | 210 | static void | 200 | static void |
618 | @@ -226,11 +216,11 @@ | |||
619 | 226 | +static void | 216 | +static void |
620 | 227 | gtk_menu_shell_init (GtkMenuShell *menu_shell) | 217 | gtk_menu_shell_init (GtkMenuShell *menu_shell) |
621 | 228 | { | 218 | { |
625 | 229 | GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); | 219 | GtkMenuShellPrivate *priv; |
626 | 230 | @@ -410,6 +439,13 @@ | 220 | @@ -384,6 +410,13 @@ |
627 | 231 | priv->key_hash = NULL; | 221 | GtkMenuShellPrivate); |
628 | 222 | menu_shell->priv = priv; | ||
629 | 232 | priv->take_focus = TRUE; | 223 | priv->take_focus = TRUE; |
630 | 233 | priv->activated_submenu = FALSE; | ||
631 | 234 | + priv->proxy = ubuntu_menu_proxy_get (); | 224 | + priv->proxy = ubuntu_menu_proxy_get (); |
632 | 235 | + priv->local = FALSE; | 225 | + priv->local = FALSE; |
633 | 236 | + | 226 | + |
634 | @@ -241,11 +231,11 @@ | |||
635 | 241 | } | 231 | } |
636 | 242 | 232 | ||
637 | 243 | static void | 233 | static void |
639 | 244 | @@ -419,12 +455,16 @@ | 234 | @@ -393,12 +426,16 @@ |
640 | 245 | GParamSpec *pspec) | 235 | GParamSpec *pspec) |
641 | 246 | { | 236 | { |
642 | 247 | GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); | 237 | GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); |
644 | 248 | + GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (object); | 238 | + GtkMenuShellPrivate *priv = menu_shell->priv; |
645 | 249 | 239 | ||
646 | 250 | switch (prop_id) | 240 | switch (prop_id) |
647 | 251 | { | 241 | { |
648 | @@ -258,11 +248,11 @@ | |||
649 | 258 | default: | 248 | default: |
650 | 259 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | 249 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
651 | 260 | break; | 250 | break; |
654 | 261 | @@ -438,12 +478,23 @@ | 251 | @@ -412,12 +449,23 @@ |
655 | 262 | GParamSpec *pspec) | 252 | GParamSpec *pspec) |
656 | 263 | { | 253 | { |
657 | 264 | GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); | 254 | GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); |
659 | 265 | + GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); | 255 | + GtkMenuShellPrivate *priv = menu_shell->priv; |
660 | 266 | + gboolean local; | 256 | + gboolean local; |
661 | 267 | 257 | ||
662 | 268 | switch (prop_id) | 258 | switch (prop_id) |
663 | @@ -282,9 +272,9 @@ | |||
664 | 282 | default: | 272 | default: |
665 | 283 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | 273 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
666 | 284 | break; | 274 | break; |
668 | 285 | @@ -456,6 +507,13 @@ | 275 | @@ -432,6 +480,13 @@ |
669 | 286 | GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); | 276 | GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); |
671 | 287 | GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); | 277 | GtkMenuShellPrivate *priv = menu_shell->priv; |
672 | 288 | 278 | ||
673 | 289 | + if (priv->proxy != NULL) | 279 | + if (priv->proxy != NULL) |
674 | 290 | + { | 280 | + { |
675 | @@ -296,8 +286,8 @@ | |||
676 | 296 | if (priv->mnemonic_hash) | 286 | if (priv->mnemonic_hash) |
677 | 297 | _gtk_mnemonic_hash_free (priv->mnemonic_hash); | 287 | _gtk_mnemonic_hash_free (priv->mnemonic_hash); |
678 | 298 | if (priv->key_hash) | 288 | if (priv->key_hash) |
681 | 299 | @@ -495,14 +553,24 @@ | 289 | @@ -467,14 +522,24 @@ |
682 | 300 | gint position) | 290 | gint position) |
683 | 301 | { | 291 | { |
684 | 302 | GtkMenuShellClass *class; | 292 | GtkMenuShellClass *class; |
685 | 303 | + GtkMenuShellPrivate *priv; | 293 | + GtkMenuShellPrivate *priv; |
686 | @@ -307,7 +297,7 @@ | |||
687 | 307 | 297 | ||
688 | 308 | class = GTK_MENU_SHELL_GET_CLASS (menu_shell); | 298 | class = GTK_MENU_SHELL_GET_CLASS (menu_shell); |
689 | 309 | 299 | ||
691 | 310 | + priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); | 300 | + priv = menu_shell->priv; |
692 | 311 | + | 301 | + |
693 | 312 | if (class->insert) | 302 | if (class->insert) |
694 | 313 | class->insert (menu_shell, child, position); | 303 | class->insert (menu_shell, child, position); |
695 | @@ -321,7 +311,7 @@ | |||
696 | 321 | } | 311 | } |
697 | 322 | 312 | ||
698 | 323 | static void | 313 | static void |
700 | 324 | @@ -1908,3 +1976,23 @@ | 314 | @@ -1868,6 +1933,26 @@ |
701 | 325 | g_object_notify (G_OBJECT (menu_shell), "take-focus"); | 315 | g_object_notify (G_OBJECT (menu_shell), "take-focus"); |
702 | 326 | } | 316 | } |
703 | 327 | } | 317 | } |
704 | @@ -333,7 +323,7 @@ | |||
705 | 333 | + | 323 | + |
706 | 334 | + g_return_val_if_fail (GTK_IS_MENU_SHELL (shell), FALSE); | 324 | + g_return_val_if_fail (GTK_IS_MENU_SHELL (shell), FALSE); |
707 | 335 | + | 325 | + |
709 | 336 | + priv = GTK_MENU_SHELL_GET_PRIVATE (shell); | 326 | + priv = shell->priv; |
710 | 337 | + | 327 | + |
711 | 338 | + if (priv->proxy && !ubuntu_menu_proxy_show_local (priv->proxy)) | 328 | + if (priv->proxy && !ubuntu_menu_proxy_show_local (priv->proxy)) |
712 | 339 | + { | 329 | + { |
713 | @@ -345,6 +335,9 @@ | |||
714 | 345 | + | 335 | + |
715 | 346 | + return FALSE; | 336 | + return FALSE; |
716 | 347 | +} | 337 | +} |
717 | 338 | |||
718 | 339 | /** | ||
719 | 340 | * gtk_menu_shell_get_selected_item: | ||
720 | 348 | Index: gtk+-2.91.7/gtk/gtkwindow.c | 341 | Index: gtk+-2.91.7/gtk/gtkwindow.c |
721 | 349 | =================================================================== | 342 | =================================================================== |
722 | 350 | --- gtk+-2.91.7.orig/gtk/gtkwindow.c 2010-12-22 04:07:05.000000000 +1100 | 343 | --- gtk+-2.91.7.orig/gtk/gtkwindow.c 2010-12-22 04:07:05.000000000 +1100 |
723 | @@ -655,7 +648,7 @@ | |||
724 | 655 | =================================================================== | 648 | =================================================================== |
725 | 656 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 649 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
726 | 657 | +++ gtk+-2.91.7/gtk/ubuntumenuproxy.h 2010-12-22 13:23:11.853372001 +1100 | 650 | +++ gtk+-2.91.7/gtk/ubuntumenuproxy.h 2010-12-22 13:23:11.853372001 +1100 |
728 | 658 | @@ -0,0 +1,74 @@ | 651 | @@ -0,0 +1,73 @@ |
729 | 659 | +/* | 652 | +/* |
730 | 660 | + * Copyright (C) 2010 Canonical, Ltd. | 653 | + * Copyright (C) 2010 Canonical, Ltd. |
731 | 661 | + * | 654 | + * |
732 | @@ -685,7 +678,6 @@ | |||
733 | 685 | +#define __UBUNTU_MENU_PROXY_H__ | 678 | +#define __UBUNTU_MENU_PROXY_H__ |
734 | 686 | + | 679 | + |
735 | 687 | +#include <gtk/gtkwidget.h> | 680 | +#include <gtk/gtkwidget.h> |
736 | 688 | +#include <gtk/gtktypeutils.h> | ||
737 | 689 | + | 681 | + |
738 | 690 | +G_BEGIN_DECLS | 682 | +G_BEGIN_DECLS |
739 | 691 | + | 683 | + |
740 | @@ -1017,3 +1009,25 @@ | |||
741 | 1017 | +G_END_DECLS | 1009 | +G_END_DECLS |
742 | 1018 | + | 1010 | + |
743 | 1019 | +#endif /* __UBUNTU_MENU_PROXY_MODULE_H__ */ | 1011 | +#endif /* __UBUNTU_MENU_PROXY_MODULE_H__ */ |
744 | 1012 | diff --git a/gtk/gtkmenushellprivate.h b/gtk/gtkmenushellprivate.h | ||
745 | 1013 | index 6015f0c..50b5ed1 100644 | ||
746 | 1014 | --- a/gtk/gtkmenushellprivate.h | ||
747 | 1015 | +++ b/gtk/gtkmenushellprivate.h | ||
748 | 1016 | @@ -24,6 +24,7 @@ | ||
749 | 1017 | #include <gtk/gtkmenushell.h> | ||
750 | 1018 | #include <gtk/gtkmnemonichash.h> | ||
751 | 1019 | #include <gtk/gtkkeyhash.h> | ||
752 | 1020 | +#include "ubuntumenuproxy.h" | ||
753 | 1021 | |||
754 | 1022 | |||
755 | 1023 | G_BEGIN_DECLS | ||
756 | 1024 | @@ -54,6 +54,9 @@ struct _GtkMenuShellPrivate | ||
757 | 1025 | GtkKeyHash *key_hash; | ||
758 | 1026 | |||
759 | 1027 | GdkDevice *grab_pointer; | ||
760 | 1028 | + | ||
761 | 1029 | + UbuntuMenuProxy *proxy; | ||
762 | 1030 | + gboolean local; | ||
763 | 1031 | }; | ||
764 | 1032 | |||
765 | 1033 | void _gtk_menu_shell_select_last (GtkMenuShell *menu_shell, | ||
766 | 1020 | 1034 | ||
767 | === removed file 'debian/patches/061_use_pdf_as_default_printing_standard.patch' | |||
768 | --- debian/patches/061_use_pdf_as_default_printing_standard.patch 2010-12-23 05:15:15 +0000 | |||
769 | +++ debian/patches/061_use_pdf_as_default_printing_standard.patch 1970-01-01 00:00:00 +0000 | |||
770 | @@ -1,45 +0,0 @@ | |||
771 | 1 | Index: gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c | ||
772 | 2 | =================================================================== | ||
773 | 3 | --- gtk+3.0-2.90.5.orig/modules/printbackends/cups/gtkprintbackendcups.c 2010-06-28 01:19:39.000000000 +0200 | ||
774 | 4 | +++ gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c 2010-07-30 19:12:53.163085281 +0200 | ||
775 | 5 | @@ -344,8 +344,9 @@ | ||
776 | 6 | |||
777 | 7 | /* TODO: check if it is a ps or pdf printer */ | ||
778 | 8 | |||
779 | 9 | - surface = cairo_ps_surface_create_for_stream (_cairo_write_to_cups, cache_io, width, height); | ||
780 | 10 | + surface = cairo_pdf_surface_create_for_stream (_cairo_write_to_cups, cache_io, width, height); | ||
781 | 11 | |||
782 | 12 | + /* | ||
783 | 13 | ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer)); | ||
784 | 14 | |||
785 | 15 | if (ppd_file != NULL) | ||
786 | 16 | @@ -403,6 +404,7 @@ | ||
787 | 17 | |||
788 | 18 | if (level == 3) | ||
789 | 19 | cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3); | ||
790 | 20 | + */ | ||
791 | 21 | |||
792 | 22 | cairo_surface_set_fallback_resolution (surface, | ||
793 | 23 | 2.0 * gtk_print_settings_get_printer_lpi (settings), | ||
794 | 24 | Index: gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c | ||
795 | 25 | =================================================================== | ||
796 | 26 | --- gtk+3.0-2.90.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-06-16 17:27:06.000000000 +0200 | ||
797 | 27 | +++ gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-07-30 19:12:53.171184913 +0200 | ||
798 | 28 | @@ -31,6 +31,8 @@ | ||
799 | 29 | #include <cairo.h> | ||
800 | 30 | #include <cairo-ps.h> | ||
801 | 31 | |||
802 | 32 | +#include <cairo-pdf.h> | ||
803 | 33 | + | ||
804 | 34 | #include <glib/gi18n-lib.h> | ||
805 | 35 | |||
806 | 36 | #include <gtk/gtk.h> | ||
807 | 37 | @@ -209,7 +211,7 @@ | ||
808 | 38 | { | ||
809 | 39 | cairo_surface_t *surface; | ||
810 | 40 | |||
811 | 41 | - surface = cairo_ps_surface_create_for_stream (_cairo_write, cache_io, width, height); | ||
812 | 42 | + surface = cairo_pdf_surface_create_for_stream (_cairo_write, cache_io, width, height); | ||
813 | 43 | |||
814 | 44 | cairo_surface_set_fallback_resolution (surface, | ||
815 | 45 | 2.0 * gtk_print_settings_get_printer_lpi (settings), | ||
816 | 46 | 0 | ||
817 | === modified file 'debian/patches/071_no_offscreen_widgets_grabbing.patch' | |||
818 | --- debian/patches/071_no_offscreen_widgets_grabbing.patch 2010-12-22 07:44:26 +0000 | |||
819 | +++ debian/patches/071_no_offscreen_widgets_grabbing.patch 2011-01-14 13:47:10 +0000 | |||
820 | @@ -5,15 +5,15 @@ | |||
821 | 5 | =================================================================== | 5 | =================================================================== |
822 | 6 | --- gtk+-2.91.7.orig/gtk/gtkmain.c 2010-12-22 04:34:49.000000000 +1100 | 6 | --- gtk+-2.91.7.orig/gtk/gtkmain.c 2010-12-22 04:34:49.000000000 +1100 |
823 | 7 | +++ gtk+-2.91.7/gtk/gtkmain.c 2010-12-22 13:23:20.563372002 +1100 | 7 | +++ gtk+-2.91.7/gtk/gtkmain.c 2010-12-22 13:23:20.563372002 +1100 |
825 | 8 | @@ -1950,9 +1950,14 @@ | 8 | @@ -2165,9 +2165,14 @@ |
826 | 9 | { | 9 | { |
827 | 10 | GtkWindowGroup *group; | 10 | GtkWindowGroup *group; |
828 | 11 | GtkWidget *old_grab_widget; | 11 | GtkWidget *old_grab_widget; |
830 | 12 | - | 12 | - |
831 | 13 | + GtkWidget *toplevel; | 13 | + GtkWidget *toplevel; |
832 | 14 | + | 14 | + |
833 | 15 | g_return_if_fail (widget != NULL); | 15 | g_return_if_fail (widget != NULL); |
835 | 16 | - | 16 | - |
836 | 17 | + | 17 | + |
837 | 18 | + toplevel = gtk_widget_get_toplevel (widget); | 18 | + toplevel = gtk_widget_get_toplevel (widget); |
838 | 19 | + if (toplevel && gdk_window_get_window_type (gtk_widget_get_window (toplevel)) == GDK_WINDOW_OFFSCREEN) | 19 | + if (toplevel && gdk_window_get_window_type (gtk_widget_get_window (toplevel)) == GDK_WINDOW_OFFSCREEN) |
839 | 20 | 20 | ||
840 | === modified file 'debian/patches/072_indicator_menu_update.patch' | |||
841 | --- debian/patches/072_indicator_menu_update.patch 2010-12-22 07:44:26 +0000 | |||
842 | +++ debian/patches/072_indicator_menu_update.patch 2011-01-14 13:47:10 +0000 | |||
843 | @@ -80,9 +80,9 @@ | |||
844 | 80 | /** | 80 | /** |
845 | 81 | * GtkMenuItem:right-justified: | 81 | * GtkMenuItem:right-justified: |
846 | 82 | * | 82 | * |
848 | 83 | @@ -1204,6 +1225,11 @@ | 83 | @@ -1242,6 +1265,11 @@ |
849 | 84 | if (gtk_widget_get_parent (GTK_WIDGET (menu_item))) | 84 | if (gtk_widget_get_parent (GTK_WIDGET (menu_item))) |
851 | 85 | gtk_widget_queue_resize (GTK_WIDGET (menu_item)); | 85 | gtk_widget_queue_resize (GTK_WIDGET (menu_item)); |
852 | 86 | 86 | ||
853 | 87 | + if(submenu == NULL) | 87 | + if(submenu == NULL) |
854 | 88 | + g_signal_emit_by_name (menu_item, "submenu-removed"); | 88 | + g_signal_emit_by_name (menu_item, "submenu-removed"); |
855 | 89 | 89 | ||
856 | === removed file 'debian/patches/074_expose_active_menu_item.patch' | |||
857 | --- debian/patches/074_expose_active_menu_item.patch 2010-12-22 07:44:26 +0000 | |||
858 | +++ debian/patches/074_expose_active_menu_item.patch 1970-01-01 00:00:00 +0000 | |||
859 | @@ -1,70 +0,0 @@ | |||
860 | 1 | From 646f6ef30e4b01b1f2ebbdb8ab507ee7d174a460 Mon Sep 17 00:00:00 2001 | ||
861 | 2 | From: Didier Roche <didrocks@ubuntu.com> | ||
862 | 3 | Date: Thu, 7 Oct 2010 16:39:33 +0200 | ||
863 | 4 | Subject: [PATCH] add a function to expose GtkMenuShell::active_menu_item | ||
864 | 5 | |||
865 | 6 | We can have some cases where we want to know which is the selected | ||
866 | 7 | menuitem in a GtkMenuShell before it became activated. | ||
867 | 8 | Adding a gtk_menu_shell_get_selected_item to the API to get it. | ||
868 | 9 | --- | ||
869 | 10 | gtk/gtk.symbols | 1 + | ||
870 | 11 | gtk/gtkmenushell.c | 21 +++++++++++++++++++++ | ||
871 | 12 | gtk/gtkmenushell.h | 1 + | ||
872 | 13 | 3 files changed, 23 insertions(+), 0 deletions(-) | ||
873 | 14 | |||
874 | 15 | Index: gtk+-2.91.7/gtk/gtk.symbols | ||
875 | 16 | =================================================================== | ||
876 | 17 | --- gtk+-2.91.7.orig/gtk/gtk.symbols 2010-12-22 13:23:15.483372000 +1100 | ||
877 | 18 | +++ gtk+-2.91.7/gtk/gtk.symbols 2010-12-22 13:25:30.173372001 +1100 | ||
878 | 19 | @@ -1501,6 +1501,7 @@ | ||
879 | 20 | gtk_menu_shell_cancel | ||
880 | 21 | gtk_menu_shell_deactivate | ||
881 | 22 | gtk_menu_shell_deselect | ||
882 | 23 | +gtk_menu_shell_get_selected_item | ||
883 | 24 | gtk_menu_shell_get_take_focus | ||
884 | 25 | gtk_menu_shell_get_type G_GNUC_CONST | ||
885 | 26 | gtk_menu_shell_insert | ||
886 | 27 | Index: gtk+-2.91.7/gtk/gtkmenushell.c | ||
887 | 28 | =================================================================== | ||
888 | 29 | --- gtk+-2.91.7.orig/gtk/gtkmenushell.c 2010-12-22 13:23:21.983372001 +1100 | ||
889 | 30 | +++ gtk+-2.91.7/gtk/gtkmenushell.c 2010-12-22 13:25:30.173372001 +1100 | ||
890 | 31 | @@ -1348,6 +1348,27 @@ | ||
891 | 32 | } | ||
892 | 33 | } | ||
893 | 34 | |||
894 | 35 | +/** | ||
895 | 36 | + * gtk_menu_shell_get_selected_item: | ||
896 | 37 | + * @menu_shell: a #GtkMenuShell | ||
897 | 38 | + * | ||
898 | 39 | + * Retrieves a pointer to the selected menuitem, or %NULL | ||
899 | 40 | + * if there is no menuitem selected. A selected menuitem is | ||
900 | 41 | + * one that is displayed in the prelight state for that menu. | ||
901 | 42 | + * | ||
902 | 43 | + * Return value: a #GtkWidget or %NULL in case there is no | ||
903 | 44 | + * selected menuitem | ||
904 | 45 | + * | ||
905 | 46 | + * Since: 2.24 | ||
906 | 47 | + **/ | ||
907 | 48 | +GtkWidget * | ||
908 | 49 | +gtk_menu_shell_get_selected_item (GtkMenuShell *menu_shell) | ||
909 | 50 | +{ | ||
910 | 51 | + g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), NULL); | ||
911 | 52 | + | ||
912 | 53 | + return menu_shell->active_menu_item; | ||
913 | 54 | +} | ||
914 | 55 | + | ||
915 | 56 | void | ||
916 | 57 | gtk_menu_shell_activate_item (GtkMenuShell *menu_shell, | ||
917 | 58 | GtkWidget *menu_item, | ||
918 | 59 | Index: gtk+-2.91.7/gtk/gtkmenushell.h | ||
919 | 60 | =================================================================== | ||
920 | 61 | --- gtk+-2.91.7.orig/gtk/gtkmenushell.h 2010-12-22 03:36:05.000000000 +1100 | ||
921 | 62 | +++ gtk+-2.91.7/gtk/gtkmenushell.h 2010-12-22 13:25:30.173372001 +1100 | ||
922 | 63 | @@ -114,6 +114,7 @@ | ||
923 | 64 | void gtk_menu_shell_activate_item (GtkMenuShell *menu_shell, | ||
924 | 65 | GtkWidget *menu_item, | ||
925 | 66 | gboolean force_deactivate); | ||
926 | 67 | +GtkWidget *gtk_menu_shell_get_selected_item (GtkMenuShell *menu_shell); | ||
927 | 68 | void gtk_menu_shell_select_first (GtkMenuShell *menu_shell, | ||
928 | 69 | gboolean search_sensitive); | ||
929 | 70 | void _gtk_menu_shell_select_last (GtkMenuShell *menu_shell, | ||
930 | 71 | 0 | ||
931 | === modified file 'debian/patches/091_bugzilla_tooltip_refresh.patch' | |||
932 | --- debian/patches/091_bugzilla_tooltip_refresh.patch 2010-12-22 07:44:26 +0000 | |||
933 | +++ debian/patches/091_bugzilla_tooltip_refresh.patch 2011-01-14 13:47:10 +0000 | |||
934 | @@ -63,7 +63,7 @@ | |||
935 | 63 | +static void | 63 | +static void |
936 | 64 | gtk_tooltip_init (GtkTooltip *tooltip) | 64 | gtk_tooltip_init (GtkTooltip *tooltip) |
937 | 65 | { | 65 | { |
939 | 66 | GtkStyle *style; | 66 | GtkStyleContext *context; |
940 | 67 | @@ -199,8 +237,12 @@ | 67 | @@ -199,8 +237,12 @@ |
941 | 68 | tooltip->last_window = NULL; | 68 | tooltip->last_window = NULL; |
942 | 69 | 69 | ||
943 | @@ -91,7 +91,7 @@ | |||
944 | 91 | tooltip->custom_widget = NULL; | 91 | tooltip->custom_widget = NULL; |
945 | 92 | } | 92 | } |
946 | 93 | 93 | ||
948 | 94 | @@ -583,19 +632,209 @@ | 94 | @@ -596,6 +645,169 @@ |
949 | 95 | gtk_widget_queue_draw (tooltip->window); | 95 | gtk_widget_queue_draw (tooltip->window); |
950 | 96 | } | 96 | } |
951 | 97 | 97 | ||
952 | @@ -260,57 +260,7 @@ | |||
953 | 260 | + | 260 | + |
954 | 261 | static gboolean | 261 | static gboolean |
955 | 262 | gtk_tooltip_paint_window (GtkTooltip *tooltip, | 262 | gtk_tooltip_paint_window (GtkTooltip *tooltip, |
1007 | 263 | - cairo_t *cr) | 263 | cairo_t *cr) |
957 | 264 | + cairo_t *context) | ||
958 | 265 | { | ||
959 | 266 | - gtk_paint_flat_box (gtk_widget_get_style (tooltip->window), | ||
960 | 267 | - cr, | ||
961 | 268 | - GTK_STATE_NORMAL, | ||
962 | 269 | - GTK_SHADOW_OUT, | ||
963 | 270 | - tooltip->window, | ||
964 | 271 | - "tooltip", | ||
965 | 272 | - 0, 0, | ||
966 | 273 | - gtk_widget_get_allocated_width (tooltip->window), | ||
967 | 274 | - gtk_widget_get_allocated_height (tooltip->window)); | ||
968 | 275 | + gboolean new_style; | ||
969 | 276 | + | ||
970 | 277 | + gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL); | ||
971 | 278 | + | ||
972 | 279 | + if (new_style) | ||
973 | 280 | + { | ||
974 | 281 | + cairo_surface_t *surface; | ||
975 | 282 | + cairo_t *cr; | ||
976 | 283 | + | ||
977 | 284 | + cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); | ||
978 | 285 | + surface = cairo_surface_create_similar (cairo_get_target (context), | ||
979 | 286 | + CAIRO_CONTENT_COLOR_ALPHA, | ||
980 | 287 | + gtk_widget_get_allocated_width (tooltip->window), | ||
981 | 288 | + gtk_widget_get_allocated_height (tooltip->window)); | ||
982 | 289 | + cr = cairo_create (surface); | ||
983 | 290 | + fill_background (tooltip->window, cr); | ||
984 | 291 | + cairo_destroy (cr); | ||
985 | 292 | + | ||
986 | 293 | + cairo_set_source_surface (context, surface, 0, 0); | ||
987 | 294 | + cairo_paint (context); | ||
988 | 295 | + cairo_surface_destroy (surface); | ||
989 | 296 | + | ||
990 | 297 | + update_shape (tooltip); | ||
991 | 298 | + } | ||
992 | 299 | + else | ||
993 | 300 | + { | ||
994 | 301 | + gtk_paint_flat_box (gtk_widget_get_style (tooltip->window), | ||
995 | 302 | + context, | ||
996 | 303 | + GTK_STATE_NORMAL, | ||
997 | 304 | + GTK_SHADOW_OUT, | ||
998 | 305 | + tooltip->window, | ||
999 | 306 | + "tooltip", | ||
1000 | 307 | + 0, 0, | ||
1001 | 308 | + gtk_widget_get_allocated_width (tooltip->window), | ||
1002 | 309 | + gtk_widget_get_allocated_height (tooltip->window)); | ||
1003 | 310 | + } | ||
1004 | 311 | |||
1005 | 312 | return FALSE; | ||
1006 | 313 | } | ||
1008 | 314 | Index: gtk+-2.91.7/gtk/gtkwidget.c | 264 | Index: gtk+-2.91.7/gtk/gtkwidget.c |
1009 | 315 | =================================================================== | 265 | =================================================================== |
1010 | 316 | --- gtk+-2.91.7.orig/gtk/gtkwidget.c 2010-12-22 13:23:15.483372000 +1100 | 266 | --- gtk+-2.91.7.orig/gtk/gtkwidget.c 2010-12-22 13:23:15.483372000 +1100 |
1011 | 317 | 267 | ||
1012 | === removed file 'debian/patches/093_dso_link_issues.patch' | |||
1013 | --- debian/patches/093_dso_link_issues.patch 2010-12-22 07:44:26 +0000 | |||
1014 | +++ debian/patches/093_dso_link_issues.patch 1970-01-01 00:00:00 +0000 | |||
1015 | @@ -1,91 +0,0 @@ | |||
1016 | 1 | From f4419be0d68c84ea94488bf1c75c4b6f767b8773 Mon Sep 17 00:00:00 2001 | ||
1017 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | ||
1018 | 3 | Date: Wed, 22 Dec 2010 15:01:50 +1100 | ||
1019 | 4 | Subject: [PATCH] Fix DSO link issues | ||
1020 | 5 | |||
1021 | 6 | --- | ||
1022 | 7 | demos/Makefile.am | 1 + | ||
1023 | 8 | demos/gtk-demo/Makefile.am | 1 + | ||
1024 | 9 | docs/tools/Makefile.am | 2 ++ | ||
1025 | 10 | gtk/tests/Makefile.am | 1 + | ||
1026 | 11 | perf/Makefile.am | 1 + | ||
1027 | 12 | tests/Makefile.am | 1 + | ||
1028 | 13 | 6 files changed, 7 insertions(+), 0 deletions(-) | ||
1029 | 14 | |||
1030 | 15 | diff --git a/demos/Makefile.am b/demos/Makefile.am | ||
1031 | 16 | index efdd0b1..dc6fcb6 100644 | ||
1032 | 17 | --- a/demos/Makefile.am | ||
1033 | 18 | +++ b/demos/Makefile.am | ||
1034 | 19 | @@ -16,6 +16,7 @@ DEPS = \ | ||
1035 | 20 | |||
1036 | 21 | LDADDS = \ | ||
1037 | 22 | $(top_builddir)/gtk/libgtk-3.0.la \ | ||
1038 | 23 | + $(top_builddir)/gdk/libgdk-3.0.la \ | ||
1039 | 24 | $(GTK_DEP_LIBS) \ | ||
1040 | 25 | $(MATH_LIB) | ||
1041 | 26 | |||
1042 | 27 | diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am | ||
1043 | 28 | index 1a5a677..5385dcb 100644 | ||
1044 | 29 | --- a/demos/gtk-demo/Makefile.am | ||
1045 | 30 | +++ b/demos/gtk-demo/Makefile.am | ||
1046 | 31 | @@ -59,6 +59,7 @@ DEPS = \ | ||
1047 | 32 | |||
1048 | 33 | LDADDS = \ | ||
1049 | 34 | $(top_builddir)/gtk/libgtk-3.0.la \ | ||
1050 | 35 | + $(top_builddir)/gdk/libgdk-3.0.la \ | ||
1051 | 36 | $(GTK_DEP_LIBS) \ | ||
1052 | 37 | -lm | ||
1053 | 38 | |||
1054 | 39 | diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am | ||
1055 | 40 | index d008afc..c4a1c8b 100644 | ||
1056 | 41 | --- a/docs/tools/Makefile.am | ||
1057 | 42 | +++ b/docs/tools/Makefile.am | ||
1058 | 43 | @@ -13,7 +13,9 @@ DEPS = \ | ||
1059 | 44 | |||
1060 | 45 | LDADDS = \ | ||
1061 | 46 | $(top_builddir)/gtk/libgtk-3.0.la \ | ||
1062 | 47 | + $(top_builddir)/gdk/libgdk-3.0.la \ | ||
1063 | 48 | $(GTK_DEP_LIBS) \ | ||
1064 | 49 | + $(GDK_DEP_LIBS) \ | ||
1065 | 50 | -lm | ||
1066 | 51 | |||
1067 | 52 | if USE_X11 | ||
1068 | 53 | diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am | ||
1069 | 54 | index 35105d3..34367ee 100644 | ||
1070 | 55 | --- a/gtk/tests/Makefile.am | ||
1071 | 56 | +++ b/gtk/tests/Makefile.am | ||
1072 | 57 | @@ -15,6 +15,7 @@ DEPS = \ | ||
1073 | 58 | |||
1074 | 59 | progs_ldadd = \ | ||
1075 | 60 | $(top_builddir)/gtk/libgtk-3.0.la \ | ||
1076 | 61 | + $(top_builddir)/gdk/libgdk-3.0.la \ | ||
1077 | 62 | $(GTK_DEP_LIBS) | ||
1078 | 63 | |||
1079 | 64 | noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS) | ||
1080 | 65 | diff --git a/perf/Makefile.am b/perf/Makefile.am | ||
1081 | 66 | index 3b2c0b0..18e45f4 100644 | ||
1082 | 67 | --- a/perf/Makefile.am | ||
1083 | 68 | +++ b/perf/Makefile.am | ||
1084 | 69 | @@ -15,6 +15,7 @@ DEPS = \ | ||
1085 | 70 | |||
1086 | 71 | LDADDS = \ | ||
1087 | 72 | $(top_builddir)/gtk/libgtk-3.0.la \ | ||
1088 | 73 | + $(top_builddir)/gdk/libgdk-3.0.la \ | ||
1089 | 74 | $(GTK_DEP_LIBS) | ||
1090 | 75 | |||
1091 | 76 | noinst_PROGRAMS = \ | ||
1092 | 77 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
1093 | 78 | index 744796b..fc4b58e 100644 | ||
1094 | 79 | --- a/tests/Makefile.am | ||
1095 | 80 | +++ b/tests/Makefile.am | ||
1096 | 81 | @@ -16,6 +16,7 @@ DEPS = \ | ||
1097 | 82 | |||
1098 | 83 | LDADDS = \ | ||
1099 | 84 | $(top_builddir)/gtk/libgtk-3.0.la \ | ||
1100 | 85 | + $(top_builddir)/gdk/libgdk-3.0.la \ | ||
1101 | 86 | $(GTK_DEP_LIBS) \ | ||
1102 | 87 | -lm | ||
1103 | 88 | |||
1104 | 89 | -- | ||
1105 | 90 | 1.7.2.3 | ||
1106 | 91 | |||
1107 | 92 | 0 | ||
1108 | === removed file 'debian/patches/094_gtkprint_test_fix.patch' | |||
1109 | --- debian/patches/094_gtkprint_test_fix.patch 2010-12-22 07:44:26 +0000 | |||
1110 | +++ debian/patches/094_gtkprint_test_fix.patch 1970-01-01 00:00:00 +0000 | |||
1111 | @@ -1,58 +0,0 @@ | |||
1112 | 1 | From 2013e23c4bfc5dd8a154325f8dde865acec9cc42 Mon Sep 17 00:00:00 2001 | ||
1113 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | ||
1114 | 3 | Date: Wed, 22 Dec 2010 15:36:47 +1100 | ||
1115 | 4 | Subject: [PATCH] Use getters and setters for GtkPrintJob in gtkprintbackendtest.c | ||
1116 | 5 | |||
1117 | 6 | --- | ||
1118 | 7 | modules/printbackends/test/gtkprintbackendtest.c | 30 +++++++++++---------- | ||
1119 | 8 | 1 files changed, 16 insertions(+), 14 deletions(-) | ||
1120 | 9 | |||
1121 | 10 | diff --git a/modules/printbackends/test/gtkprintbackendtest.c b/modules/printbackends/test/gtkprintbackendtest.c | ||
1122 | 11 | index f40c03c..14c8e52 100644 | ||
1123 | 12 | --- a/modules/printbackends/test/gtkprintbackendtest.c | ||
1124 | 13 | +++ b/modules/printbackends/test/gtkprintbackendtest.c | ||
1125 | 14 | @@ -525,25 +525,27 @@ test_printer_prepare_for_print (GtkPrinter *printer, | ||
1126 | 15 | { | ||
1127 | 16 | gdouble scale; | ||
1128 | 17 | |||
1129 | 18 | - print_job->print_pages = gtk_print_settings_get_print_pages (settings); | ||
1130 | 19 | - print_job->page_ranges = NULL; | ||
1131 | 20 | - print_job->num_page_ranges = 0; | ||
1132 | 21 | + gtk_print_job_set_pages (print_job, gtk_print_settings_get_print_pages (settings)); | ||
1133 | 22 | + gtk_print_job_set_page_ranges (print_job, NULL, 0); | ||
1134 | 23 | |||
1135 | 24 | - if (print_job->print_pages == GTK_PRINT_PAGES_RANGES) | ||
1136 | 25 | - print_job->page_ranges = | ||
1137 | 26 | - gtk_print_settings_get_page_ranges (settings, | ||
1138 | 27 | - &print_job->num_page_ranges); | ||
1139 | 28 | - | ||
1140 | 29 | - print_job->collate = gtk_print_settings_get_collate (settings); | ||
1141 | 30 | - print_job->reverse = gtk_print_settings_get_reverse (settings); | ||
1142 | 31 | - print_job->num_copies = gtk_print_settings_get_n_copies (settings); | ||
1143 | 32 | + if (gtk_print_job_get_pages (print_job) == GTK_PRINT_PAGES_RANGES) | ||
1144 | 33 | + { | ||
1145 | 34 | + GtkPageRange *page_ranges; | ||
1146 | 35 | + gint num_page_ranges; | ||
1147 | 36 | + page_ranges = gtk_print_settings_get_page_ranges (settings, &num_page_ranges); | ||
1148 | 37 | + gtk_print_job_set_page_ranges (print_job, page_ranges, num_page_ranges); | ||
1149 | 38 | + } | ||
1150 | 39 | + | ||
1151 | 40 | + gtk_print_job_set_collate (print_job, gtk_print_settings_get_collate (settings)); | ||
1152 | 41 | + gtk_print_job_set_reverse (print_job, gtk_print_settings_get_reverse (settings)); | ||
1153 | 42 | + gtk_print_job_set_num_copies (print_job, gtk_print_settings_get_n_copies (settings)); | ||
1154 | 43 | |||
1155 | 44 | scale = gtk_print_settings_get_scale (settings); | ||
1156 | 45 | if (scale != 100.0) | ||
1157 | 46 | - print_job->scale = scale/100.0; | ||
1158 | 47 | + gtk_print_job_set_scale (print_job, scale/100.0); | ||
1159 | 48 | |||
1160 | 49 | - print_job->page_set = gtk_print_settings_get_page_set (settings); | ||
1161 | 50 | - print_job->rotate_to_orientation = TRUE; | ||
1162 | 51 | + gtk_print_job_set_page_set (print_job, gtk_print_settings_get_page_set (settings)); | ||
1163 | 52 | + gtk_print_job_set_rotate (print_job, TRUE); | ||
1164 | 53 | } | ||
1165 | 54 | |||
1166 | 55 | static gboolean | ||
1167 | 56 | -- | ||
1168 | 57 | 1.7.2.3 | ||
1169 | 58 | |||
1170 | 59 | 0 | ||
1171 | === modified file 'debian/patches/series' | |||
1172 | --- debian/patches/series 2010-12-23 05:15:15 +0000 | |||
1173 | +++ debian/patches/series 2011-01-14 13:47:10 +0000 | |||
1174 | @@ -1,9 +1,7 @@ | |||
1175 | 1 | 001_static-linking-dont-query-immodules.patch | 1 | 001_static-linking-dont-query-immodules.patch |
1176 | 2 | 002_static-linking-dont-build-perf.patch | 2 | 002_static-linking-dont-build-perf.patch |
1178 | 3 | 003_gdk.pc_privates.patch | 3 | #003_gdk.pc_privates.patch |
1179 | 4 | 004_git_add_missing_include.patch | 4 | 004_git_add_missing_include.patch |
1180 | 5 | 004_gir_with_separate_build_tree.patch | ||
1181 | 6 | 005_support_disabling_x11_extensions.patch | ||
1182 | 7 | 006_reenable_pixbuf_engine.patch | 5 | 006_reenable_pixbuf_engine.patch |
1183 | 8 | 015_default-fallback-icon-theme.patch | 6 | 015_default-fallback-icon-theme.patch |
1184 | 9 | 022_disable-viqr-im-for-vi-locale.patch | 7 | 022_disable-viqr-im-for-vi-locale.patch |
1185 | @@ -11,15 +9,11 @@ | |||
1186 | 11 | 042_treeview_single-focus.patch | 9 | 042_treeview_single-focus.patch |
1187 | 12 | 043_ubuntu_menu_proxy.patch | 10 | 043_ubuntu_menu_proxy.patch |
1188 | 13 | 060_ignore-random-icons.patch | 11 | 060_ignore-random-icons.patch |
1189 | 14 | 061_use_pdf_as_default_printing_standard.patch | ||
1190 | 15 | 062_ubuntu-set-grab-add.patch | 12 | 062_ubuntu-set-grab-add.patch |
1191 | 16 | 065_gir_set_packages.patch | 13 | 065_gir_set_packages.patch |
1192 | 17 | 071_no_offscreen_widgets_grabbing.patch | 14 | 071_no_offscreen_widgets_grabbing.patch |
1193 | 18 | 072_indicator_menu_update.patch | 15 | 072_indicator_menu_update.patch |
1194 | 19 | 073_treeview_almost_fixed.patch | 16 | 073_treeview_almost_fixed.patch |
1195 | 20 | 074_expose_active_menu_item.patch | ||
1196 | 21 | 075_expose_gdkwidget_for_gtkrange.patch | 17 | 075_expose_gdkwidget_for_gtkrange.patch |
1197 | 22 | 091_bugzilla_tooltip_refresh.patch | 18 | 091_bugzilla_tooltip_refresh.patch |
1198 | 23 | 092_default_to_xdg_document_dir.patch | 19 | 092_default_to_xdg_document_dir.patch |
1199 | 24 | 093_dso_link_issues.patch | ||
1200 | 25 | 094_gtkprint_test_fix.patch |
Two issues: icon-cache programs need to be versioned so they don't conflict with the GTK2 versions
- The gtk-builder-convert and gtk-update-
- The symbols file shouldn't have -1ubuntu1 on the symbol versions