[Galago-commits] r2761 - in trunk/notification-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-21 16:43:36 -0700 (Fri, 21 Apr 2006)
New Revision: 2761

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon.c
Log:
Patch by M.S. to fix the problem where icons were being clipped in notifications if the text didn't wrap enough lines. This fixes bug #21.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-04-21 23:34:43 UTC (rev 2760)
+++ trunk/notification-daemon/ChangeLog	2006-04-21 23:43:36 UTC (rev 2761)
@@ -1,3 +1,10 @@
+Fri Apr 21 16:42:46 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	  - Patch by M.S. to fix the problem where icons were being clipped in
+	    notifications if the text didn't wrap enough lines. This fixes
+	    bug #21.
+
 Fri Apr 21 16:33:56 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-04-21 23:34:43 UTC (rev 2760)
+++ trunk/notification-daemon/src/daemon.c	2006-04-21 23:43:36 UTC (rev 2761)
@@ -905,23 +905,6 @@
 		}
 	}
 
-	if (use_pos_data)
-	{
-		/*
-		 * Typically, the theme engine will set its own position based on
-		 * the arrow X, Y hints. However, in case, move the notification to
-		 * that position.
-		 */
-		theme_set_notification_arrow(nw, TRUE, x, y);
-		theme_move_notification(nw, x, y);
-	}
-	else
-	{
-		theme_set_notification_arrow(nw, FALSE, 0, 0);
-		_notify_daemon_add_bubble_to_poptart_stack(daemon, nw,
-												   new_notification);
-	}
-
 	/* check for icon_data if icon == "" */
 	if (*icon == '\0')
 	{
@@ -974,6 +957,23 @@
 		}
 	}
 
+	if (use_pos_data)
+	{
+		/*
+		 * Typically, the theme engine will set its own position based on
+		 * the arrow X, Y hints. However, in case, move the notification to
+		 * that position.
+		 */
+		theme_set_notification_arrow(nw, TRUE, x, y);
+		theme_move_notification(nw, x, y);
+	}
+	else
+	{
+		theme_set_notification_arrow(nw, FALSE, 0, 0);
+		_notify_daemon_add_bubble_to_poptart_stack(daemon, nw,
+												   new_notification);
+	}
+
 	if (!screensaver_active(GTK_WIDGET(nw)) &&
 		!fullscreen_window_exists(GTK_WIDGET(nw)))
 	{