2006-07-27 Brian Cameron <
[email protected]>
* gnome-applets.spec,
patches/gnome-applets-04-prefer-sdtaudiocontrol.diff: No
longer prefer sdtaudiocontrol as the mixer program since
now gnome-volume-control is in better shape. Other patches
renumbered.
--- a/gnome-applets.spec Fri Jul 28 00:46:13 2006 +0000
+++ b/gnome-applets.spec Fri Jul 28 00:49:06 2006 +0000
@@ -17,9 +17,8 @@
Patch1: gnome-applets-01-disable-drivemount.diff
Patch2: gnome-applets-02-mini-commander-tooltip.diff
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
+Patch4: gnome-applets-04-disable-keyboard-layout.diff
+Patch5: gnome-applets-05-hidden.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/gnome-applets
@@ -55,7 +54,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%build
libtoolize --force
@@ -117,6 +115,10 @@
%{_datadir}/pixmaps/*
%changelog
+* Thu Jul 27 2006 - [email protected]
+- Remove patch patches/gnome-applets-04-prefer-sdtaudiocontrol.diff since
+ now gnome-volume-control is in better shape.
+
* Thu Jul 27 2006 - [email protected]
- Add patch, 06-hidden, for G_GNUC_INTERNAL changes.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-04-disable-keyboard-layout.diff Fri Jul 28 00:49:06 2006 +0000
@@ -0,0 +1,160 @@
+diff -urN gnome-applets-2.15.1.1/Makefile.am gnome-applets-2.15.1.1-new/Makefile.am
+--- gnome-applets-2.15.1.1/Makefile.am Sat Jun 17 11:36:47 2006
++++ gnome-applets-2.15.1.1-new/Makefile.am Fri Jul 21 10:44:50 2006
+@@ -34,10 +34,6 @@
+ accessx_status_SUBDIR = accessx-status
+ endif
+
+-if BUILD_GSWITCHIT
+-gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit
+-endif
+-
+ if BUILD_CPUFREQ_APPLET
+ cpufreq_SUBDIR = cpufreq
+ endif
+@@ -50,7 +46,6 @@
+ charpick \
+ geyes \
+ mini-commander \
+- gkb-new \
+ stickynotes \
+ null_applet
+
+@@ -63,7 +58,6 @@
+ $(vfs_SUBDIRS) \
+ $(battstat_SUBDIR) \
+ $(accessx_status_SUBDIR)\
+- $(gswitchit_SUBDIRS) \
+ $(invest_applet_SUBDIR) \
+ $(cpufreq_SUBDIR)
+
+@@ -75,7 +69,6 @@
+ charpick \
+ geyes \
+ mini-commander \
+- gkb-new \
+ battstat \
+ multiload \
+ libgweather \
+@@ -84,8 +77,6 @@
+ accessx-status \
+ stickynotes \
+ libkbdraw \
+- libgswitchit \
+- gswitchit \
+ trashapplet \
+ cpufreq \
+ invest-applet \
+diff -urN gnome-applets-2.15.1.1/configure.in gnome-applets-2.15.1.1-new/configure.in
+--- gnome-applets-2.15.1.1/configure.in Sun Jun 18 03:27:20 2006
++++ gnome-applets-2.15.1.1-new/configure.in Fri Jul 21 10:50:02 2006
+@@ -312,37 +312,6 @@
+ , enable_flags=no)
+ AM_CONDITIONAL(ENABLE_FLAGS, test x$enable_flags != xno)
+
+-dnl -- make sure the cvs virtual includes have been checked out ---------------
+-AC_MSG_CHECKING([for inclusion of libgswitchit])
+-if test ! -d "$srcdir/libgswitchit"; then
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([Your checkout of gnome-applets is out of date.
+- The 'libgswitchit' module has been virtually included into
+- gnome-applets by CVS as a subdirectory. Please check
+- out again (this can be done on top of your existing checkout])
+-else
+- AC_MSG_RESULT(yes)
+-fi
+-
+-AC_MSG_CHECKING([for inclusion of libkbdraw])
+-if test ! -d "$srcdir/libkbdraw"; then
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([Your checkout of gnome-applets is out of date.
+- The 'libkbdraw' module has been virtually included into
+- gnome-applets by CVS as a subdirectory. Please check
+- out again (this can be done on top of your existing checkout])
+-else
+- AC_MSG_RESULT(yes)
+-fi
+-
+-AM_CONDITIONAL(INCLUDE_GSWITCHIT_DEVEL, true) dnl pull devel from applet
+-
+-case "$host" in
+- sparc-*-solaris*) gkb_type_sun=true;;
+- *) gkb_type_sun=false;;
+-esac
+-AM_CONDITIONAL(GKB_SUN, $gkb_type_sun)
+-
+ dnl ***************************************************************************
+ dnl *** battstat specific checks ***
+ dnl ***************************************************************************
+@@ -683,9 +652,6 @@
+ modemlights/Makefile
+ multiload/Makefile
+ multiload/docs/Makefile
+-gkb-new/Makefile
+-gkb-new/xmodmap/Makefile
+-gkb-new/xmodmap.sun/Makefile
+ charpick/Makefile
+ charpick/help/Makefile
+ invest-applet/Makefile
+@@ -708,11 +674,6 @@
+ stickynotes/Makefile
+ stickynotes/pixmaps/Makefile
+ stickynotes/docs/Makefile
+-libkbdraw/Makefile
+-libgswitchit/Makefile
+-libgswitchit/gswitchit.pc
+-gswitchit/Makefile
+-gswitchit/help/Makefile
+ trashapplet/Makefile
+ trashapplet/src/Makefile
+ trashapplet/docs/Makefile
+@@ -744,7 +705,6 @@
+ - enabling suid bit $suid
+ - drivemount $build_gnome_vfs_applets
+ - geyes always
+- - gswitchit $HAVE_LIBXKLAVIER
+ - gweather $build_gnome_vfs_applets
+ - invest-applet $BUILD_INVEST_APPLET
+ - mini-commander $enable_mini_commander
+diff -urN gnome-applets-2.14.1/null_applet/GNOME_KeyboardApplet.server.in gnome-applets-2.14.1-hacked/null_applet/GNOME_KeyboardApplet.server.in
+--- gnome-applets-2.14.1/null_applet/GNOME_KeyboardApplet.server.in 1970-01-01 12:00:00.000000000 +1200
++++ gnome-applets-2.14.1-hacked/null_applet/GNOME_KeyboardApplet.server.in 2006-07-15 08:23:15.254952000 +1200
+@@ -0,0 +1,20 @@
++<oaf_info>
++
++<oaf_server iid="OAFIID:GNOME_KeyboardApplet"
++ type="factory"
++ location="OAFIID:GNOME_NullApplet_Factory">
++
++ <oaf_attribute name="repo_ids" type="stringv">
++ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
++ <item value="IDL:Bonobo/Control:1.0"/>
++ <item value="IDL:Bonobo/Unknown:1.0"/>
++ </oaf_attribute>
++ <oaf_attribute name="name" type="string" _value=""Keyboard Indicator (Deprecated)"/>
++ <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
++ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++ <oaf_attribute name="bugzilla:component" type="string" value="gswitchit"/>
++
++</oaf_server>
++
++</oaf_info>
+diff -urN gnome-applets-2.14.1/null_applet/Makefile.am gnome-applets-2.14.1-hacked/null_applet/Makefile.am
+--- gnome-applets-2.14.1/null_applet/Makefile.am 2005-01-07 13:15:26.000000000 +1300
++++ gnome-applets-2.14.1-hacked/null_applet/Makefile.am 2006-07-15 08:23:35.498817000 +1200
+@@ -13,6 +13,7 @@
+ server_in_files = \
+ GNOME_NullApplet_Factory.server.in \
+ GNOME_CDPlayerApplet.server.in \
++ GNOME_KeyboardApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in
+ server_DATA = $(server_in_files:.server.in=.server)
+@@ -27,5 +28,6 @@
+ EXTRA_DIST = \
+ GNOME_NullApplet_Factory.server.in.in \
+ GNOME_CDPlayerApplet.server.in \
++ GNOME_KeyboardApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in
--- a/patches/gnome-applets-04-prefer-sdtaudiocontrol.diff Fri Jul 28 00:46:13 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-diff -urN --ignore-space-change -Xdiff-excludes.txt -b gnome-applets-2.14.1-orig/configure.in gnome-applets-2.14.1/configure.in
---- gnome-applets-2.14.1-orig/configure.in 2006-05-04 13:31:35.856808000 +0100
-+++ gnome-applets-2.14.1/configure.in 2006-05-16 17:06:45.674966000 +0100
-@@ -385,6 +385,20 @@
- AC_SUBST(LIBWNCK_CFLAGS)
- AC_SUBST(LIBWNCK_LIBS)
-
-+AC_MSG_CHECKING([if building on Solaris])
-+case "$host" in
-+ *solaris*)
-+ AC_DEFINE(PREFER_SDTAUDIOCONTROL,1,
-+ Define if building on Solaris)
-+ AC_MSG_RESULT(yes)
-+ ;;
-+ *)
-+ echo "${host}"
-+ AC_MSG_RESULT(no)
-+ ;;
-+
-+esac
-+
- dnl -- check for libnotify (optional) -----------------------------------------
- LIBNOTIFY_CFLAGS=
- LIBNOTIFY_LIBS=
-diff -urN --ignore-space-change -Xdiff-excludes.txt -b gnome-applets-2.14.1-orig/mixer/GNOME_MixerApplet.xml gnome-applets-2.14.1/mixer/GNOME_MixerApplet.xml
---- gnome-applets-2.14.1-orig/mixer/GNOME_MixerApplet.xml 2006-05-04 13:31:36.753104000 +0100
-+++ gnome-applets-2.14.1/mixer/GNOME_MixerApplet.xml 2006-05-16 18:40:29.455749000 +0100
-@@ -2,7 +2,7 @@
- <popups>
- <popup name="button3">
- <menuitem name="Mute" verb="Mute" _label="Mu_te" type="toggle" accel="*Control*t"/>
-- <menuitem name="RunMixer" verb="RunMixer" _label="_Open Volume Control" accel="*Control*o"/>
-+ <menuitem name="RunMixer" verb="RunMixer" _label="_Open Audio Control" accel="*Control*o"/>
- <separator/>
- <menuitem name="Pref" verb="Pref" _label="_Preferences" pixtype="stock" pixname="gtk-properties"/>
- <menuitem name="Help" verb="Help" _label="_Help" pixtype="stock" pixname="gtk-help"/>
-diff -urN --ignore-space-change -Xdiff-excludes.txt -b gnome-applets-2.14.1-orig/mixer/applet.c gnome-applets-2.14.1/mixer/applet.c
---- gnome-applets-2.14.1-orig/mixer/applet.c 2006-05-04 13:31:36.735468000 +0100
-+++ gnome-applets-2.14.1/mixer/applet.c 2006-05-16 14:44:29.776939000 +0100
-@@ -687,8 +687,20 @@
- GnomeDesktopItem *ditem;
- GError *error = NULL;
-
-+#ifdef PREFER_SDTAUDIOCONTROL
-+ GError *sdterror = NULL;
-+
-+ /* Try sdtaudiocontrol first, failing over to gnome-volume-control */
-+ gdk_spawn_command_line_on_screen (
-+ gtk_widget_get_screen (GTK_WIDGET (applet)),
-+ "sdtaudiocontrol", &sdterror);
-+
-+ if (sdterror) {
-+#endif
-+
- if ((ditem = gnome_desktop_item_new_from_basename ("gnome-volume-control.desktop", 0, NULL))) {
-- gnome_desktop_item_set_launch_time (ditem, gtk_get_current_event_time ());
-+ gnome_desktop_item_set_launch_time (ditem,
-+ gtk_get_current_event_time ());
- gnome_desktop_item_launch_on_screen (ditem, NULL,
- GNOME_DESKTOP_ITEM_LAUNCH_ONLY_ONE,
- gtk_widget_get_screen (GTK_WIDGET (applet)),
-@@ -701,6 +713,11 @@
- "gnome-volume-control", &error);
- }
-
-+#ifdef PREFER_SDTAUDIOCONTROL
-+ g_error_free (sdterror);
-+ }
-+#endif
-+
- if (error) {
- GtkWidget *dialog;
-
-@@ -713,6 +730,7 @@
- gtk_widget_show (dialog);
- g_error_free (error);
- }
-+
- }
-
- /*
--- a/patches/gnome-applets-05-disable-keyboard-layout.diff Fri Jul 28 00:46:13 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-diff -urN gnome-applets-2.15.1.1/Makefile.am gnome-applets-2.15.1.1-new/Makefile.am
---- gnome-applets-2.15.1.1/Makefile.am Sat Jun 17 11:36:47 2006
-+++ gnome-applets-2.15.1.1-new/Makefile.am Fri Jul 21 10:44:50 2006
-@@ -34,10 +34,6 @@
- accessx_status_SUBDIR = accessx-status
- endif
-
--if BUILD_GSWITCHIT
--gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit
--endif
--
- if BUILD_CPUFREQ_APPLET
- cpufreq_SUBDIR = cpufreq
- endif
-@@ -50,7 +46,6 @@
- charpick \
- geyes \
- mini-commander \
-- gkb-new \
- stickynotes \
- null_applet
-
-@@ -63,7 +58,6 @@
- $(vfs_SUBDIRS) \
- $(battstat_SUBDIR) \
- $(accessx_status_SUBDIR)\
-- $(gswitchit_SUBDIRS) \
- $(invest_applet_SUBDIR) \
- $(cpufreq_SUBDIR)
-
-@@ -75,7 +69,6 @@
- charpick \
- geyes \
- mini-commander \
-- gkb-new \
- battstat \
- multiload \
- libgweather \
-@@ -84,8 +77,6 @@
- accessx-status \
- stickynotes \
- libkbdraw \
-- libgswitchit \
-- gswitchit \
- trashapplet \
- cpufreq \
- invest-applet \
-diff -urN gnome-applets-2.15.1.1/configure.in gnome-applets-2.15.1.1-new/configure.in
---- gnome-applets-2.15.1.1/configure.in Sun Jun 18 03:27:20 2006
-+++ gnome-applets-2.15.1.1-new/configure.in Fri Jul 21 10:50:02 2006
-@@ -312,37 +312,6 @@
- , enable_flags=no)
- AM_CONDITIONAL(ENABLE_FLAGS, test x$enable_flags != xno)
-
--dnl -- make sure the cvs virtual includes have been checked out ---------------
--AC_MSG_CHECKING([for inclusion of libgswitchit])
--if test ! -d "$srcdir/libgswitchit"; then
-- AC_MSG_RESULT(no)
-- AC_MSG_ERROR([Your checkout of gnome-applets is out of date.
-- The 'libgswitchit' module has been virtually included into
-- gnome-applets by CVS as a subdirectory. Please check
-- out again (this can be done on top of your existing checkout])
--else
-- AC_MSG_RESULT(yes)
--fi
--
--AC_MSG_CHECKING([for inclusion of libkbdraw])
--if test ! -d "$srcdir/libkbdraw"; then
-- AC_MSG_RESULT(no)
-- AC_MSG_ERROR([Your checkout of gnome-applets is out of date.
-- The 'libkbdraw' module has been virtually included into
-- gnome-applets by CVS as a subdirectory. Please check
-- out again (this can be done on top of your existing checkout])
--else
-- AC_MSG_RESULT(yes)
--fi
--
--AM_CONDITIONAL(INCLUDE_GSWITCHIT_DEVEL, true) dnl pull devel from applet
--
--case "$host" in
-- sparc-*-solaris*) gkb_type_sun=true;;
-- *) gkb_type_sun=false;;
--esac
--AM_CONDITIONAL(GKB_SUN, $gkb_type_sun)
--
- dnl ***************************************************************************
- dnl *** battstat specific checks ***
- dnl ***************************************************************************
-@@ -683,9 +652,6 @@
- modemlights/Makefile
- multiload/Makefile
- multiload/docs/Makefile
--gkb-new/Makefile
--gkb-new/xmodmap/Makefile
--gkb-new/xmodmap.sun/Makefile
- charpick/Makefile
- charpick/help/Makefile
- invest-applet/Makefile
-@@ -708,11 +674,6 @@
- stickynotes/Makefile
- stickynotes/pixmaps/Makefile
- stickynotes/docs/Makefile
--libkbdraw/Makefile
--libgswitchit/Makefile
--libgswitchit/gswitchit.pc
--gswitchit/Makefile
--gswitchit/help/Makefile
- trashapplet/Makefile
- trashapplet/src/Makefile
- trashapplet/docs/Makefile
-@@ -744,7 +705,6 @@
- - enabling suid bit $suid
- - drivemount $build_gnome_vfs_applets
- - geyes always
-- - gswitchit $HAVE_LIBXKLAVIER
- - gweather $build_gnome_vfs_applets
- - invest-applet $BUILD_INVEST_APPLET
- - mini-commander $enable_mini_commander
-diff -urN gnome-applets-2.14.1/null_applet/GNOME_KeyboardApplet.server.in gnome-applets-2.14.1-hacked/null_applet/GNOME_KeyboardApplet.server.in
---- gnome-applets-2.14.1/null_applet/GNOME_KeyboardApplet.server.in 1970-01-01 12:00:00.000000000 +1200
-+++ gnome-applets-2.14.1-hacked/null_applet/GNOME_KeyboardApplet.server.in 2006-07-15 08:23:15.254952000 +1200
-@@ -0,0 +1,20 @@
-+<oaf_info>
-+
-+<oaf_server iid="OAFIID:GNOME_KeyboardApplet"
-+ type="factory"
-+ location="OAFIID:GNOME_NullApplet_Factory">
-+
-+ <oaf_attribute name="repo_ids" type="stringv">
-+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-+ <item value="IDL:Bonobo/Control:1.0"/>
-+ <item value="IDL:Bonobo/Unknown:1.0"/>
-+ </oaf_attribute>
-+ <oaf_attribute name="name" type="string" _value=""Keyboard Indicator (Deprecated)"/>
-+ <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
-+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+ <oaf_attribute name="bugzilla:component" type="string" value="gswitchit"/>
-+
-+</oaf_server>
-+
-+</oaf_info>
-diff -urN gnome-applets-2.14.1/null_applet/Makefile.am gnome-applets-2.14.1-hacked/null_applet/Makefile.am
---- gnome-applets-2.14.1/null_applet/Makefile.am 2005-01-07 13:15:26.000000000 +1300
-+++ gnome-applets-2.14.1-hacked/null_applet/Makefile.am 2006-07-15 08:23:35.498817000 +1200
-@@ -13,6 +13,7 @@
- server_in_files = \
- GNOME_NullApplet_Factory.server.in \
- GNOME_CDPlayerApplet.server.in \
-+ GNOME_KeyboardApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
-@@ -27,5 +28,6 @@
- EXTRA_DIST = \
- GNOME_NullApplet_Factory.server.in.in \
- GNOME_CDPlayerApplet.server.in \
-+ GNOME_KeyboardApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-05-hidden.diff Fri Jul 28 00:49: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
--- a/patches/gnome-applets-06-hidden.diff Fri Jul 28 00:46:13 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
---- 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