--- a/ChangeLog	Thu Nov 13 14:44:14 2008 +0000
+++ b/ChangeLog	Thu Nov 13 17:21:23 2008 +0000
@@ -1,3 +1,16 @@
+2008-11-13  Darren Kenny  <[email protected]>
+
+	* base-specs/notification-daemon.spec,
+	  patches/notification-daemon-01-resize.diff:
+	  Add patch notification-daemon-01-resize.diff to fix bug#6752569
+	  where the standard theme is not resizig the summary area if the body
+	  changes.
+	* base-specs/nwam-manager.spec,
+	  patches/nwam-manager-02-new-aps.diff:
+	  Added patch nwam-manager-02-new-aps.diff to fix bug#6764186 where on
+	  some machines there are a lot of notifications of new wireless
+	  networks being found.
+
 2008-11-13  Halton Huo  <[email protected]>
 
 	* manpages/man1/vinagre.1: Updated after Vinagre's maintainer review

--- a/base-specs/notification-daemon.spec	Thu Nov 13 14:44:14 2008 +0000
+++ b/base-specs/notification-daemon.spec	Thu Nov 13 17:21:23 2008 +0000
@@ -19,6 +19,8 @@
 URL:          http://www.galago-project.org/news/index.php
 Distribution: java-desktop-system
 Source:       http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-%{version}.tar.bz2
+# date:2008-11-13 owner:dkenny type:bug bugster:6752569 
+Patch1:       notification-daemon-01-resize.diff
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -43,6 +45,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %ifos linux
@@ -93,6 +96,9 @@
 
 
 %changelog
+* Wed Nov 12 2008 - [email protected]
+- Add patch notification-daemon-01-resize.diff to fix bug#6752569 where the
+  standard theme is not resizig the summary area if the body changes.
 * Mon Jun 16 2008 - [email protected]
 - Remove 01-no-libsexy to bring the libsexy dependency back.
 

--- a/base-specs/nwam-manager.spec	Thu Nov 13 14:44:14 2008 +0000
+++ b/base-specs/nwam-manager.spec	Thu Nov 13 17:21:23 2008 +0000
@@ -18,6 +18,8 @@
 #Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 # date:2008-11-10 owner:dkenny type:bug bugzilla:4677
 Patch1:       nwam-manager-01-wpa.diff
+# date:2008-11-13 owner:dkenny type:bug bugster:6764186
+Patch2:       nwam-manager-02-new-aps.diff
 URL:          http://www.opensolaris.org/os/project/nwam
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -49,6 +51,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifos linux
@@ -106,6 +109,10 @@
 %{_includedir}/nwam/*
 
 %changelog
+* Thu Nov 13 2008 - [email protected]
+- Added patch nwam-manager-02-new-aps.diff to fix bug#6764186 where on some
+  machines there are a lot of notifications of new wireless networks being
+  found.
 * Mon Nov 10 2008 - [email protected]
 - Added patch to fix bug#4677 where WPA passwords are not being passed to NWAM
   when requested.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/notification-daemon-01-resize.diff	Thu Nov 13 17:21:23 2008 +0000
@@ -0,0 +1,20 @@
+diff -up notification-daemon-0.3.7/src/themes/standard/theme.c.orig notification-daemon-0.3.7/src/themes/standard/theme.c
+--- notification-daemon-0.3.7/src/themes/standard/theme.c.orig	2007-01-26 04:20:15.000000000 +0000
++++ notification-daemon-0.3.7/src/themes/standard/theme.c	2008-11-12 13:58:39.774757522 +0000
+@@ -883,11 +883,10 @@ set_notification_text(GtkWindow *nw, con
+ 
+ 	update_content_hbox_visibility(windata);
+ 
+-	gtk_widget_set_size_request(
+-		((body != NULL && *body == '\0')
+-		 ? windata->body_label : windata->summary_label),
+-		WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10,
+-		-1);
++	if (body != NULL && *body == '\0')
++		gtk_widget_set_size_request( windata->body_label, WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10, -1);
++
++	gtk_widget_set_size_request( windata->summary_label, WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 50, -1);
+ }
+ 
+ void
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nwam-manager-02-new-aps.diff	Thu Nov 13 17:21:23 2008 +0000
@@ -0,0 +1,34 @@
+--- nwam-manager-0.5.11/daemon/main.c	(revision 194)
++++ nwam-manager-0.5.11/daemon/main.c	(working copy)
+@@ -69,6 +69,11 @@
+ gboolean prof_ask_join_fav_network;
+ gboolean prof_ask_add_to_fav;
+ 
++/* Provide for ability to hide "noisy" wlan notifications after first is shown
++ * until user pops-up menu 
++ */
++gboolean show_wlan_changed_notifications = TRUE;
++
+ /* nwamui utilies */
+ extern void join_wireless(NwamuiWifiNet *wifi);
+ extern void change_ncu_priority();
+@@ -376,9 +381,10 @@
+                 show_message = ncu_is_higher_priority_than_active_ncu( ncu, NULL );
+             }
+ 
+-            if ( show_message ) {
++            if ( show_wlan_changed_notifications && show_message ) {
+                 nwam_notification_show_message (_("Automatic Network Configuration Daemon"), 
+                                                  (gchar *)data, NULL, NOTIFY_EXPIRES_DEFAULT);
++                show_wlan_changed_notifications = FALSE;
+             }
+         }
+         break;
+@@ -719,6 +725,7 @@
+     nwamui_daemon_wifi_start_scan(daemon);
+     g_object_unref(daemon);
+ 
++    show_wlan_changed_notifications = TRUE;
+     nwam_status_icon_show_menu((gint)user_data, 0, gtk_get_current_event_time());
+ }
+