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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-15 18:13:53 +0300 (Wed, 15 Aug 2007)
New Revision: 13215

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-desktop.c
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
Log:
2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-switcher-menu-item.c, src/hd-home-window.c: tiny code
	cleanups.
	* libhildonwm/hd-wm-desktop.c (hd_wm_desktop_entry_info_init,
	hd_wm_desk_info_is_hibernating, hd_wm_desk_info_is_urgent,
	hd_wm_desk_info_get_icon): provide sane default implementation for
	certain HDWMEntryInfo methods in order to avoid critical warning.
	Fixes NB#62461.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-15 14:59:30 UTC (rev 13214)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-15 15:13:53 UTC (rev 13215)
@@ -1,5 +1,15 @@
 2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu-item.c, src/hd-home-window.c: tiny code
+	cleanups.
+	* libhildonwm/hd-wm-desktop.c (hd_wm_desktop_entry_info_init,
+	hd_wm_desk_info_is_hibernating, hd_wm_desk_info_is_urgent,
+	hd_wm_desk_info_get_icon): provide sane default implementation for
+	certain HDWMEntryInfo methods in order to avoid critical warning.
+	Fixes NB#62461.
+
+2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c
 	(hildon_desktop_popup_menu_motion_notify,
 	hildon_desktop_popup_menu_press_event): draw selection on activated

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-desktop.c	2007-08-15 14:59:30 UTC (rev 13214)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-desktop.c	2007-08-15 15:13:53 UTC (rev 13215)
@@ -99,6 +99,24 @@
 }
 
 static GdkPixbuf *
+hd_wm_desk_info_get_icon (HDWMEntryInfo *info)
+{
+  return NULL;	
+}
+
+static gboolean 
+hd_wm_desk_info_is_hibernating (HDWMEntryInfo *info)
+{
+  return FALSE;	
+}
+
+static gboolean 
+hd_wm_desk_info_is_urgent (HDWMEntryInfo *info)
+{
+  return FALSE;	
+}
+
+static GdkPixbuf *
 hd_wm_desk_info_get_app_icon (HDWMEntryInfo *info,
                                gint          size,
                                GError     **error)
@@ -156,16 +174,16 @@
   iface->set_title         = NULL;
   iface->get_app_name      = hd_wm_desk_info_get_app_name;
   iface->get_window_name   = hd_wm_desk_info_get_window_name;
-  iface->get_icon          = NULL;
+  iface->get_icon          = hd_wm_desk_info_get_icon;
   iface->set_icon          = NULL;
   iface->get_app_icon_name = hd_wm_desk_info_get_app_icon_name;
   iface->get_app_icon      = hd_wm_desk_info_get_app_icon;
   iface->close             = NULL;
-  iface->is_urgent         = NULL;
+  iface->is_urgent         = hd_wm_desk_info_is_urgent;
   iface->get_ignore_urgent = NULL;
   iface->set_ignore_urgent = NULL;
   iface->is_active         = hd_wm_desk_info_is_active;
-  iface->is_hibernating    = NULL;
+  iface->is_hibernating    = hd_wm_desk_info_is_hibernating;
   iface->has_extra_icon    = NULL;
   iface->get_extra_icon    = NULL;
   iface->get_x_window      = hd_wm_desk_info_get_x_window;

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-08-15 14:59:30 UTC (rev 13214)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-08-15 15:13:53 UTC (rev 13215)
@@ -1159,7 +1159,6 @@
   hd_home_window_save_area_layout (window);
 
   hd_home_window_ensure_menu_status (window);
-
 }
 
 static gboolean
@@ -1267,11 +1266,10 @@
   /* We don't do anything when the screen is dimmed, only on and off */
   if (state == OSSO_DISPLAY_DIMMED)
     return;
-
+  
   g_signal_emit_by_name (G_OBJECT (window),
                          "screen-off",
                          state == OSSO_DISPLAY_OFF);
-
 }
 
 static void
@@ -1336,6 +1334,7 @@
   GtkWidget            *area;
 
   area = GTK_BIN (window)->child;
+
   g_return_if_fail (HILDON_IS_HOME_AREA (area));
 
   priv->screen_is_off = is_off;

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-08-15 14:59:30 UTC (rev 13214)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-08-15 15:13:53 UTC (rev 13215)
@@ -539,9 +539,6 @@
     requisition->width = MAX (requisition->width, child_width);
 
   requisition->height = MAX (requisition->height, child_height);
-
-  g_debug ("menu-item requisition: (%d, %d)",
-	  requisition->width, requisition->height);
 }
 
 static void