[gnome-power-manager] Make notifications more reliable at session startup

[Richard Hughes <rhughes src gnome org>]

commit c4dfb0a09e5ed9c1ad80e80f821da53e13e2e28a
Author: Pramod Dematagoda <pramod pramod fedora>
Date:   Sun Sep 6 14:41:52 2009 +0530

    Make notifications more reliable at session startup

 src/gpm-manager.c   |    2 +-
 src/gpm-tray-icon.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 73e9363..6e85f71 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -379,7 +379,7 @@ gpm_manager_notify (GpmManager *manager, NotifyNotification **notification_class
 	gpm_manager_notify_close (manager, *notification_class);
 
 	/* if the status icon is hidden, don't point at it */
-	if (gtk_status_icon_get_visible (manager->priv->status_icon))
+	if (gtk_status_icon_is_embedded (manager->priv->status_icon))
 		notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon);
 	else
 		notification = notify_notification_new (title, message, icon, NULL);
diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c
index 11e5981..cf272b0 100644
--- a/src/gpm-tray-icon.c
+++ b/src/gpm-tray-icon.c
@@ -53,7 +53,6 @@
 static void     gpm_tray_icon_finalize   (GObject	   *object);
 
 #define GPM_TRAY_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_TRAY_ICON, GpmTrayIconPrivate))
-#define GPM_TRAY_ICON_CONNECT_TIMEOUT		10 /* s */
 
 struct GpmTrayIconPrivate
 {