Merge lp:~intelomkar/ubuntu/saucy/nemo/nemo-1.8.4-1 into lp:ubuntu/saucy/nemo

[Omkarnath]

fixed an issue that would cause Nemo to get into not responding state.

steps to reproduce:
At any point when location bar is in breadcrumbs mode, press CTRL+L to
switch to text mode.
Press ESC to revert back to breadcrumbs mode.
Try to switch mode again using Toggle button right next to breadcrumbs.
Nemo should be in non-responding mode.
(there is one infinite loop running at back due to inconsistency)

fix:
navigation_bar_cancel_callback was calling nemo_toolbar_set_show_location_entry
which in turns changes toolbar to breadcrumbs mode. Changed it to call
toggle_location_entry_setting instead. This sets the mode and takes care
of other things like saving preferences too.

This issue is only present in official packages which are older versions.
I found newer versions have moved on to much different approach.

[Marc Deslauriers (mdeslaur)]

Looks like this is the upstream patch that fixes that issue:

https://github.com/linuxmint/nemo/commit/fc13deb6f398a32f223951ce1ffcd9af1a8c5d6b

Could you give it a try, and update your merge request with the upstream fix?

Thanks.

review: Needs Fixing

[Marc Deslauriers (mdeslaur)]

Also, the nemo package uses a patch system, so you need to actually submit a merge request with a proper patch and an updated changelog entry.

See the following for more information:
https://wiki.ubuntu.com/UbuntuDevelopment#Packaging

Unmerged revisions

7. By Omkarnath on 2014-04-15

fixed an issue that would cause Nemo to get into not responding state.

If user presses Esc key while location_entry is focused, it would revert
it back to breadcrumbs, however state of toggle button is not inverted.
clicking on toggle button again would cause Nemo to get in not responding
state.

navigation_bar_cancel_callback was calling nemo_toolbar_set_show_location_entry
which in turns changes toolbar to breadcrumbs mode. Changed it to call
toggle_location_entry_setting instead.

This should also take of saving the preferences when user presses Esc to
get back to breadcrumbs mode.

=== modified file 'src/nemo-window-menus.c'
--- src/nemo-window-menus.c	2013-05-09 23:16:08 +0000
+++ src/nemo-window-menus.c	2014-04-15 20:51:07 +0000
@@ -774,7 +774,7 @@
 
 void action_toggle_location_entry_callback (GtkToggleAction *action, gpointer user_data);
 
-static void
+void
 toggle_location_entry_setting (NemoWindow     *window,
                                NemoWindowPane *pane,
                                gboolean        from_accel_or_menu)

=== modified file 'src/nemo-window-menus.h'
--- src/nemo-window-menus.h	2013-03-22 15:54:12 +0000
+++ src/nemo-window-menus.h	2014-04-15 20:51:07 +0000
@@ -32,4 +32,6 @@
 guint         toolbar_action_for_view_id  (const char *view_id                           );
 void            toolbar_set_view_button     (guint action_id,      NemoWindowPane *pane);
 
+void toggle_location_entry_setting (NemoWindow *window, NemoWindowPane *pane, gboolean from_accel_or_menu);
+
 #endif /* NEMO_WINDOW_PANE_H */

=== modified file 'src/nemo-window-pane.c'
--- src/nemo-window-pane.c	2013-03-22 15:54:12 +0000
+++ src/nemo-window-pane.c	2014-04-15 20:51:07 +0000
@@ -243,7 +243,8 @@
 navigation_bar_cancel_callback (GtkWidget *widget,
 				NemoWindowPane *pane)
 {
-	nemo_toolbar_set_show_location_entry (NEMO_TOOLBAR (pane->tool_bar), FALSE);
+	NemoWindow *window = pane->window;
+	toggle_location_entry_setting(window, pane, FALSE);
 
 	nemo_window_pane_hide_temporary_bars (pane);
 	restore_focus_widget (pane);