[maemo-commits] [maemo-commits] r9320 - projects/haf/branches/hildon-fm/1.x/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-01-24 19:42:02 +0200 (Wed, 24 Jan 2007)
New Revision: 9320

Modified:
   projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-system-settings.c
Log:
	* hildon-fm/hildon-file-system-settings.c
	(_hildon_file_system_prepare_banner): Only request the banner when
	there is a toplevel window to make it transient for.


Modified: projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-system-settings.c
===================================================================
--- projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-system-settings.c	2007-01-24 16:45:22 UTC (rev 9319)
+++ projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-system-settings.c	2007-01-24 17:42:02 UTC (rev 9320)
@@ -927,7 +927,14 @@
   const char *ckdg_pb_updating_str;
   dbus_int32_t xid = 0;
   dbus_bool_t ret;
-  
+
+  /* We don't show the banner if there is no toplevel window for it
+     yet.
+  */
+  if (banner_toplevel_window == NULL
+      || GTK_WIDGET (banner_toplevel_window)->window == NULL)
+    return;
+
   if (timeout_id == NULL) return;
 
   /* just refresh the timeout if there is already a timeout */
@@ -959,12 +966,7 @@
   if (banner_pid == 0)
     banner_pid = getpid(); /* id */
 
-  if (banner_toplevel_window)
-    {
-      GdkWindow *win = GTK_WIDGET (banner_toplevel_window)->window;
-      if (win)
-	xid = GDK_WINDOW_XID (win);
-    }
+  xid = GDK_WINDOW_XID (GTK_WIDGET (banner_toplevel_window)->window);
 
   ret = dbus_message_append_args(message, DBUS_TYPE_INT32, &banner_pid,
                                  DBUS_TYPE_INT32, &initial_value,