# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: james.westby@canonical.com-20080404121615-\
#   b01o6c72njzom1op
# target_branch: bzr+ssh://bazaar.launchpad.net/%7Eubuntu-\
#   desktop/notification-daemon/ubuntu/
# testament_sha1: 55d059e68fa31c7e0a2f26d5967d9b41796fa479
# timestamp: 2008-04-04 13:17:10 +0100
# base_revision_id: michael.vogt@ubuntu.com-20071219153306-\
#   i5tgoqzij22s8jwm
# 
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog	2007-12-19 15:33:06 +0000
+++ debian/changelog	2008-04-04 12:16:15 +0000
@@ -1,3 +1,14 @@
+notification-daemon (0.3.7-1ubuntu11) hardy; urgency=low
+
+  * 06_fix_default_theme_size.patch:
+    - Fix the display of certain long lines. (LP: #40379).
+      The patch is by BobMauchin, taken from
+      http://trac.galago-project.org/ticket/162
+  * 01_ubuntu_theme.patch
+    - Patch adapted and applied to the ubuntu theme as well.
+
+ -- James Westby <james.westby@canonical.com>  Fri, 04 Apr 2008 13:03:42 +0100
+
 notification-daemon (0.3.7-1ubuntu10) hardy; urgency=low
 
   [ Alex Jones ]

=== modified file 'debian/patches/01_ubuntu_theme.patch'
--- debian/patches/01_ubuntu_theme.patch	2007-12-19 15:33:06 +0000
+++ debian/patches/01_ubuntu_theme.patch	2008-04-04 12:16:15 +0000
@@ -544,7 +544,7 @@
 +
 +	update_content_hbox_visibility(windata);
 +
-+      gtk_widget_set_size_request(((body != NULL && *body == '\0') ? 
++      gtk_widget_set_size_request(((body != NULL && *body != '\0') ? 
 +                                 windata->body_label : windata->summary_label), 
 +				 WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10,
 +				 -1);

=== added file 'debian/patches/06_fix_default_theme_size.patch'
--- debian/patches/06_fix_default_theme_size.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06_fix_default_theme_size.patch	2008-04-04 12:16:15 +0000
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' notification-daemon-0.3.7/src/themes/standard/theme.c notification-daemon-0.3.7.new/src/themes/standard/theme.c
+--- notification-daemon-0.3.7/src/themes/standard/theme.c	2007-01-26 04:20:15.000000000 +0000
++++ notification-daemon-0.3.7.new/src/themes/standard/theme.c	2008-04-04 13:12:08.000000000 +0100
+@@ -884,7 +884,7 @@
+ 	update_content_hbox_visibility(windata);
+ 
+ 	gtk_widget_set_size_request(
+-		((body != NULL && *body == '\0')
++		((body != NULL && *body != '\0')
+ 		 ? windata->body_label : windata->summary_label),
+ 		WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10,
+ 		-1);

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbomSQAAA4vfgFIwef////f3
TpS////xYAcvr0mNAAtGUAKAACSUBMhqngjaDUwU9NTR6j9GkTR6jRp6npPU2p6YoHAMIwmmIYBA
MgBhGmTJhGAhocAwjCaYhgEAyAGEaZMmEYCGg0yUCT1M1NNBoGR6nqaHqbJBoAAAAAcAwjCaYhgE
AyAGEaZMmEYCGgkkEaAAQCaYhMjKeqeU0b1Mp4Seoeo00GmlmBJhvVXcIQ1jOD/G1dw3pMgUt37J
qc2OKnemI80nr2V9zNbjGLn027OWvRQBlO2Unyx7JoIUX5N2k1EyjF8ckoo7GcEmRfZEfNFg7U5z
M634rhJUMy05ehs/bLCWMPlwqwgXxfIJBNysYLyHowzfoyNdgR36HNqh6M9WCi/xqks8EbxVLmVz
EmOJ7TzDeOkxddR6TVHitSeiOA+OkDVeqrgfLkCqjIkwDgvYajkOlYhKLRP8JUajHqhyY8mfS0xJ
AYYsbba13gnDMlO4ZphiYtMbP9GzsKRs4y4CY604t9iuU3QvmTdPFGmLhUhICbDiqFYiibjrKRLw
h1TYr1amIMR/cbjvOCIjCNHFmg3MR0SpEyOzaeJMb9ZYUY7BO9qJrQbyQyRkZnM90wEUVAvYeBMX
A7Pskvkir3jUh5haHA+RmHBrUOZMw1WB7gnn+zID6eMDi69ZElOkKF4hSp1KKg3ERlIyG81M7cwU
QWZD8C9LmiywiQQr5DitgWIPIMFn6nldQKDJnDNJnjM4el9S6B28Er50oXVgoonLu6dr46rKVoFq
elzSniwinI8EPOJfARqMC03+/AmQ68MUYlgxIgk8gI8REktxsLx+dsPJgWbnAoZsgP1ROSKibOon
IlQ5LqNpiYiM0XzpjRG5EbkRhGYsMNhZgqXDnF5AOwhZZU+TXjRtS+o8FQSJweJVzD1wZKJZVYPT
yWAXmw2mh+xUlY2MHZlbkiu97zUlKaMEZzjjBMeITmBMUhmZGJyRPTlCNAKipi2GkBD7nGJaYk1x
UsUVo8xEDItKh5afHEaEtyGBOqKiQiFmstuLGIjidEw+/eVP6DIVZEp0IT92BiQK6rikqO4nOKLy
jQoSiUlBdMdRArJiY9p+hw8yy9qsGda5RdNsGCuh6EKQoNJPoL9B7mRWZdzG3WwS3GboZWpQUakj
CJWLCWzgrAV540I63eeEyDrBt2AGtMNT2H4yBmYZmPy6frd584PuQLhCceb30j5WnuC5qAkNAz6t
wH9dGj8uVZeMBFuXSW/RGhF91NiTDguodcMOp8fZPJkvmhl1oi/g6u8pAbUoDSFB3mzYTms1lHgX
SzQWo+8CJqKRVGIfMF9j+m4P/H2BTQlcPCxUAvoQLTawRxEfjEZQTw9BgHSF6GtGJ/P7hH5G0hJC
Uu2t5Qm8bXdmQpS2MC/C+qTOFUvBiMpXHjaeor+0xqPIRmC+gJhd5WY4mwnLRxgB3MUCt/JnlBPF
ZoCn03lPQcOGWsPE20mJ1pToxIoc42FqCItRImSr6GVyIvLigrnC85JYN3HE7EwetDxhgPFmIKsf
ke86x8WLxicyZxQUGDG8koCmJlXz9hOdmhsPZn/UkjIxR+ZcrAQ8XtH2UL9kyWtJinGPtwN4Zlhs
HAGYx2jfQxBYGBUXCKCxKW3gb7zaQNY81gxodAcTpayB2kg0nGEfoua5rojFyPFxhOxmd4yWAEU6
0eaI/3Oj4fHQFtAYC26R9Ri9gREJ/nildHxQ7dXiC1ihwQ+ctQdZ6x5qQwp+5FCCqBlrO06CqVRh
98zlKxGJkDhmSKxZi/xWRCA7gRy0E6GUmEnRdEcTA1jjeLvLCAJyLQgPPIuFBk40HQmPJlA/P1QR
Tcb2SFr5KhCgFIOTCTBnnYadoUV1SFREHztAcDggyX8kmQXg+LERMDKDHgM4emBdvsEPBcpB+ESg
J2UmSrQnLjvPM+4R+Jr8ErDau5EA5AHrEMbLGBkmYB8x0BRmqEMHJKxFotivUHrKgVN7xEC28Orq
4IrCAwdRvNcgpDmXGSTTE323lto0T0KUuCBkSojBYERY2BFHawhirryVjJ8j3JWeFlEQstNpBwRC
LDFjZDziQHAjcdEOpGbE3VDAwSSGAghxiEyGBhKIujUyOsiceMRyLAgfITEURXI2FCQPEpmyJXTC
l6IcLAvBgGDNiscKBSK0cWCqVRIcpMjHzHIT3tED5jIkfBGu1Hnaes3ORdyQv4O+tV6p2iPBGpxE
eCge558Ed5qSlJLBFozGrTAZ0OL4gnwCBGSDNFQij4//F3JFOFCQuiZJAA==