diff -Nru indicator-network-0.3.8/debian/changelog indicator-network-0.3.8/debian/changelog --- indicator-network-0.3.8/debian/changelog 2012-01-25 20:42:26.000000000 +0530 +++ indicator-network-0.3.8/debian/changelog 2012-05-05 20:06:24.000000000 +0530 @@ -1,3 +1,10 @@ +indicator-network (0.3.8-0ubuntu7) quantal; urgency=low + + * debian/debian/close-network-settings-with-crtl-w.patch + - Allows to close the network-settings windows with crtl-w (LP: #737743) + + -- Vibhav Pant Sat, 05 May 2012 19:59:41 +0530 + indicator-network (0.3.8-0ubuntu6) precise; urgency=low * no change rebuild for libindicator7 diff -Nru indicator-network-0.3.8/debian/patches/close-network-settings-with-crtl-w.patch indicator-network-0.3.8/debian/patches/close-network-settings-with-crtl-w.patch --- indicator-network-0.3.8/debian/patches/close-network-settings-with-crtl-w.patch 1970-01-01 05:30:00.000000000 +0530 +++ indicator-network-0.3.8/debian/patches/close-network-settings-with-crtl-w.patch 2012-05-05 19:59:20.000000000 +0530 @@ -0,0 +1,47 @@ +Description: Closes network-network with crtl-w +Author: Kalle Valo +Origin: upstream, https://code.launchpad.net/~kvalo/indicator-network/bug-737743/+merge/54704/+preview-diff/+files/preview.diff +Bug: https://bugs.launchpad.net/indicator-network/+bug/737743 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/indicator-network/+bug/737743 +Reviewed-By: Conor Curran +Last-Update: 2012-05-04 + +--- indicator-network-0.3.8.orig/src/settings/app.vala ++++ indicator-network-0.3.8/src/settings/app.vala +@@ -18,6 +18,9 @@ + * with this program. If not, see . + */ + ++private static const uint GDK_w = 0x077; ++ ++ + public class NetworkSettings : Object { + + // Widgets from GTKBuilder +@@ -76,10 +79,26 @@ public class NetworkSettings : Object { + + 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((notebook, page_num) => { this.on_notebook_main_page_switched ((Gtk.Notebook) notebook, page_num); }); + } + + /* 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.EventAny event) { + Gtk.main_quit(); + return true; diff -Nru indicator-network-0.3.8/debian/patches/series indicator-network-0.3.8/debian/patches/series --- indicator-network-0.3.8/debian/patches/series 2012-01-25 20:42:26.000000000 +0530 +++ indicator-network-0.3.8/debian/patches/series 2012-05-05 19:48:58.000000000 +0530 @@ -1,2 +1,3 @@ gtk3-vala-port.patch generate_vapi.patch +close-network-settings-with-crtl-w.patch