Merge lp:~3v1n0/nautilus/menubar-visibility-signals into lp:~ubuntu-desktop/nautilus/ubuntu
- menubar-visibility-signals
- Merge into ubuntu
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Merged at revision: | 511 |
Proposed branch: | lp:~3v1n0/nautilus/menubar-visibility-signals |
Merge into: | lp:~ubuntu-desktop/nautilus/ubuntu |
Diff against target: |
300 lines (+97/-56) 2 files modified
debian/changelog (+7/-0) debian/patches/restore-traditional-menu-bar.patch (+90/-56) |
To merge this branch: | bzr merge lp:~3v1n0/nautilus/menubar-visibility-signals |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+292925@code.launchpad.net |
Commit message
debian/
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 2016-03-18 19:50:21 +0000 | |||
3 | +++ debian/changelog 2016-04-26 12:20:49 +0000 | |||
4 | @@ -1,3 +1,10 @@ | |||
5 | 1 | nautilus (1:3.18.4.is.3.14.3-0ubuntu5) UNRELEASED; urgency=medium | ||
6 | 2 | |||
7 | 3 | * debian/patches/restore-traditional-menu-bar.patch: | ||
8 | 4 | - update menubar visibility on GktSettings changes | ||
9 | 5 | |||
10 | 6 | -- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 26 Apr 2016 14:08:09 +0200 | ||
11 | 7 | |||
12 | 1 | nautilus (1:3.18.4.is.3.14.3-0ubuntu4) xenial; urgency=medium | 8 | nautilus (1:3.18.4.is.3.14.3-0ubuntu4) xenial; urgency=medium |
13 | 2 | 9 | ||
14 | 3 | * debian/nautilus.migrations, | 10 | * debian/nautilus.migrations, |
15 | 4 | 11 | ||
16 | === modified file 'debian/patches/restore-traditional-menu-bar.patch' | |||
17 | --- debian/patches/restore-traditional-menu-bar.patch 2016-02-03 11:49:50 +0000 | |||
18 | +++ debian/patches/restore-traditional-menu-bar.patch 2016-04-26 12:20:49 +0000 | |||
19 | @@ -17,13 +17,18 @@ | |||
20 | 17 | src/nautilus-window.c | 10 +++-- | 17 | src/nautilus-window.c | 10 +++-- |
21 | 18 | 9 files changed, 299 insertions(+), 69 deletions(-) | 18 | 9 files changed, 299 insertions(+), 69 deletions(-) |
22 | 19 | 19 | ||
24 | 20 | Index: b/src/nautilus-application-actions.c | 20 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-application-actions.c |
25 | 21 | =================================================================== | 21 | =================================================================== |
31 | 22 | --- a/src/nautilus-application-actions.c | 22 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-application-actions.c |
32 | 23 | +++ b/src/nautilus-application-actions.c | 23 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-application-actions.c |
33 | 24 | @@ -258,8 +258,8 @@ | 24 | @@ -255,36 +255,64 @@ static GActionEntry app_entries[] = { |
34 | 25 | void | 25 | { "close-desktop", action_close_desktop, NULL, NULL, NULL }, |
35 | 26 | nautilus_init_application_actions (NautilusApplication *app) | 26 | }; |
36 | 27 | |||
37 | 28 | -void | ||
38 | 29 | -nautilus_init_application_actions (NautilusApplication *app) | ||
39 | 30 | +static void | ||
40 | 31 | +update_menubar_visibility (NautilusApplication *app) | ||
41 | 27 | { | 32 | { |
42 | 28 | - GtkBuilder *builder; | 33 | - GtkBuilder *builder; |
43 | 29 | - GError *error = NULL; | 34 | - GError *error = NULL; |
44 | @@ -31,18 +36,14 @@ | |||
45 | 31 | + gboolean show_menubar; | 36 | + gboolean show_menubar; |
46 | 32 | const gchar *debug_no_app_menu; | 37 | const gchar *debug_no_app_menu; |
47 | 33 | 38 | ||
53 | 34 | g_action_map_add_action_entries (G_ACTION_MAP (app), | 39 | - g_action_map_add_action_entries (G_ACTION_MAP (app), |
54 | 35 | @@ -267,18 +267,31 @@ | 40 | - app_entries, G_N_ELEMENTS (app_entries), |
55 | 36 | app); | 41 | - app); |
56 | 37 | gtk_application_add_accelerator (GTK_APPLICATION (app), "F10", "win.gear-menu", NULL); | 42 | - gtk_application_add_accelerator (GTK_APPLICATION (app), "F10", "win.gear-menu", NULL); |
57 | 38 | 43 | - | |
58 | 39 | - builder = gtk_builder_new (); | 44 | - builder = gtk_builder_new (); |
59 | 40 | - gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error); | 45 | - gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error); |
65 | 41 | + g_object_get (gtk_settings_get_default (), | 46 | - |
61 | 42 | + "gtk-shell-shows-app-menu", &show_app_menu, | ||
62 | 43 | + "gtk-shell-shows-menubar", &show_menubar, | ||
63 | 44 | + NULL); | ||
64 | 45 | |||
66 | 46 | - if (error == NULL) { | 47 | - if (error == NULL) { |
67 | 47 | - gtk_application_set_app_menu (GTK_APPLICATION (app), | 48 | - gtk_application_set_app_menu (GTK_APPLICATION (app), |
68 | 48 | - G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"))); | 49 | - G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"))); |
69 | @@ -50,6 +51,24 @@ | |||
70 | 50 | - g_critical ("Unable to add the application menu: %s\n", error->message); | 51 | - g_critical ("Unable to add the application menu: %s\n", error->message); |
71 | 51 | - g_error_free (error); | 52 | - g_error_free (error); |
72 | 52 | - } | 53 | - } |
73 | 54 | - | ||
74 | 55 | - g_object_unref (builder); | ||
75 | 56 | - | ||
76 | 57 | debug_no_app_menu = g_getenv ("NAUTILUS_DEBUG_NO_APP_MENU"); | ||
77 | 58 | if (debug_no_app_menu) { | ||
78 | 59 | DEBUG ("Disabling app menu GtkSetting as requested..."); | ||
79 | 60 | g_object_set (gtk_settings_get_default (), | ||
80 | 61 | "gtk-shell-shows-app-menu", FALSE, | ||
81 | 62 | NULL); | ||
82 | 63 | + | ||
83 | 64 | + return; | ||
84 | 65 | + } | ||
85 | 66 | + | ||
86 | 67 | + g_object_get (gtk_settings_get_default (), | ||
87 | 68 | + "gtk-shell-shows-app-menu", &show_app_menu, | ||
88 | 69 | + "gtk-shell-shows-menubar", &show_menubar, | ||
89 | 70 | + NULL); | ||
90 | 71 | + | ||
91 | 53 | + /* Only add the app menu when the shell doesn't show the menu | 72 | + /* Only add the app menu when the shell doesn't show the menu |
92 | 54 | + * bar, because we merge the app menu into the menu bar. | 73 | + * bar, because we merge the app menu into the menu bar. |
93 | 55 | + */ | 74 | + */ |
94 | @@ -59,8 +78,7 @@ | |||
95 | 59 | + | 78 | + |
96 | 60 | + builder = gtk_builder_new (); | 79 | + builder = gtk_builder_new (); |
97 | 61 | + gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error); | 80 | + gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error); |
100 | 62 | 81 | + | |
99 | 63 | - g_object_unref (builder); | ||
101 | 64 | + if (error == NULL) { | 82 | + if (error == NULL) { |
102 | 65 | + gtk_application_set_app_menu (GTK_APPLICATION (app), | 83 | + gtk_application_set_app_menu (GTK_APPLICATION (app), |
103 | 66 | + G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"))); | 84 | + G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"))); |
104 | @@ -70,14 +88,30 @@ | |||
105 | 70 | + } | 88 | + } |
106 | 71 | + | 89 | + |
107 | 72 | + g_object_unref (builder); | 90 | + g_object_unref (builder); |
113 | 73 | + } | 91 | } |
114 | 74 | 92 | } | |
115 | 75 | debug_no_app_menu = g_getenv ("NAUTILUS_DEBUG_NO_APP_MENU"); | 93 | + |
116 | 76 | if (debug_no_app_menu) { | 94 | +void |
117 | 77 | Index: b/src/nautilus-canvas-view-ui.xml | 95 | +nautilus_init_application_actions (NautilusApplication *app) |
118 | 96 | +{ | ||
119 | 97 | + g_action_map_add_action_entries (G_ACTION_MAP (app), | ||
120 | 98 | + app_entries, G_N_ELEMENTS (app_entries), | ||
121 | 99 | + app); | ||
122 | 100 | + gtk_application_add_accelerator (GTK_APPLICATION (app), "F10", "win.gear-menu", NULL); | ||
123 | 101 | + | ||
124 | 102 | + update_menubar_visibility (app); | ||
125 | 103 | + | ||
126 | 104 | + g_signal_connect_swapped (gtk_settings_get_default (), | ||
127 | 105 | + "notify::gtk-shell-shows-app-menu", | ||
128 | 106 | + G_CALLBACK (update_menubar_visibility), app); | ||
129 | 107 | + g_signal_connect_swapped (gtk_settings_get_default (), | ||
130 | 108 | + "notify::gtk-shell-shows-menubar", | ||
131 | 109 | + G_CALLBACK (update_menubar_visibility), app); | ||
132 | 110 | +} | ||
133 | 111 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-canvas-view-ui.xml | ||
134 | 78 | =================================================================== | 112 | =================================================================== |
137 | 79 | --- a/src/nautilus-canvas-view-ui.xml | 113 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-canvas-view-ui.xml |
138 | 80 | +++ b/src/nautilus-canvas-view-ui.xml | 114 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-canvas-view-ui.xml |
139 | 81 | @@ -1,4 +1,23 @@ | 115 | @@ -1,4 +1,23 @@ |
140 | 82 | <ui> | 116 | <ui> |
141 | 83 | + <menubar name="menubar"> | 117 | + <menubar name="menubar"> |
142 | @@ -102,10 +136,10 @@ | |||
143 | 102 | <popup name="ViewMenu" accelerators="true"> | 136 | <popup name="ViewMenu" accelerators="true"> |
144 | 103 | <placeholder name="Layout Options"> | 137 | <placeholder name="Layout Options"> |
145 | 104 | <menuitem name="Manual Layout" action="Manual Layout"/> | 138 | <menuitem name="Manual Layout" action="Manual Layout"/> |
147 | 105 | Index: b/src/nautilus-directory-view-ui.xml | 139 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-directory-view-ui.xml |
148 | 106 | =================================================================== | 140 | =================================================================== |
151 | 107 | --- a/src/nautilus-directory-view-ui.xml | 141 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-directory-view-ui.xml |
152 | 108 | +++ b/src/nautilus-directory-view-ui.xml | 142 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-directory-view-ui.xml |
153 | 109 | @@ -4,6 +4,85 @@ | 143 | @@ -4,6 +4,85 @@ |
154 | 110 | <accelerator action="OpenCloseParent"/> | 144 | <accelerator action="OpenCloseParent"/> |
155 | 111 | <accelerator action="PropertiesAccel"/> | 145 | <accelerator action="PropertiesAccel"/> |
156 | @@ -192,10 +226,10 @@ | |||
157 | 192 | <popup name="ViewMenu" accelerators="true"> | 226 | <popup name="ViewMenu" accelerators="true"> |
158 | 193 | <placeholder name="View Details"> | 227 | <placeholder name="View Details"> |
159 | 194 | <menuitem name="Reset to Defaults" action="Reset to Defaults"/> | 228 | <menuitem name="Reset to Defaults" action="Reset to Defaults"/> |
161 | 195 | Index: b/src/nautilus-list-view-ui.xml | 229 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-list-view-ui.xml |
162 | 196 | =================================================================== | 230 | =================================================================== |
165 | 197 | --- a/src/nautilus-list-view-ui.xml | 231 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-list-view-ui.xml |
166 | 198 | +++ b/src/nautilus-list-view-ui.xml | 232 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-list-view-ui.xml |
167 | 199 | @@ -1,4 +1,11 @@ | 233 | @@ -1,4 +1,11 @@ |
168 | 200 | <ui> | 234 | <ui> |
169 | 201 | + <menubar name="menubar"> | 235 | + <menubar name="menubar"> |
170 | @@ -208,10 +242,10 @@ | |||
171 | 208 | <popup name="ViewMenu" accelerators="true"> | 242 | <popup name="ViewMenu" accelerators="true"> |
172 | 209 | <placeholder name="View Details"> | 243 | <placeholder name="View Details"> |
173 | 210 | <menuitem name="Visible Columns" action="Visible Columns"/> | 244 | <menuitem name="Visible Columns" action="Visible Columns"/> |
175 | 211 | Index: b/src/nautilus-shell-ui.xml | 245 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-shell-ui.xml |
176 | 212 | =================================================================== | 246 | =================================================================== |
179 | 213 | --- a/src/nautilus-shell-ui.xml | 247 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-shell-ui.xml |
180 | 214 | +++ b/src/nautilus-shell-ui.xml | 248 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-shell-ui.xml |
181 | 215 | @@ -74,4 +74,96 @@ | 249 | @@ -74,4 +74,96 @@ |
182 | 216 | <separator/> | 250 | <separator/> |
183 | 217 | <placeholder name="After Zoom Items"/> | 251 | <placeholder name="After Zoom Items"/> |
184 | @@ -309,11 +343,11 @@ | |||
185 | 309 | + </menu> | 343 | + </menu> |
186 | 310 | +</menubar> | 344 | +</menubar> |
187 | 311 | </ui> | 345 | </ui> |
189 | 312 | Index: b/src/nautilus-toolbar.c | 346 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-toolbar.c |
190 | 313 | =================================================================== | 347 | =================================================================== |
194 | 314 | --- a/src/nautilus-toolbar.c | 348 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-toolbar.c |
195 | 315 | +++ b/src/nautilus-toolbar.c | 349 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-toolbar.c |
196 | 316 | @@ -377,6 +377,18 @@ | 350 | @@ -377,6 +377,18 @@ gear_menu_key_press (GtkWidget *widget, |
197 | 317 | return FALSE; | 351 | return FALSE; |
198 | 318 | } | 352 | } |
199 | 319 | 353 | ||
200 | @@ -332,7 +366,7 @@ | |||
201 | 332 | static void | 366 | static void |
202 | 333 | nautilus_toolbar_constructed (GObject *obj) | 367 | nautilus_toolbar_constructed (GObject *obj) |
203 | 334 | { | 368 | { |
205 | 335 | @@ -426,16 +438,18 @@ | 369 | @@ -426,16 +438,18 @@ nautilus_toolbar_constructed (GObject *o |
206 | 336 | self->priv->location_entry = nautilus_location_entry_new (); | 370 | self->priv->location_entry = nautilus_location_entry_new (); |
207 | 337 | gtk_header_bar_pack_start (GTK_HEADER_BAR (toolbar), self->priv->location_entry); | 371 | gtk_header_bar_pack_start (GTK_HEADER_BAR (toolbar), self->priv->location_entry); |
208 | 338 | 372 | ||
209 | @@ -360,7 +394,7 @@ | |||
210 | 360 | 394 | ||
211 | 361 | /* View buttons */ | 395 | /* View buttons */ |
212 | 362 | box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); | 396 | box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); |
214 | 363 | @@ -446,11 +460,14 @@ | 397 | @@ -446,11 +460,14 @@ nautilus_toolbar_constructed (GObject *o |
215 | 364 | button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID, NULL); | 398 | button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID, NULL); |
216 | 365 | gtk_widget_set_valign (button, GTK_ALIGN_CENTER); | 399 | gtk_widget_set_valign (button, GTK_ALIGN_CENTER); |
217 | 366 | gtk_container_add (GTK_CONTAINER (box), button); | 400 | gtk_container_add (GTK_CONTAINER (box), button); |
218 | @@ -380,11 +414,11 @@ | |||
219 | 380 | 414 | ||
220 | 381 | gtk_style_context_add_class (gtk_widget_get_style_context (box), | 415 | gtk_style_context_add_class (gtk_widget_get_style_context (box), |
221 | 382 | GTK_STYLE_CLASS_RAISED); | 416 | GTK_STYLE_CLASS_RAISED); |
223 | 383 | Index: b/src/nautilus-window-menus.c | 417 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-window-menus.c |
224 | 384 | =================================================================== | 418 | =================================================================== |
228 | 385 | --- a/src/nautilus-window-menus.c | 419 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window-menus.c |
229 | 386 | +++ b/src/nautilus-window-menus.c | 420 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-window-menus.c |
230 | 387 | @@ -473,6 +473,11 @@ | 421 | @@ -473,6 +473,11 @@ action_view_radio_changed (GtkRadioActio |
231 | 388 | } | 422 | } |
232 | 389 | 423 | ||
233 | 390 | static const GtkActionEntry main_entries[] = { | 424 | static const GtkActionEntry main_entries[] = { |
234 | @@ -396,7 +430,7 @@ | |||
235 | 396 | /* name, stock id, label */ { "Help", NULL, N_("_Help") }, | 430 | /* name, stock id, label */ { "Help", NULL, N_("_Help") }, |
236 | 397 | /* name, stock id */ { NAUTILUS_ACTION_CLOSE, NULL, | 431 | /* name, stock id */ { NAUTILUS_ACTION_CLOSE, NULL, |
237 | 398 | /* label, accelerator */ N_("_Close"), "<control>W", | 432 | /* label, accelerator */ N_("_Close"), "<control>W", |
239 | 399 | @@ -628,7 +633,7 @@ | 433 | @@ -628,7 +633,7 @@ static const GtkToggleActionEntry main_t |
240 | 400 | static const GtkRadioActionEntry view_radio_entries[] = { | 434 | static const GtkRadioActionEntry view_radio_entries[] = { |
241 | 401 | { NAUTILUS_ACTION_VIEW_LIST, "view-list-symbolic", N_("List"), | 435 | { NAUTILUS_ACTION_VIEW_LIST, "view-list-symbolic", N_("List"), |
242 | 402 | "<control>1", N_("View items as a list"), 0 }, | 436 | "<control>1", N_("View items as a list"), 0 }, |
243 | @@ -405,7 +439,7 @@ | |||
244 | 405 | "<control>2", N_("View items as a grid of icons"), 1 } | 439 | "<control>2", N_("View items as a grid of icons"), 1 } |
245 | 406 | }; | 440 | }; |
246 | 407 | 441 | ||
248 | 408 | @@ -662,14 +667,19 @@ | 442 | @@ -662,14 +667,19 @@ nautilus_window_initialize_actions (Naut |
249 | 409 | * | 443 | * |
250 | 410 | * Create and install the set of menus for this window. | 444 | * Create and install the set of menus for this window. |
251 | 411 | * @window: A recently-created NautilusWindow. | 445 | * @window: A recently-created NautilusWindow. |
252 | @@ -426,7 +460,7 @@ | |||
253 | 426 | 460 | ||
254 | 427 | window->details->ui_manager = gtk_ui_manager_new (); | 461 | window->details->ui_manager = gtk_ui_manager_new (); |
255 | 428 | ui_manager = window->details->ui_manager; | 462 | ui_manager = window->details->ui_manager; |
257 | 429 | @@ -728,7 +738,17 @@ | 463 | @@ -728,7 +738,17 @@ nautilus_window_initialize_menus (Nautil |
258 | 430 | G_CALLBACK (connect_proxy_cb), window); | 464 | G_CALLBACK (connect_proxy_cb), window); |
259 | 431 | 465 | ||
260 | 432 | /* add the UI */ | 466 | /* add the UI */ |
261 | @@ -444,11 +478,11 @@ | |||
262 | 444 | } | 478 | } |
263 | 445 | 479 | ||
264 | 446 | static GList * | 480 | static GList * |
266 | 447 | Index: b/src/nautilus-window-private.h | 481 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-window-private.h |
267 | 448 | =================================================================== | 482 | =================================================================== |
271 | 449 | --- a/src/nautilus-window-private.h | 483 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window-private.h |
272 | 450 | +++ b/src/nautilus-window-private.h | 484 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-window-private.h |
273 | 451 | @@ -108,7 +108,7 @@ | 485 | @@ -108,7 +108,7 @@ void nautilus_window_sync_up_button |
274 | 452 | 486 | ||
275 | 453 | /* window menus */ | 487 | /* window menus */ |
276 | 454 | void nautilus_window_initialize_actions (NautilusWindow *window); | 488 | void nautilus_window_initialize_actions (NautilusWindow *window); |
277 | @@ -457,11 +491,11 @@ | |||
278 | 457 | 491 | ||
279 | 458 | void nautilus_window_update_show_hide_menu_items (NautilusWindow *window); | 492 | void nautilus_window_update_show_hide_menu_items (NautilusWindow *window); |
280 | 459 | 493 | ||
282 | 460 | Index: b/src/nautilus-window.c | 494 | Index: nautilus-3.18.4.is.3.14.3/src/nautilus-window.c |
283 | 461 | =================================================================== | 495 | =================================================================== |
287 | 462 | --- a/src/nautilus-window.c | 496 | --- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window.c |
288 | 463 | +++ b/src/nautilus-window.c | 497 | +++ nautilus-3.18.4.is.3.14.3/src/nautilus-window.c |
289 | 464 | @@ -1439,6 +1439,7 @@ | 498 | @@ -1439,6 +1439,7 @@ nautilus_window_constructed (GObject *se |
290 | 465 | GtkWidget *grid; | 499 | GtkWidget *grid; |
291 | 466 | NautilusWindowSlot *slot; | 500 | NautilusWindowSlot *slot; |
292 | 467 | NautilusApplication *application; | 501 | NautilusApplication *application; |
293 | @@ -469,7 +503,7 @@ | |||
294 | 469 | const gchar * desktop; | 503 | const gchar * desktop; |
295 | 470 | 504 | ||
296 | 471 | window = NAUTILUS_WINDOW (self); | 505 | window = NAUTILUS_WINDOW (self); |
298 | 472 | @@ -1460,9 +1461,14 @@ | 506 | @@ -1460,9 +1461,14 @@ nautilus_window_constructed (GObject *se |
299 | 473 | gtk_widget_show (grid); | 507 | gtk_widget_show (grid); |
300 | 474 | gtk_container_add (GTK_CONTAINER (window), grid); | 508 | gtk_container_add (GTK_CONTAINER (window), grid); |
301 | 475 | 509 |