1
=== modified file 'src/display.c'
2
--- src/display.c	2012-08-29 22:05:41 +0000
3
+++ src/display.c	2013-06-10 21:39:30 +0000
4
@@ -278,7 +278,8 @@
5
278
	return next_to_display;
278
	return next_to_display;
6
279
}
279
}
7
280
280
9
281
static void
281
/* Returns true if the next bubble is shown */
10
282
static gboolean
11
282
stack_layout (Stack* self)
283
stack_layout (Stack* self)
12
283
{
284
{
13
284
	Bubble*    bubble = NULL;
285
	Bubble*    bubble = NULL;
14
@@ -294,7 +295,7 @@
15
294
		/* this actually happens when we're called for a synchronous
295
		/* this actually happens when we're called for a synchronous
16
295
		   bubble or after a bubble timed out, but there where no other
296
		   bubble or after a bubble timed out, but there where no other
17
296
		   notifications waiting in the queue */
297
		   notifications waiting in the queue */
19
297
		return;
298
		return FALSE;
20
298
299
21
299
	if (dnd_dont_disturb_user ()
300
	if (dnd_dont_disturb_user ()
22
300
	    && (! bubble_is_urgent (bubble)))
301
	    && (! bubble_is_urgent (bubble)))
23
@@ -310,7 +311,7 @@
24
310
		/* loop, in case there are other bubbles to discard */
311
		/* loop, in case there are other bubbles to discard */
25
311
		stack_layout (self);
312
		stack_layout (self);
26
312
313
28
313
		return;
314
		return FALSE;
29
314
	}
315
	}
30
315
316
31
316
	bubble_set_timeout (bubble,
317
	bubble_set_timeout (bubble,
32
@@ -428,4 +429,6 @@
33
428
		bubble_fade_in (bubble, 100);
429
		bubble_fade_in (bubble, 100);
34
429
	else 
430
	else 
35
430
		bubble_fade_in (bubble, 200);
431
		bubble_fade_in (bubble, 200);
36
432
37
433
	return TRUE;
38
431
}
434
}
39
432
435
40
=== modified file 'src/stack.c'
41
--- src/stack.c	2012-08-29 22:05:41 +0000
42
+++ src/stack.c	2013-06-10 21:39:30 +0000
43
@@ -575,6 +575,7 @@
44
575
	GdkPixbuf* pixbuf     = NULL;
575
	GdkPixbuf* pixbuf     = NULL;
45
576
	gboolean   new_bubble = FALSE;
576
	gboolean   new_bubble = FALSE;
46
577
	gboolean   turn_into_dialog;
577
	gboolean   turn_into_dialog;
47
578
	guint      real_id;
48
578
579
49
579
	// check max. allowed limit queue-size
580
	// check max. allowed limit queue-size
50
580
	if (g_list_length (self->list) > MAX_STACK_SIZE)
581
	if (g_list_length (self->list) > MAX_STACK_SIZE)
51
@@ -660,6 +661,8 @@
52
660
		}
661
		}
53
661
	}
662
	}
54
662
663
55
664
	real_id = bubble_get_id (bubble);
56
665
57
663
	if (hints)
666
	if (hints)
58
664
	{
667
	{
59
665
		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-private-synchronous");
668
		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-private-synchronous");
60
@@ -769,11 +772,11 @@
61
769
772
62
770
		/* update the layout of the stack;
773
		/* update the layout of the stack;
63
771
		 * this will also open the new bubble */
774
		 * this will also open the new bubble */
65
772
		stack_layout (self);
775
		if (!stack_layout (self))
66
776
			bubble = NULL;
67
773
	}
777
	}
68
774
778
71
775
	if (bubble)
779
	dbus_g_method_return (context, real_id);
70
776
		dbus_g_method_return (context, bubble_get_id (bubble));
72
777
780
73
778
	// FIXME: this is a temporary work-around, I do not like at all, until
781
	// FIXME: this is a temporary work-around, I do not like at all, until
74
779
	// the heavy memory leakage of notify-osd is fully fixed...
782
	// the heavy memory leakage of notify-osd is fully fixed...
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-06-11
Mirco Müller (community)			Approve on 2013-06-11
Sebastien Bacher		2013-06-10	Pending
Review via email: mp+168550@code.launchpad.net