[maemo-commits] [maemo-commits] r12429 - in projects/haf/branches/hildon-control-panel/refactoring: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-06-21 16:40:39 +0300 (Thu, 21 Jun 2007)
New Revision: 12429

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2007-06-21  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-window.c: added Ctrl-Q accelerator to Close menu item. Fixes
	bug NB#61112.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-21 13:40:26 UTC (rev 12428)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-21 13:40:39 UTC (rev 12429)
@@ -1,5 +1,10 @@
 2007-06-21  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hcp-window.c: added Ctrl-Q accelerator to Close menu item. Fixes
+	bug NB#61112.
+
+2007-06-21  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* configure.ac: release 1.9.5
 
 2007-06-21  Lucas Rocha  <lucas.rocha at nokia.com>

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-06-21 13:40:26 UTC (rev 12428)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-06-21 13:40:39 UTC (rev 12429)
@@ -363,7 +363,7 @@
 
   priv->device_locked = (lock_state > 0);
 
-  /* Revert to always check lock code for now */
+  /* FIXME: Revert to always check lock code for now */
   priv->device_locked = TRUE;
   
   g_object_unref (client);
@@ -709,6 +709,7 @@
   HildonProgram *program;
   
   GtkMenu *menu = NULL;
+  GtkAccelGroup *accel_group;
   GtkWidget *sub_view = NULL;
   GtkWidget *sub_tools = NULL;
   GtkWidget *mi = NULL;
@@ -842,11 +843,21 @@
                    G_CALLBACK (hcp_window_launch_help), window);
 
   /* Close */
+  accel_group = gtk_accel_group_new ();
+  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+  
   mi = gtk_menu_item_new_with_label (HCP_MENU_CLOSE);
 
   g_signal_connect (GTK_OBJECT(mi), "activate",
                     G_CALLBACK(hcp_window_quit), window);
 
+  gtk_widget_add_accelerator (mi, 
+		              "activate", 
+			      accel_group, 
+			      GDK_Q, 
+			      GDK_CONTROL_MASK, 
+			      GTK_ACCEL_VISIBLE);
+  
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
 
   gtk_widget_show_all (GTK_WIDGET (menu));