Merge lp:~kvalo/indicator-network/bug-737743 into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/settings/app.vala'
--- src/settings/app.vala	2011-02-01 12:59:54 +0000
+++ src/settings/app.vala	2011-03-24 14:14:11 +0000
@@ -18,6 +18,9 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+private static const uint GDK_w = 0x077;
+
+
 public class NetworkSettings : Object {
 
     // Widgets from GTKBuilder
@@ -76,10 +79,26 @@
 
     private void connect_signals() {
         this.window_main.delete_event.connect(this.on_window_main_delete_event);
+
+        var group = new Gtk.AccelGroup();
+        group.connect(GDK_w, Gdk.ModifierType.CONTROL_MASK, 0,
+                      on_accel_activate);
+        this.window_main.add_accel_group(group);
+
         this.notebook_main.switch_page.connect(this.on_notebook_main_page_switched);
     }
     
     /* Callbacks */
+    private bool on_accel_activate(Gtk.AccelGroup accel_group,
+                                   Object acceleratable,
+                                   uint keyval, Gdk.ModifierType modifier)
+    {
+        stdout.printf("on_accel_activate()\n");
+        Gtk.main_quit();
+        /* FIXME: what does this return value mean? */
+        return false;
+    }
+
     public bool on_window_main_delete_event(Gdk.Event event) {
         Gtk.main_quit();
         return true;