[Xfce4-commits] <thunar:master> Shortcut pane: Do not mount after eject (bug #9403).

[Nick Schermer]

Updating branch refs/heads/master
         to d278d79e4059959ad9bffe6c1d4de9ee6922aa26 (commit)
       from 7df35529827eda827755df91600c86eaffabcc07 (commit)

commit d278d79e4059959ad9bffe6c1d4de9ee6922aa26
Author: Harald Judt <h.judt at gmx.at>
Date:   Wed Oct 24 21:13:06 2012 +0200

    Shortcut pane: Do not mount after eject (bug #9403).
    
    If eject button has been pressed, do not perform any further action.

 thunar/thunar-shortcuts-view.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 2d62f78..7b36a67 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -461,12 +461,13 @@ thunar_shortcuts_view_button_release_event (GtkWidget      *widget,
   /* check if we have an event matching the pressed button state */
   if (G_LIKELY (view->pressed_button == (gint) event->button))
     {
+      /* check if the eject button has been pressed */
       if (view->pressed_eject_button)
         thunar_shortcuts_view_eject (view);
-
-      /* check if we should simply open or open in new window */
-      if (G_LIKELY (event->button == 1))
+      /* button 1 opens in the same window */
+      else if (G_LIKELY (event->button == 1))
         thunar_shortcuts_view_open (view, FALSE);
+      /* button 2 opens in a new window */
       else if (G_UNLIKELY (event->button == 2))
         thunar_shortcuts_view_open (view, TRUE);
     }