[notification-daemon] Make sure bubble position padding works for multimonitor

[William Jon McCann <mccann src gnome org>]

commit 2d61b8fbe202aebcb3a1cb9ad42e449769cf594d
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Jan 30 21:59:09 2010 -0500

    Make sure bubble position padding works for multimonitor

 src/daemon/stack.c |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/src/daemon/stack.c b/src/daemon/stack.c
index a7f75b6..edf18ca 100644
--- a/src/daemon/stack.c
+++ b/src/daemon/stack.c
@@ -64,14 +64,10 @@ get_work_area (GtkWidget    *nw,
         disp_screen = GDK_SCREEN_XNUMBER (screen);
 
         /* Defaults in case of error */
-        rect->x = WORKAREA_PADDING;
-        rect->y = WORKAREA_PADDING;
-        rect->width = gdk_screen_get_width (screen) - WORKAREA_PADDING * 2;
-        rect->height = gdk_screen_get_height (screen) - WORKAREA_PADDING * 2;
-        if (rect->width < 0)
-                rect->width = 0;
-        if (rect->height < 0)
-                rect->height = 0;
+        rect->x = 0;
+        rect->y = 0;
+        rect->width = gdk_screen_get_width (screen);
+        rect->height = gdk_screen_get_height (screen);
 
         if (workarea == None)
                 return FALSE;
@@ -99,14 +95,10 @@ get_work_area (GtkWidget    *nw,
         }
 
         workareas = (long *) ret_workarea;
-        rect->x = workareas[disp_screen * 4] + WORKAREA_PADDING;
-        rect->y = workareas[disp_screen * 4 + 1] + WORKAREA_PADDING;
-        rect->width = workareas[disp_screen * 4 + 2] - WORKAREA_PADDING * 2;
-        rect->height = workareas[disp_screen * 4 + 3] - WORKAREA_PADDING * 2;
-        if (rect->width < 0)
-                rect->width = 0;
-        if (rect->height < 0)
-                rect->height = 0;
+        rect->x = workareas[disp_screen * 4];
+        rect->y = workareas[disp_screen * 4 + 1];
+        rect->width = workareas[disp_screen * 4 + 2];
+        rect->height = workareas[disp_screen * 4 + 3];
 
         XFree (ret_workarea);
 
@@ -190,7 +182,7 @@ translate_coordinates (NotifyStackLocation stack_location,
         }
 }
 
-NotifyStack    *
+NotifyStack *
 notify_stack_new (NotifyDaemon       *daemon,
                   GdkScreen          *screen,
                   guint               monitor,
@@ -229,6 +221,20 @@ notify_stack_set_location (NotifyStack        *stack,
 }
 
 static void
+add_padding_to_rect (GdkRectangle *rect)
+{
+        rect->x += WORKAREA_PADDING;
+        rect->y += WORKAREA_PADDING;
+        rect->width -= WORKAREA_PADDING * 2;
+        rect->height -= WORKAREA_PADDING * 2;
+
+        if (rect->width < 0)
+                rect->width = 0;
+        if (rect->height < 0)
+                rect->height = 0;
+}
+
+static void
 notify_stack_shift_notifications (NotifyStack *stack,
                                   GtkWindow   *nw,
                                   GSList     **nw_l,
@@ -251,6 +257,8 @@ notify_stack_shift_notifications (NotifyStack *stack,
                                          &monitor);
         gdk_rectangle_intersect (&monitor, &workarea, &workarea);
 
+        add_padding_to_rect (&workarea);
+
         get_origin_coordinates (stack->location,
                                 &workarea,
                                 &x, &y,