--- a/ChangeLog	Thu Jul 27 19:37:44 2006 +0000
+++ b/ChangeLog	Thu Jul 27 19:53:06 2006 +0000
@@ -1,5 +1,7 @@
 2006-07-27  Damien Carbery <[email protected]>
 
+	* gnome-applets.spec: Add patch 06-hidden for G_GNUC_INTERNAL changes.
+	* patches/gnome-applets-06-hidden.diff: G_GNUC_INTERNAL fixes.
 	* patches/dasher-03-fixcompile.diff: Add new hunks to fix problems.
 	* pycairo.spec: Added, required by pygtk2.spec.
 	* pygobject.spec: Add patch 02-void-return.
@@ -25,7 +27,6 @@
 2006-07-27  Matt Keenan <[email protected]>
 
 	* gnome-keyring-manager.spec : Remove scrollkeeper files
-	* Solaris/SUNWgnome-keyring-manager.spec : NEW spec file for gnome-keyring-manager
 	* patches/gnome-keyring-manager-01-Wall-remove.diff : Remove -Wall.
 
 2006-07-27  Damien Carbery <[email protected]>

--- a/gnome-applets.spec	Thu Jul 27 19:37:44 2006 +0000
+++ b/gnome-applets.spec	Thu Jul 27 19:53:06 2006 +0000
@@ -19,6 +19,7 @@
 Patch3:       gnome-applets-03-non-utf8-date-title.diff
 Patch4:	      gnome-applets-04-prefer-sdtaudiocontrol.diff
 Patch5:	      gnome-applets-05-disable-keyboard-layout.diff
+Patch6:       gnome-applets-06-hidden.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/gnome-applets
@@ -54,6 +55,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 libtoolize --force
@@ -115,7 +117,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Web Jul 21 2006 - [email protected]
+* Thu Jul 27 2006 - [email protected]
+- Add patch, 06-hidden, for G_GNUC_INTERNAL changes.
+
+* Wed Jul 21 2006 - [email protected]
 - Bump to 2.15.1.1.
 
 * Sat Jul 15 2006 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-06-hidden.diff	Thu Jul 27 19:53:06 2006 +0000
@@ -0,0 +1,97 @@
+--- gnome-applets-2.15.1.1/multiload/global.h.orig	2006-07-27 20:43:20.673383000 +0100
++++ gnome-applets-2.15.1.1/multiload/global.h	2006-07-27 20:44:02.963479000 +0100
+@@ -77,18 +77,18 @@
+ #include "linux-proc.h"
+ 
+ /* show properties dialog */
+-void
++G_GNUC_INTERNAL void
+ multiload_properties_cb (BonoboUIComponent *uic,
+ 			 MultiloadApplet   *ma,	
+-			 const char        *name) G_GNUC_INTERNAL;
++			 const char        *name);
+ 
+ /* remove the old graphs and rebuild them */
+-void
+-multiload_applet_refresh(MultiloadApplet *ma) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void
++multiload_applet_refresh(MultiloadApplet *ma);
+ 
+ /* update the tooltip to the graph's current "used" percentage */
+-void
+-multiload_applet_tooltip_update(LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void
++multiload_applet_tooltip_update(LoadGraph *g);
+ 
+ G_END_DECLS
+ 
+--- gnome-applets-2.15.1.1/multiload/linux-proc.h.orig	2006-07-27 20:45:10.946569000 +0100
++++ gnome-applets-2.15.1.1/multiload/linux-proc.h	2006-07-27 20:45:51.247612000 +0100
+@@ -3,14 +3,14 @@
+ 
+ #include <load-graph.h>
+ 
+-void GetLoad (int Maximum, int data [5], LoadGraph *g) G_GNUC_INTERNAL;
+-void GetDiskLoad (int Maximum, int data [3], LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void GetLoad (int Maximum, int data [5], LoadGraph *g);
++G_GNUC_INTERNAL void GetDiskLoad (int Maximum, int data [3], LoadGraph *g);
+ #if 0
+-void GetPage (int Maximum, int data [3], LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void GetPage (int Maximum, int data [3], LoadGraph *g);
+ #endif /* 0 */
+-void GetMemory (int Maximum, int data [4], LoadGraph *g) G_GNUC_INTERNAL;
+-void GetSwap (int Maximum, int data [2], LoadGraph *g) G_GNUC_INTERNAL;
+-void GetLoadAvg (int Maximum, int data [2], LoadGraph *g) G_GNUC_INTERNAL;
+-void GetNet (int Maximum, int data [3], LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void GetMemory (int Maximum, int data [4], LoadGraph *g);
++G_GNUC_INTERNAL void GetSwap (int Maximum, int data [2], LoadGraph *g);
++G_GNUC_INTERNAL void GetLoadAvg (int Maximum, int data [2], LoadGraph *g);
++G_GNUC_INTERNAL void GetNet (int Maximum, int data [3], LoadGraph *g);
+ 
+ #endif
+--- gnome-applets-2.15.1.1/multiload/autoscaler.h.orig	2006-07-27 20:45:52.482804000 +0100
++++ gnome-applets-2.15.1.1/multiload/autoscaler.h	2006-07-27 20:46:04.554481000 +0100
+@@ -18,9 +18,9 @@
+ };
+ 
+ 
+-void autoscaler_init(AutoScaler *that, unsigned interval, unsigned floor) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void autoscaler_init(AutoScaler *that, unsigned interval, unsigned floor);
+ 
+-unsigned autoscaler_get_max(AutoScaler *that, unsigned current) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL unsigned autoscaler_get_max(AutoScaler *that, unsigned current);
+ 
+ 
+ #endif /* GNOME_APPLETS_MULTILOAD_AUTOSCALER_H */
+--- gnome-applets-2.15.1.1/multiload/load-graph.h.orig	2006-07-27 20:46:05.579779000 +0100
++++ gnome-applets-2.15.1.1/multiload/load-graph.h	2006-07-27 20:46:30.312401000 +0100
+@@ -4,21 +4,21 @@
+ #include "global.h"
+ 
+ /* Create new load graph. */
+-LoadGraph *
++G_GNUC_INTERNAL LoadGraph *
+ load_graph_new (MultiloadApplet *multiload, guint n, const gchar *label,
+ 		guint id, guint speed, guint size, gboolean visible, 
+-		const gchar *name, LoadGraphDataFunc get_data) G_GNUC_INTERNAL;
++		const gchar *name, LoadGraphDataFunc get_data);
+ 
+ /* Start load graph. */
+-void
+-load_graph_start (LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void
++load_graph_start (LoadGraph *g);
+ 
+ /* Stop load graph. */
+-void
+-load_graph_stop (LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void
++load_graph_stop (LoadGraph *g);
+ 
+ /* free load graph */
+-void
+-load_graph_unalloc (LoadGraph *g) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void
++load_graph_unalloc (LoadGraph *g);
+ 		      
+ #endif