Merge lp:~andrewfister/deja-dup/close-button-fix into lp:~deja-dup-team/deja-dup/trunk

[Andrew Fister]

Instead of stopping the backup and closing when the window manager close button is pressed, Deja-Dup should "minimize to tray", or in other words just hide the window. This is the functionality implemented in this branch.

[Michael Terry (mterry)]

Merged, with the fix that we do_cancel instead of do_close to retain previous behavior.

review: Approve

[Andrew Fister (andrewfister)]

Are you using do_cancel there because of the hide_everything in do_cancel? It just seemed to me, semantically, that if there's no operation going on, then there's inherently nothing to cancel, so why call something called do_cancel?

[Michael Terry (mterry)]

Uh, you're right, I guess. Since there's no operation, it means we just do 'hide_everything' then 'do_close'. I used do_cancel because that's what the close button used to do. But it is harmless.

[Andrew Fister (andrewfister)]

OK, that's cool. Thanks for the quick review :-)

=== modified file 'AUTHORS'
--- AUTHORS	2010-05-29 17:44:34 +0000
+++ AUTHORS	2010-07-12 10:46:40 +0000
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright: 2008–2010 Michael Terry <[e-mail]>
-           2009 Andrew Fister <[e-mail]>
+           2009,2010 Andrew Fister <[e-mail]>
            2010 Michael Vogt <[e-mail]>
 License: GPL-3+
 

=== modified file 'deja-dup/Assistant.vala'
--- deja-dup/Assistant.vala	2010-06-14 01:06:33 +0000
+++ deja-dup/Assistant.vala	2010-07-12 10:46:40 +0000
@@ -2,6 +2,7 @@
 /*
     This file is part of Déjà Dup.
     © 2009 Michael Terry <[e-mail]>
+    © 2010 Andrew Fister <[e-mail]>
 
     Déjà Dup is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -128,6 +129,7 @@
   void handle_response(int resp)
   {
     switch (resp) {
+    case Gtk.ResponseType.DELETE_EVENT: break;
     case BACK: go_back(); break;
     case APPLY:
     case FORWARD: go_forward(); break;

=== modified file 'deja-dup/AssistantOperation.vala'
--- deja-dup/AssistantOperation.vala	2010-06-14 01:06:33 +0000
+++ deja-dup/AssistantOperation.vala	2010-07-12 10:46:40 +0000
@@ -2,6 +2,7 @@
 /*
     This file is part of Déjà Dup.
     © 2008,2009 Michael Terry <[e-mail]>
+    © 2010 Andrew Fister <[e-mail]>
 
     Déjà Dup is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -78,6 +79,7 @@
     canceled.connect(do_cancel);
     closed.connect(do_close);
     prepare.connect(do_prepare);
+    delete_event.connect(do_minimize_to_tray);
   }
   
   protected abstract Gtk.Widget? make_confirm_page();
@@ -472,6 +474,16 @@
     else
       do_close();
   }
+
+  bool do_minimize_to_tray(Gdk.Event event)
+  {
+    if (op != null)
+      hide_on_delete(); // minimize to tray when operation is in progress
+    else
+      do_close(); // otherwise, do the normal close operation
+
+    return true;
+  }
   
   protected virtual void do_close()
   {