[maemo-commits] [maemo-commits] r10910 - in projects/haf/trunk/hildon-desktop: . libhildonwm

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-04-02 17:31:01 +0300 (Mon, 02 Apr 2007)
New Revision: 10910

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
Log:

	* libhildonwm/hd-wm.c:
        - Moved key's signal connection to constructor. Fixes: NB53697



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-02 14:25:48 UTC (rev 10909)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-02 14:31:01 UTC (rev 10910)
@@ -1,3 +1,8 @@
+2007-04-02  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildonwm/hd-wm.c:
+	- Moved key's signal connection to constructor. Fixes: NB53697
+
 2007-04-02  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* libhildondesktop/hildon-thumb-menu-item.c: make the needed checks to

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-04-02 14:25:48 UTC (rev 10909)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-04-02 14:31:01 UTC (rev 10910)
@@ -806,6 +806,7 @@
   DBusConnection *connection,*sys_connection;
   DBusError       error,sys_error;
   gchar          *match_rule = NULL;
+  GdkKeymap      *keymap;
 
   object = G_OBJECT_CLASS (hd_wm_parent_class)->constructor (gtype, n_params, params);
 
@@ -815,9 +816,16 @@
     return object;  
   
   /* Setup shortcuts */
+  /* Track changes in the keymap */
 
   hdwm->keys = hd_keys_config_get_singleton ();
 
+  keymap = gdk_keymap_get_default ();
+  g_signal_connect (G_OBJECT (keymap), 
+		    "keys-changed",
+		    G_CALLBACK (hd_keys_reload),
+		    hdwm->keys);
+
   /* Get on the DBus */
 
   dbus_error_init (&error);
@@ -1089,7 +1097,6 @@
 static void 
 hd_wm_init (HDWM *hdwm)
 {
-  GdkKeymap      *keymap;
   
   hdwm->priv = hdwmpriv = HD_WM_GET_PRIVATE (hdwm);
 	
@@ -1155,14 +1162,7 @@
 
   gdk_error_trap_pop();
 
-  /* Track changes in the keymap */
-
-  keymap = gdk_keymap_get_default ();
-  g_signal_connect (G_OBJECT (keymap), 
-		    "keys-changed",
-		    G_CALLBACK (hd_keys_reload),
-		    hdwm->keys);
-
+  
   hdwm->priv->home_info = hd_entry_info_new (HD_ENTRY_DESKTOP);
 
   hdwm->keys = NULL;
@@ -2273,6 +2273,12 @@
 hdwm_power_key_timeout (gpointer data)
 {
   HDWM *hdwm = HD_WM (data);
+
+  if (!hdwm->keys)
+  {	  
+    g_debug ("No key handling initialized");
+    return FALSE;
+  }
 	
   if (hdwm->priv->shortcut != NULL &&
       hdwm->priv->shortcut->action == HD_KEY_ACTION_POWER)