2004-01-07 Glynn Foster <[email protected]>
authorgman
Tue, 06 Jan 2004 23:25:20 +0000
changeset 1489 55c4cbe02c90
parent 1488 3e933bab2c35
child 1490 517c9b5bb30c
2004-01-07 Glynn Foster <[email protected]> * gnome-applets.spec: * patches/gnome-applets-02-battstat-suspend.diff: Upstream. * patches/gnome-applets-02-stickynotes-icon.diff: Renamed. * patches/gnome-applets-03-geyes-themes.diff: Renamed. * patches/gnome-applets-03-stickynotes-icon.diff: Removed. * patches/gnome-applets-04-geyes-themes.diff: Removed. * patches/gnome-applets-04-gkb-window-icon-current.diff: Renamed. * patches/gnome-applets-05-gkb-window-icon-current.diff: Removed. * patches/gnome-applets-05-mount-floppy-location.diff: Renamed. * patches/gnome-applets-06-add-l10n-docs.diff: Renamed. * patches/gnome-applets-06-mount-floppy-location.diff: REmoved. * patches/gnome-applets-07-mini-commander-filesel.diff: Upstream. * patches/gnome-applets-08-add-l10n-docs.diff: Removed. * patches/gnome-applets-09-battstat-yelp-crash.diff: Upstream. So not technically in our product yet, but we'll catch the changes with a newer 2.5.x - it's the only way I can keep a track of everything.
ChangeLog
gnome-applets.spec
patches/gnome-applets-02-battstat-suspend.diff
patches/gnome-applets-02-stickynotes-icon.diff
patches/gnome-applets-03-geyes-themes.diff
patches/gnome-applets-03-stickynotes-icon.diff
patches/gnome-applets-04-geyes-themes.diff
patches/gnome-applets-04-gkb-window-icon-current.diff
patches/gnome-applets-05-gkb-window-icon-current.diff
patches/gnome-applets-05-mount-floppy-location.diff
patches/gnome-applets-06-add-l10n-docs.diff
patches/gnome-applets-06-mount-floppy-location.diff
patches/gnome-applets-07-mini-commander-filesel.diff
patches/gnome-applets-08-add-l10n-docs.diff
patches/gnome-applets-09-battstat-yelp-crash.diff
--- a/ChangeLog	Tue Jan 06 22:48:00 2004 +0000
+++ b/ChangeLog	Tue Jan 06 23:25:20 2004 +0000
@@ -1,3 +1,22 @@
+2004-01-07  Glynn Foster  <[email protected]>
+
+	* gnome-applets.spec:
+	* patches/gnome-applets-02-battstat-suspend.diff: Upstream.
+	* patches/gnome-applets-02-stickynotes-icon.diff: Renamed.
+	* patches/gnome-applets-03-geyes-themes.diff: Renamed.
+	* patches/gnome-applets-03-stickynotes-icon.diff: Removed.
+	* patches/gnome-applets-04-geyes-themes.diff: Removed.
+	* patches/gnome-applets-04-gkb-window-icon-current.diff: Renamed.
+	* patches/gnome-applets-05-gkb-window-icon-current.diff: Removed.
+	* patches/gnome-applets-05-mount-floppy-location.diff: Renamed.
+	* patches/gnome-applets-06-add-l10n-docs.diff: Renamed.
+	* patches/gnome-applets-06-mount-floppy-location.diff: REmoved.
+	* patches/gnome-applets-07-mini-commander-filesel.diff: Upstream.
+	* patches/gnome-applets-08-add-l10n-docs.diff: Removed.
+	* patches/gnome-applets-09-battstat-yelp-crash.diff: Upstream.
+	So not technically in our product yet, but we'll catch the changes
+	with a newer 2.5.x - it's the only way I can keep a track of everything.
+
 2004-01-07  Glynn Foster  <[email protected]>
 
 	* epiphany.spec:Bump to newer tarball.
--- a/gnome-applets.spec	Tue Jan 06 22:48:00 2004 +0000
+++ b/gnome-applets.spec	Tue Jan 06 23:25:20 2004 +0000
@@ -11,14 +11,11 @@
 Source2:      gnome-mixer.png
 Source3:      gnome-applets_docs-0.1.tar.bz2
 Patch1:       gnome-applets-01-potfiles.diff
-Patch2:       gnome-applets-02-battstat-suspend.diff
-Patch3:       gnome-applets-03-stickynotes-icon.diff
-Patch4:       gnome-applets-04-geyes-themes.diff
-Patch5:       gnome-applets-05-gkb-window-icon-current.diff
-Patch6:       gnome-applets-06-mount-floppy-location.diff
-Patch7:       gnome-applets-07-mini-commander-filesel.diff
-Patch8:       gnome-applets-08-add-l10n-docs.diff
-Patch9:       gnome-applets-09-battstat-yelp-crash.diff
+Patch2:       gnome-applets-02-stickynotes-icon.diff
+Patch3:       gnome-applets-03-geyes-themes.diff
+Patch4:       gnome-applets-04-gkb-window-icon-current.diff
+Patch5:       gnome-applets-05-mount-floppy-location.diff
+Patch6:       gnome-applets-06-add-l10n-docs.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/gnome-applets
@@ -51,9 +48,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 tar jxvf %SOURCE1
 cp %SOURCE2 mixer/gnome-mixer-applet.png
 tar jxvf %SOURCE3
--- a/patches/gnome-applets-02-battstat-suspend.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
---- ../gnome-applets-2.4.1.old/battstat/battstat.schemas.in	2003-10-14 16:18:25.000000000 +0100
-+++ ./battstat/battstat.schemas.in	2003-10-14 16:18:55.000000000 +0100
-@@ -115,7 +115,7 @@
-         <key>/schemas/apps/battstat-applet/prefs/suspend_command</key>
-         <owner>battstat-applet</owner>
-         <type>string</type>
--        <default></default>
-+        <default>/usr/bin/apm -s</default>
-         <locale name="C">
- 	  <short>Suspend Command</short>
-           <long>Command to send to suspend the computer</long>
---- ../gnome-applets-2.4.1.old/battstat/battstat_applet.c	2003-10-14 16:18:25.000000000 +0100
-+++ ./battstat/battstat_applet.c	2003-10-14 16:21:10.000000000 +0100
-@@ -787,7 +787,10 @@
- 		      msg = g_strdup_printf(_("An error occured while launching the Suspend command: %s\nPlease try to correct this error"), err->message);
- 	      } else {
- 		      /* Probably because the shell_ret is != 0 */
--		      msg = g_strdup_printf(_("An error occured while launching the Suspend command, the command returned \"%d\"\nPlease try to correct this error"), shell_ret);
-+		      if (battstat->suspend_cmd)
-+		          msg = g_strdup_printf(_("The Suspend command '%s' was unsuccessful."), battstat->suspend_cmd);
-+		      else
-+		          msg = g_strdup_printf(_("The Suspend command was unsuccessful."));
- 	      }
- 	      battstat_error_dialog (PANEL_APPLET (battstat->applet), msg);
- 	      g_free(msg);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-02-stickynotes-icon.diff	Tue Jan 06 23:25:20 2004 +0000
@@ -0,0 +1,124 @@
+--- ../gnome-applets-2.4.1.old/stickynotes/Makefile.am	2003-10-14 15:48:25.000000000 +0100
++++ ./stickynotes/Makefile.am	2003-10-14 15:48:47.000000000 +0100
+@@ -11,6 +11,7 @@
+ 	$(GNOME_APPLETS_CFLAGS) \
+ 	$(LIBGLADE_CFLAGS) \
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
++	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
+ 	-DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" \
+ 	-DSTICKYNOTES_ICONDIR=\"$(icondir)\"
+ 
+--- ../gnome-applets-2.4.1.old/stickynotes/GNOME_StickyNotesApplet.server.in.in	2003-10-14 15:48:25.000000000 +0100
++++ ./stickynotes/GNOME_StickyNotesApplet.server.in.in	2003-10-14 15:49:35.000000000 +0100
+@@ -16,7 +16,7 @@
+ 	    <oaf_attribute name="name" type="string" _value="Sticky Notes"/>
+ 	    <oaf_attribute name="description" type="string" _value="Create, view, and manage sticky notes on the desktop"/>
+ 	    <oaf_attribute name="panel:category" type="string" _value="Accessories"/>
+-	    <oaf_attribute name="panel:icon" type="string" value="stickynotes/stickynotes.png"/>
++	    <oaf_attribute name="panel:icon" type="string" value="gnome-note.png"/>
+ 	</oaf_server>
+ </oaf_info>
+ 
+--- ../gnome-applets-2.4.1.old/stickynotes/stickynotes_applet.c	2003-10-14 15:48:25.000000000 +0100
++++ ./stickynotes/stickynotes_applet.c	2003-10-14 16:02:10.000000000 +0100
+@@ -50,7 +50,7 @@
+ {
+ 	if (!strcmp(iid, "OAFIID:GNOME_StickyNotesApplet")) {
+ 		if (!stickynotes)
+-			stickynotes_applet_init();
++			stickynotes_applet_init(panel_applet);
+ 			
+ 		panel_applet_set_flags (panel_applet, PANEL_APPLET_EXPAND_MINOR);
+ 
+@@ -70,15 +70,61 @@
+ PANEL_APPLET_BONOBO_FACTORY("OAFIID:GNOME_StickyNotesApplet_Factory", PANEL_TYPE_APPLET, "stickynotes_applet", VERSION,
+ 			    stickynotes_applet_factory, NULL);
+ 
++/* colorshift a pixbuf */
++static void
++stickynotes_make_prelight_icon (GdkPixbuf *dest, GdkPixbuf *src, int shift)
++{
++	gint i, j;
++	gint width, height, has_alpha, srcrowstride, destrowstride;
++	guchar *target_pixels;
++	guchar *original_pixels;
++	guchar *pixsrc;
++	guchar *pixdest;
++	int val;
++	guchar r,g,b;
++
++	has_alpha = gdk_pixbuf_get_has_alpha (src);
++	width = gdk_pixbuf_get_width (src);
++	height = gdk_pixbuf_get_height (src);
++	srcrowstride = gdk_pixbuf_get_rowstride (src);
++	destrowstride = gdk_pixbuf_get_rowstride (dest);
++	target_pixels = gdk_pixbuf_get_pixels (dest);
++	original_pixels = gdk_pixbuf_get_pixels (src);
++
++	for (i = 0; i < height; i++) {
++		pixdest = target_pixels + i*destrowstride;
++		pixsrc = original_pixels + i*srcrowstride;
++		for (j = 0; j < width; j++) {
++			r = *(pixsrc++);
++			g = *(pixsrc++);
++			b = *(pixsrc++);
++			val = r + shift;
++			*(pixdest++) = CLAMP(val, 0, 255);
++			val = g + shift;
++			*(pixdest++) = CLAMP(val, 0, 255);
++			val = b + shift;
++			*(pixdest++) = CLAMP(val, 0, 255);
++			if (has_alpha)
++				*(pixdest++) = *(pixsrc++);
++		}
++	}
++}
++
++
+ /* Create and initalize global sticky notes instance */
+-void stickynotes_applet_init()
++void stickynotes_applet_init(PanelApplet *panel_applet)
+ {
+ 	stickynotes = g_new(StickyNotes, 1);
+ 
+ 	stickynotes->notes = NULL;
+ 	stickynotes->applets = NULL;
+-	stickynotes->icon_normal = gdk_pixbuf_new_from_file(STICKYNOTES_ICONDIR "/stickynotes.png", NULL);
+-	stickynotes->icon_prelight = gdk_pixbuf_new_from_file(STICKYNOTES_ICONDIR "/stickynotes_prelight.png", NULL);
++	stickynotes->icon_normal = gdk_pixbuf_new_from_file(GNOMEICONDIR "/gnome-note.png", NULL);
++	stickynotes->icon_prelight = gdk_pixbuf_new(gdk_pixbuf_get_colorspace (stickynotes->icon_normal),
++						    gdk_pixbuf_get_has_alpha (stickynotes->icon_normal),
++						    gdk_pixbuf_get_bits_per_sample (stickynotes->icon_normal),
++						    gdk_pixbuf_get_width (stickynotes->icon_normal),
++						    gdk_pixbuf_get_height (stickynotes->icon_normal));
++	stickynotes_make_prelight_icon (stickynotes->icon_prelight, stickynotes->icon_normal, 30);
+ 	stickynotes->gconf = gconf_client_get_default();
+ 	stickynotes->tooltips = gtk_tooltips_new();
+ 
+@@ -86,7 +132,7 @@
+ 	stickynotes_applet_init_prefs();
+ 
+ 	/* Set default icon for all sticky note windows */
+-	gnome_window_icon_set_default_from_file(STICKYNOTES_ICONDIR "/stickynotes.png");
++	gnome_window_icon_set_default_from_file(GNOMEICONDIR "/gnome-note.png");
+ 
+ 	/* Watch GConf values */
+ 	gconf_client_add_dir(stickynotes->gconf, GCONF_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL);
+@@ -245,14 +291,14 @@
+ 
+ 	/* Choose appropriate icon and size it */
+ 	if (applet->prelighted)
+-	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_prelight, size, size, GDK_INTERP_BILINEAR);
++	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_prelight, size - 3, size - 3, GDK_INTERP_BILINEAR);
+ 	else
+-	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_normal, size, size, GDK_INTERP_BILINEAR);
++	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_normal, size - 3, size - 3, GDK_INTERP_BILINEAR);
+ 	
+ 	/* Shift the icon if pressed */
+ 	pixbuf2 = gdk_pixbuf_copy(pixbuf1);
+ 	if (applet->pressed)
+-		gdk_pixbuf_scale(pixbuf1, pixbuf2, 0, 0, size, size, 1, 1, 1, 1, GDK_INTERP_BILINEAR);
++		gdk_pixbuf_scale(pixbuf1, pixbuf2, 0, 0, size - 3, size - 3, 1, 1, 1, 1, GDK_INTERP_BILINEAR);
+ 
+ 	/* Apply the finished pixbuf to the applet image */
+ 	gtk_image_set_from_pixbuf(GTK_IMAGE(applet->w_image), pixbuf2);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-03-geyes-themes.diff	Tue Jan 06 23:25:20 2004 +0000
@@ -0,0 +1,60 @@
+--- ../gnome-applets-2.3.6.old/geyes/themes/Makefile.am	2003-08-11 16:43:38.000000000 +0100
++++ ./geyes/themes/Makefile.am	2003-08-11 16:43:56.000000000 +0100
+@@ -1,36 +1,20 @@
+-#SUBDIRS = Default Default-tiny Bizarre Bloodshot Horrid
+-
+-Defaultdir = $(datadir)/geyes/Default
+-Default_DATA =
+-
+-Default_tinydir = $(datadir)/geyes/Default-tiny
+-Default_tiny_DATA =
+-
+-Bizarredir = $(datadir)/geyes/Bizarre
+-Bizarre_DATA =
+-
+-Bloodshotdir = $(datadir)/geyes/Bloodshot
+-Bloodshot_DATA =
+-
+-Horriddir = $(datadir)/geyes/Horrid
+-Horrid_DATA =
+-
+-geyesdir = $(datadir)/geyes
+-geyes_DATA = \
+-	Default/config				\
+-	Default/Default-eye.png			\
+-	Default/Default-pupil.png		\
+-	Default-tiny/config			\
+-	Default-tiny/Default-tiny-eye.png	\
+-	Default-tiny/Default-tiny-pupil.png	\
+-	Bizarre/config				\
+-	Bizarre/Bizarre-eye.png			\
+-	Bizarre/Bizarre-pupil.png		\
+-	Bloodshot/config			\
+-	Bloodshot/Bloodshot-eye.png		\
+-	Bloodshot/Bloodshot-pupil.png		\
+-	Horrid/config				\
+-	Horrid/horrid_eye.png			\
+-	Horrid/horrid_pupil.png
+-
+-EXTRA_DIST = $(geyes_DATA)
+\ No newline at end of file
++THEMES=				\
++	Default			\
++	Default-tiny		\
++	Bizarre			\
++	Bloodshot		\
++	Horrid
++
++THEME_DIR=$(datadir)/geyes
++
++install-data-local:
++	$(mkinstalldirs) $(DESTDIR)$(THEME_DIR);						\
++	for THEME in $(THEMES); do								\
++		echo '-- Installing theme '$$THEME;						\
++		$(mkinstalldirs) $(DESTDIR)$(THEME_DIR)/$$THEME;				\
++		(installfiles=`find $(srcdir)/$$THEME -name "*.png" -o -name "config"`;		\
++		for i in $$installfiles; do							\
++			echo '-- Installing '$$i;						\
++			$(INSTALL_DATA) $$i $(DESTDIR)$(THEME_DIR)/$$THEME ;			\
++		done)										\
++	done											\
--- a/patches/gnome-applets-03-stickynotes-icon.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
---- ../gnome-applets-2.4.1.old/stickynotes/Makefile.am	2003-10-14 15:48:25.000000000 +0100
-+++ ./stickynotes/Makefile.am	2003-10-14 15:48:47.000000000 +0100
-@@ -11,6 +11,7 @@
- 	$(GNOME_APPLETS_CFLAGS) \
- 	$(LIBGLADE_CFLAGS) \
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
- 	-DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" \
- 	-DSTICKYNOTES_ICONDIR=\"$(icondir)\"
- 
---- ../gnome-applets-2.4.1.old/stickynotes/GNOME_StickyNotesApplet.server.in.in	2003-10-14 15:48:25.000000000 +0100
-+++ ./stickynotes/GNOME_StickyNotesApplet.server.in.in	2003-10-14 15:49:35.000000000 +0100
-@@ -16,7 +16,7 @@
- 	    <oaf_attribute name="name" type="string" _value="Sticky Notes"/>
- 	    <oaf_attribute name="description" type="string" _value="Create, view, and manage sticky notes on the desktop"/>
- 	    <oaf_attribute name="panel:category" type="string" _value="Accessories"/>
--	    <oaf_attribute name="panel:icon" type="string" value="stickynotes/stickynotes.png"/>
-+	    <oaf_attribute name="panel:icon" type="string" value="gnome-note.png"/>
- 	</oaf_server>
- </oaf_info>
- 
---- ../gnome-applets-2.4.1.old/stickynotes/stickynotes_applet.c	2003-10-14 15:48:25.000000000 +0100
-+++ ./stickynotes/stickynotes_applet.c	2003-10-14 16:02:10.000000000 +0100
-@@ -50,7 +50,7 @@
- {
- 	if (!strcmp(iid, "OAFIID:GNOME_StickyNotesApplet")) {
- 		if (!stickynotes)
--			stickynotes_applet_init();
-+			stickynotes_applet_init(panel_applet);
- 			
- 		panel_applet_set_flags (panel_applet, PANEL_APPLET_EXPAND_MINOR);
- 
-@@ -70,15 +70,61 @@
- PANEL_APPLET_BONOBO_FACTORY("OAFIID:GNOME_StickyNotesApplet_Factory", PANEL_TYPE_APPLET, "stickynotes_applet", VERSION,
- 			    stickynotes_applet_factory, NULL);
- 
-+/* colorshift a pixbuf */
-+static void
-+stickynotes_make_prelight_icon (GdkPixbuf *dest, GdkPixbuf *src, int shift)
-+{
-+	gint i, j;
-+	gint width, height, has_alpha, srcrowstride, destrowstride;
-+	guchar *target_pixels;
-+	guchar *original_pixels;
-+	guchar *pixsrc;
-+	guchar *pixdest;
-+	int val;
-+	guchar r,g,b;
-+
-+	has_alpha = gdk_pixbuf_get_has_alpha (src);
-+	width = gdk_pixbuf_get_width (src);
-+	height = gdk_pixbuf_get_height (src);
-+	srcrowstride = gdk_pixbuf_get_rowstride (src);
-+	destrowstride = gdk_pixbuf_get_rowstride (dest);
-+	target_pixels = gdk_pixbuf_get_pixels (dest);
-+	original_pixels = gdk_pixbuf_get_pixels (src);
-+
-+	for (i = 0; i < height; i++) {
-+		pixdest = target_pixels + i*destrowstride;
-+		pixsrc = original_pixels + i*srcrowstride;
-+		for (j = 0; j < width; j++) {
-+			r = *(pixsrc++);
-+			g = *(pixsrc++);
-+			b = *(pixsrc++);
-+			val = r + shift;
-+			*(pixdest++) = CLAMP(val, 0, 255);
-+			val = g + shift;
-+			*(pixdest++) = CLAMP(val, 0, 255);
-+			val = b + shift;
-+			*(pixdest++) = CLAMP(val, 0, 255);
-+			if (has_alpha)
-+				*(pixdest++) = *(pixsrc++);
-+		}
-+	}
-+}
-+
-+
- /* Create and initalize global sticky notes instance */
--void stickynotes_applet_init()
-+void stickynotes_applet_init(PanelApplet *panel_applet)
- {
- 	stickynotes = g_new(StickyNotes, 1);
- 
- 	stickynotes->notes = NULL;
- 	stickynotes->applets = NULL;
--	stickynotes->icon_normal = gdk_pixbuf_new_from_file(STICKYNOTES_ICONDIR "/stickynotes.png", NULL);
--	stickynotes->icon_prelight = gdk_pixbuf_new_from_file(STICKYNOTES_ICONDIR "/stickynotes_prelight.png", NULL);
-+	stickynotes->icon_normal = gdk_pixbuf_new_from_file(GNOMEICONDIR "/gnome-note.png", NULL);
-+	stickynotes->icon_prelight = gdk_pixbuf_new(gdk_pixbuf_get_colorspace (stickynotes->icon_normal),
-+						    gdk_pixbuf_get_has_alpha (stickynotes->icon_normal),
-+						    gdk_pixbuf_get_bits_per_sample (stickynotes->icon_normal),
-+						    gdk_pixbuf_get_width (stickynotes->icon_normal),
-+						    gdk_pixbuf_get_height (stickynotes->icon_normal));
-+	stickynotes_make_prelight_icon (stickynotes->icon_prelight, stickynotes->icon_normal, 30);
- 	stickynotes->gconf = gconf_client_get_default();
- 	stickynotes->tooltips = gtk_tooltips_new();
- 
-@@ -86,7 +132,7 @@
- 	stickynotes_applet_init_prefs();
- 
- 	/* Set default icon for all sticky note windows */
--	gnome_window_icon_set_default_from_file(STICKYNOTES_ICONDIR "/stickynotes.png");
-+	gnome_window_icon_set_default_from_file(GNOMEICONDIR "/gnome-note.png");
- 
- 	/* Watch GConf values */
- 	gconf_client_add_dir(stickynotes->gconf, GCONF_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL);
-@@ -245,14 +291,14 @@
- 
- 	/* Choose appropriate icon and size it */
- 	if (applet->prelighted)
--	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_prelight, size, size, GDK_INTERP_BILINEAR);
-+	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_prelight, size - 3, size - 3, GDK_INTERP_BILINEAR);
- 	else
--	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_normal, size, size, GDK_INTERP_BILINEAR);
-+	    	pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_normal, size - 3, size - 3, GDK_INTERP_BILINEAR);
- 	
- 	/* Shift the icon if pressed */
- 	pixbuf2 = gdk_pixbuf_copy(pixbuf1);
- 	if (applet->pressed)
--		gdk_pixbuf_scale(pixbuf1, pixbuf2, 0, 0, size, size, 1, 1, 1, 1, GDK_INTERP_BILINEAR);
-+		gdk_pixbuf_scale(pixbuf1, pixbuf2, 0, 0, size - 3, size - 3, 1, 1, 1, 1, GDK_INTERP_BILINEAR);
- 
- 	/* Apply the finished pixbuf to the applet image */
- 	gtk_image_set_from_pixbuf(GTK_IMAGE(applet->w_image), pixbuf2);
--- a/patches/gnome-applets-04-geyes-themes.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
---- ../gnome-applets-2.3.6.old/geyes/themes/Makefile.am	2003-08-11 16:43:38.000000000 +0100
-+++ ./geyes/themes/Makefile.am	2003-08-11 16:43:56.000000000 +0100
-@@ -1,36 +1,20 @@
--#SUBDIRS = Default Default-tiny Bizarre Bloodshot Horrid
--
--Defaultdir = $(datadir)/geyes/Default
--Default_DATA =
--
--Default_tinydir = $(datadir)/geyes/Default-tiny
--Default_tiny_DATA =
--
--Bizarredir = $(datadir)/geyes/Bizarre
--Bizarre_DATA =
--
--Bloodshotdir = $(datadir)/geyes/Bloodshot
--Bloodshot_DATA =
--
--Horriddir = $(datadir)/geyes/Horrid
--Horrid_DATA =
--
--geyesdir = $(datadir)/geyes
--geyes_DATA = \
--	Default/config				\
--	Default/Default-eye.png			\
--	Default/Default-pupil.png		\
--	Default-tiny/config			\
--	Default-tiny/Default-tiny-eye.png	\
--	Default-tiny/Default-tiny-pupil.png	\
--	Bizarre/config				\
--	Bizarre/Bizarre-eye.png			\
--	Bizarre/Bizarre-pupil.png		\
--	Bloodshot/config			\
--	Bloodshot/Bloodshot-eye.png		\
--	Bloodshot/Bloodshot-pupil.png		\
--	Horrid/config				\
--	Horrid/horrid_eye.png			\
--	Horrid/horrid_pupil.png
--
--EXTRA_DIST = $(geyes_DATA)
-\ No newline at end of file
-+THEMES=				\
-+	Default			\
-+	Default-tiny		\
-+	Bizarre			\
-+	Bloodshot		\
-+	Horrid
-+
-+THEME_DIR=$(datadir)/geyes
-+
-+install-data-local:
-+	$(mkinstalldirs) $(DESTDIR)$(THEME_DIR);						\
-+	for THEME in $(THEMES); do								\
-+		echo '-- Installing theme '$$THEME;						\
-+		$(mkinstalldirs) $(DESTDIR)$(THEME_DIR)/$$THEME;				\
-+		(installfiles=`find $(srcdir)/$$THEME -name "*.png" -o -name "config"`;		\
-+		for i in $$installfiles; do							\
-+			echo '-- Installing '$$i;						\
-+			$(INSTALL_DATA) $$i $(DESTDIR)$(THEME_DIR)/$$THEME ;			\
-+		done)										\
-+	done											\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-04-gkb-window-icon-current.diff	Tue Jan 06 23:25:20 2004 +0000
@@ -0,0 +1,62 @@
+--- ../gnome-applets-2.3.6.old/gkb-new/gkb.schemas.in	2003-08-11 15:39:58.000000000 +0100
++++ ./gkb-new/gkb.schemas.in	2003-08-11 15:48:38.000000000 +0100
+@@ -160,5 +160,15 @@
+                 <long>This should be like "gkb_xmmap us", "setxkbmap us" or "xmodmap something.xmm"</long>
+             </locale>
+         </schema>
++        <schema>
++            <key>/schemas/apps/gkb-applet/prefs/current</key>
++            <owner>gkb-applet</owner>
++            <type>int</type>
++            <default>0</default>
++            <locale name="C">
++                <short>The default keymap</short>
++                <long>The default keymap for the applet</long>
++            </locale>
++        </schema>
+     </schemalist>
+ </gconfschemafile>
+--- ../gnome-applets-2.3.6.old/gkb-new/prop.c	2003-08-11 15:39:58.000000000 +0100
++++ ./gkb-new/prop.c	2003-08-11 15:46:17.000000000 +0100
+@@ -403,8 +403,8 @@
+   /* Create property box */
+   pbi->box = pbi->gkb->propwindow =
+       gtk_dialog_new_with_buttons ( include_applet_options
+-				    ? _("Keyboard Layout Switcher Preferences")
+-				    : _("Keyboard Layout Selector"),
++				    ? _("Keyboard Layout")
++				    : _("Keyboard Layout"),
+ 				    NULL,
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+--- ../gnome-applets-2.3.6.old/gkb-new/gkb.c	2003-08-11 15:39:55.000000000 +0100
++++ ./gkb-new/gkb.c	2003-08-11 15:51:34.000000000 +0100
+@@ -195,6 +195,7 @@
+     if (gkb->update != NULL)
+       (gkb->update) (gkb, TRUE);
+     gkb_system_set_keymap (gkb);
++    gconf_applet_set_int ("current", gkb->cur);
+   }
+ 
+   /* When a size request is made, we need to redraw the pixbufs with the new
+@@ -459,13 +460,17 @@
+ 
+ 	gkb = g_new0 (GKB, 1);
+ 	gkb->n = 0;
+-	  gkb->cur = 0;
++	gkb->cur = gconf_applet_get_int ("current");
+ 
+ 	do_at_first_run ();
+ 	load_properties (gkb);
+-	gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gkb.png");
++	gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-keyboard-layout.png");
+ 
+-	gkb->keymap = g_list_nth_data (gkb->maps, 0);
++	gkb->keymap = g_list_nth_data (gkb->maps, gkb->cur);
++	if (!gkb->keymap) {
++		gkb->keymap = g_list_nth_data(gkb->maps, 0);
++		gkb->cur = 0;
++	}
+ 
+ 	gconf_client_notify_add (gconf_client_get_default (),
+ 		GKB_GCONF_ROOT, config_notify, gkb, NULL, NULL);
--- a/patches/gnome-applets-05-gkb-window-icon-current.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
---- ../gnome-applets-2.3.6.old/gkb-new/gkb.schemas.in	2003-08-11 15:39:58.000000000 +0100
-+++ ./gkb-new/gkb.schemas.in	2003-08-11 15:48:38.000000000 +0100
-@@ -160,5 +160,15 @@
-                 <long>This should be like "gkb_xmmap us", "setxkbmap us" or "xmodmap something.xmm"</long>
-             </locale>
-         </schema>
-+        <schema>
-+            <key>/schemas/apps/gkb-applet/prefs/current</key>
-+            <owner>gkb-applet</owner>
-+            <type>int</type>
-+            <default>0</default>
-+            <locale name="C">
-+                <short>The default keymap</short>
-+                <long>The default keymap for the applet</long>
-+            </locale>
-+        </schema>
-     </schemalist>
- </gconfschemafile>
---- ../gnome-applets-2.3.6.old/gkb-new/prop.c	2003-08-11 15:39:58.000000000 +0100
-+++ ./gkb-new/prop.c	2003-08-11 15:46:17.000000000 +0100
-@@ -403,8 +403,8 @@
-   /* Create property box */
-   pbi->box = pbi->gkb->propwindow =
-       gtk_dialog_new_with_buttons ( include_applet_options
--				    ? _("Keyboard Layout Switcher Preferences")
--				    : _("Keyboard Layout Selector"),
-+				    ? _("Keyboard Layout")
-+				    : _("Keyboard Layout"),
- 				    NULL,
-                                             GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             GTK_STOCK_HELP, GTK_RESPONSE_HELP,
---- ../gnome-applets-2.3.6.old/gkb-new/gkb.c	2003-08-11 15:39:55.000000000 +0100
-+++ ./gkb-new/gkb.c	2003-08-11 15:51:34.000000000 +0100
-@@ -195,6 +195,7 @@
-     if (gkb->update != NULL)
-       (gkb->update) (gkb, TRUE);
-     gkb_system_set_keymap (gkb);
-+    gconf_applet_set_int ("current", gkb->cur);
-   }
- 
-   /* When a size request is made, we need to redraw the pixbufs with the new
-@@ -459,13 +460,17 @@
- 
- 	gkb = g_new0 (GKB, 1);
- 	gkb->n = 0;
--	  gkb->cur = 0;
-+	gkb->cur = gconf_applet_get_int ("current");
- 
- 	do_at_first_run ();
- 	load_properties (gkb);
--	gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gkb.png");
-+	gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-keyboard-layout.png");
- 
--	gkb->keymap = g_list_nth_data (gkb->maps, 0);
-+	gkb->keymap = g_list_nth_data (gkb->maps, gkb->cur);
-+	if (!gkb->keymap) {
-+		gkb->keymap = g_list_nth_data(gkb->maps, 0);
-+		gkb->cur = 0;
-+	}
- 
- 	gconf_client_notify_add (gconf_client_get_default (),
- 		GKB_GCONF_ROOT, config_notify, gkb, NULL, NULL);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-05-mount-floppy-location.diff	Tue Jan 06 23:25:20 2004 +0000
@@ -0,0 +1,28 @@
+--- ../gnome-applets-2.3.6.old/drivemount/properties.c	2003-08-11 15:39:58.000000000 +0100
++++ ./drivemount/properties.c	2003-08-11 15:55:25.000000000 +0100
+@@ -112,12 +112,12 @@
+ 		dd->auto_eject = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "auto_eject", NULL);
+ 		dd->mount_point = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "mount_point", NULL);
+ 		if (!dd->mount_point)
+-			dd->mount_point = g_strdup ("/mnt/floppy");
++			dd->mount_point = g_strdup ("/media/floppy");
+ 		dd->autofs_friendly = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "autofs_friendly", NULL);
+ 		dd->custom_icon_in = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_mounted", NULL);
+ 		dd->custom_icon_out = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_unmounted", NULL);
+ 	} else {
+-		dd->mount_point = g_strdup("/mnt/floppy");
++		dd->mount_point = g_strdup("/media/floppy");
+ 		dd->interval = 10;
+ 	}
+ 	g_object_unref (G_OBJECT (client));
+--- ../gnome-applets-2.3.6.old/drivemount/drivemount.schemas.in	2003-08-11 15:39:58.000000000 +0100
++++ ./drivemount/drivemount.schemas.in	2003-08-11 15:55:40.000000000 +0100
+@@ -44,7 +44,7 @@
+             <key>/schemas/apps/drivemount-applet/prefs/mount_point</key>
+             <owner>drivemount-applet</owner>
+             <type>string</type>
+-            <default>/mnt/floppy</default>
++            <default>/media/floppy</default>
+             <locale name="C">
+                 <short></short>
+                 <long></long>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-06-add-l10n-docs.diff	Tue Jan 06 23:25:20 2004 +0000
@@ -0,0 +1,423 @@
+diff -ruN gnome-applets-2.3.6/configure.in gnome-applets-2.3.6-hack/configure.in
+--- gnome-applets-2.3.6/configure.in	2003-10-29 06:47:24.000000000 +0900
++++ gnome-applets-2.3.6-hack/configure.in	2003-10-29 05:32:06.000000000 +0900
+@@ -336,6 +336,7 @@
+ mixer/docs/de/Makefile
+ mixer/docs/es/Makefile
+ mixer/docs/fr/Makefile
++mixer/docs/it/Makefile
+ mixer/docs/sv/Makefile
+ mixer/docs/ja/Makefile
+ mixer/docs/ko/Makefile
+@@ -436,8 +437,26 @@
+ wireless/Makefile
+ wireless/docs/Makefile
+ wireless/docs/C/Makefile
++wireless/docs/de/Makefile
++wireless/docs/es/Makefile
++wireless/docs/it/Makefile
++wireless/docs/fr/Makefile
++wireless/docs/sv/Makefile
++wireless/docs/ja/Makefile
++wireless/docs/ko/Makefile
++wireless/docs/zh_CN/Makefile
++wireless/docs/zh_TW/Makefile
+ stickynotes/Makefile
+ stickynotes/pixmaps/Makefile
+ stickynotes/docs/Makefile
+ stickynotes/docs/C/Makefile
++stickynotes/docs/de/Makefile
++stickynotes/docs/es/Makefile
++stickynotes/docs/fr/Makefile
++stickynotes/docs/it/Makefile
++stickynotes/docs/sv/Makefile
++stickynotes/docs/ja/Makefile
++stickynotes/docs/ko/Makefile
++stickynotes/docs/zh_CN/Makefile
++stickynotes/docs/zh_TW/Makefile
+ ])
+diff -ruN gnome-applets-2.3.6/mixer/docs/Makefile.am gnome-applets-2.3.6-hack/mixer/docs/Makefile.am
+--- gnome-applets-2.3.6/mixer/docs/Makefile.am	2003-07-13 10:58:18.000000000 +0900
++++ gnome-applets-2.3.6-hack/mixer/docs/Makefile.am	2003-10-29 05:28:00.000000000 +0900
+@@ -1 +1 @@
+-SUBDIRS = C de es fr sv ja ko zh_CN zh_TW
++SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
+diff -ruN gnome-applets-2.3.6/mixer/docs/it/Makefile.am gnome-applets-2.3.6-hack/mixer/docs/it/Makefile.am
+--- gnome-applets-2.3.6/mixer/docs/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/mixer/docs/it/Makefile.am	2003-10-29 05:48:32.000000000 +0900
+@@ -0,0 +1,7 @@
++figdir = figures
++docname = mixer_applet2
++lang = it
++omffile = mixer_applet2-it.omf
++entities = legal.xml
++include $(top_srcdir)/xmldocs.make
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/Makefile.am	2003-02-15 07:51:04.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/Makefile.am	2003-10-29 05:28:18.000000000 +0900
+@@ -1,3 +1,3 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = C
++SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/de/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/de/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/de/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/de/Makefile.am	2003-10-29 06:45:17.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = de
++omffile = stickynotes_applet-de.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/es/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/es/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/es/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/es/Makefile.am	2003-10-29 06:45:21.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = es
++omffile = stickynotes_applet-es.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/fr/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/fr/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/fr/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/fr/Makefile.am	2003-10-29 06:45:24.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = fr
++omffile = stickynotes_applet-fr.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/it/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/it/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/it/Makefile.am	2003-10-29 06:45:29.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = it
++omffile = stickynotes_applet-it.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/ja/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/ja/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/ja/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/ja/Makefile.am	2003-10-29 06:45:33.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = ja
++omffile = stickynotes_applet-ja.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/ko/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/ko/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/ko/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/ko/Makefile.am	2003-10-29 06:45:37.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = ko
++omffile = stickynotes_applet-ko.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/sv/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/sv/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/sv/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/sv/Makefile.am	2003-10-29 06:45:40.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = sv
++omffile = stickynotes_applet-sv.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/zh_CN/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/zh_CN/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/zh_CN/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/zh_CN/Makefile.am	2003-10-29 06:45:47.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = zh_CN
++omffile = stickynotes_applet-zh_CN.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/stickynotes/docs/zh_TW/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/zh_TW/Makefile.am
+--- gnome-applets-2.3.6/stickynotes/docs/zh_TW/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/stickynotes/docs/zh_TW/Makefile.am	2003-10-29 06:45:52.000000000 +0900
+@@ -0,0 +1,16 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++    figures/stickynotes_applet.png \
++    figures/preferences_dialog.png \
++    figures/applet_menu.png \
++    figures/note_menu.png 
++
++docname = stickynotes_applet
++lang = zh_TW
++omffile = stickynotes_applet-zh_TW.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
+diff -ruN gnome-applets-2.3.6/wireless/docs/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/Makefile.am	2003-10-29 06:47:24.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/Makefile.am	2003-10-29 05:28:40.000000000 +0900
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = C
++SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
+ 
+diff -ruN gnome-applets-2.3.6/wireless/docs/de/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/de/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/de/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/de/Makefile.am	2003-10-29 06:35:20.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = de
++omffile = wireless-de.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/es/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/es/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/es/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/es/Makefile.am	2003-10-29 06:35:25.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = es
++omffile = wireless-es.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/fr/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/fr/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/fr/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/fr/Makefile.am	2003-10-29 06:35:29.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = fr
++omffile = wireless-fr.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/it/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/it/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/it/Makefile.am	2003-10-29 06:35:35.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = it
++omffile = wireless-it.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/ja/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/ja/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/ja/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/ja/Makefile.am	2003-10-29 06:35:43.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = ja
++omffile = wireless-ja.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/ko/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/ko/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/ko/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/ko/Makefile.am	2003-10-29 06:35:47.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = ko
++omffile = wireless-ko.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/sv/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/sv/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/sv/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/sv/Makefile.am	2003-10-29 06:35:52.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = sv
++omffile = wireless-sv.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/zh_CN/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/zh_CN/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/zh_CN/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/zh_CN/Makefile.am	2003-10-29 06:35:57.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = zh_CN
++omffile = wireless-zh_CN.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
+diff -ruN gnome-applets-2.3.6/wireless/docs/zh_TW/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/zh_TW/Makefile.am
+--- gnome-applets-2.3.6/wireless/docs/zh_TW/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.3.6-hack/wireless/docs/zh_TW/Makefile.am	2003-10-29 06:36:01.000000000 +0900
+@@ -0,0 +1,15 @@
++## Process this file with automake to produce Makefile.in
++
++figs = \
++   figures/wireless_applet_conn.png \
++   figures/wireless_applet_no_conn.png
++
++docname = wireless
++lang = zh_TW
++omffile = wireless-zh_TW.omf
++entities = legal.xml
++
++include $(top_srcdir)/xmldocs.make
++
++dist-hook: app-dist-hook
++
--- a/patches/gnome-applets-06-mount-floppy-location.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- ../gnome-applets-2.3.6.old/drivemount/properties.c	2003-08-11 15:39:58.000000000 +0100
-+++ ./drivemount/properties.c	2003-08-11 15:55:25.000000000 +0100
-@@ -112,12 +112,12 @@
- 		dd->auto_eject = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "auto_eject", NULL);
- 		dd->mount_point = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "mount_point", NULL);
- 		if (!dd->mount_point)
--			dd->mount_point = g_strdup ("/mnt/floppy");
-+			dd->mount_point = g_strdup ("/media/floppy");
- 		dd->autofs_friendly = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "autofs_friendly", NULL);
- 		dd->custom_icon_in = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_mounted", NULL);
- 		dd->custom_icon_out = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_unmounted", NULL);
- 	} else {
--		dd->mount_point = g_strdup("/mnt/floppy");
-+		dd->mount_point = g_strdup("/media/floppy");
- 		dd->interval = 10;
- 	}
- 	g_object_unref (G_OBJECT (client));
---- ../gnome-applets-2.3.6.old/drivemount/drivemount.schemas.in	2003-08-11 15:39:58.000000000 +0100
-+++ ./drivemount/drivemount.schemas.in	2003-08-11 15:55:40.000000000 +0100
-@@ -44,7 +44,7 @@
-             <key>/schemas/apps/drivemount-applet/prefs/mount_point</key>
-             <owner>drivemount-applet</owner>
-             <type>string</type>
--            <default>/mnt/floppy</default>
-+            <default>/media/floppy</default>
-             <locale name="C">
-                 <short></short>
-                 <long></long>
--- a/patches/gnome-applets-07-mini-commander-filesel.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-applets-2.5.2/mini-commander/src/command_line.c	2003-12-08 04:53:59.000000000 +1300
-+++ gnome-applets-2.5.2-hacked/mini-commander/src/command_line.c	2003-12-16 17:21:28.000000000 +1300
-@@ -454,7 +454,7 @@
- 
-     gtk_window_set_screen (GTK_WINDOW (mc->file_select), 
- 			   gtk_widget_get_screen (GTK_WIDGET (mc->applet)));
--    gtk_window_set_position (GTK_WINDOW (mc->file_select), GTK_WIN_POS_MOUSE);
-+    gtk_window_set_position (GTK_WINDOW (mc->file_select), GTK_WIN_POS_CENTER);
-     gtk_window_set_default_size(GTK_WINDOW(mc->file_select), 600, 400);
- 
-     gtk_widget_show(mc->file_select);
--- a/patches/gnome-applets-08-add-l10n-docs.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,423 +0,0 @@
-diff -ruN gnome-applets-2.3.6/configure.in gnome-applets-2.3.6-hack/configure.in
---- gnome-applets-2.3.6/configure.in	2003-10-29 06:47:24.000000000 +0900
-+++ gnome-applets-2.3.6-hack/configure.in	2003-10-29 05:32:06.000000000 +0900
-@@ -336,6 +336,7 @@
- mixer/docs/de/Makefile
- mixer/docs/es/Makefile
- mixer/docs/fr/Makefile
-+mixer/docs/it/Makefile
- mixer/docs/sv/Makefile
- mixer/docs/ja/Makefile
- mixer/docs/ko/Makefile
-@@ -436,8 +437,26 @@
- wireless/Makefile
- wireless/docs/Makefile
- wireless/docs/C/Makefile
-+wireless/docs/de/Makefile
-+wireless/docs/es/Makefile
-+wireless/docs/it/Makefile
-+wireless/docs/fr/Makefile
-+wireless/docs/sv/Makefile
-+wireless/docs/ja/Makefile
-+wireless/docs/ko/Makefile
-+wireless/docs/zh_CN/Makefile
-+wireless/docs/zh_TW/Makefile
- stickynotes/Makefile
- stickynotes/pixmaps/Makefile
- stickynotes/docs/Makefile
- stickynotes/docs/C/Makefile
-+stickynotes/docs/de/Makefile
-+stickynotes/docs/es/Makefile
-+stickynotes/docs/fr/Makefile
-+stickynotes/docs/it/Makefile
-+stickynotes/docs/sv/Makefile
-+stickynotes/docs/ja/Makefile
-+stickynotes/docs/ko/Makefile
-+stickynotes/docs/zh_CN/Makefile
-+stickynotes/docs/zh_TW/Makefile
- ])
-diff -ruN gnome-applets-2.3.6/mixer/docs/Makefile.am gnome-applets-2.3.6-hack/mixer/docs/Makefile.am
---- gnome-applets-2.3.6/mixer/docs/Makefile.am	2003-07-13 10:58:18.000000000 +0900
-+++ gnome-applets-2.3.6-hack/mixer/docs/Makefile.am	2003-10-29 05:28:00.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C de es fr sv ja ko zh_CN zh_TW
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
-diff -ruN gnome-applets-2.3.6/mixer/docs/it/Makefile.am gnome-applets-2.3.6-hack/mixer/docs/it/Makefile.am
---- gnome-applets-2.3.6/mixer/docs/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/mixer/docs/it/Makefile.am	2003-10-29 05:48:32.000000000 +0900
-@@ -0,0 +1,7 @@
-+figdir = figures
-+docname = mixer_applet2
-+lang = it
-+omffile = mixer_applet2-it.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/Makefile.am	2003-02-15 07:51:04.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/Makefile.am	2003-10-29 05:28:18.000000000 +0900
-@@ -1,3 +1,3 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/de/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/de/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/de/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/de/Makefile.am	2003-10-29 06:45:17.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = de
-+omffile = stickynotes_applet-de.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/es/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/es/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/es/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/es/Makefile.am	2003-10-29 06:45:21.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = es
-+omffile = stickynotes_applet-es.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/fr/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/fr/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/fr/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/fr/Makefile.am	2003-10-29 06:45:24.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = fr
-+omffile = stickynotes_applet-fr.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/it/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/it/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/it/Makefile.am	2003-10-29 06:45:29.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = it
-+omffile = stickynotes_applet-it.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/ja/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/ja/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/ja/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/ja/Makefile.am	2003-10-29 06:45:33.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = ja
-+omffile = stickynotes_applet-ja.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/ko/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/ko/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/ko/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/ko/Makefile.am	2003-10-29 06:45:37.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = ko
-+omffile = stickynotes_applet-ko.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/sv/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/sv/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/sv/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/sv/Makefile.am	2003-10-29 06:45:40.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = sv
-+omffile = stickynotes_applet-sv.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/zh_CN/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/zh_CN/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/zh_CN/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/zh_CN/Makefile.am	2003-10-29 06:45:47.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = zh_CN
-+omffile = stickynotes_applet-zh_CN.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/zh_TW/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/zh_TW/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/zh_TW/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/zh_TW/Makefile.am	2003-10-29 06:45:52.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+    figures/stickynotes_applet.png \
-+    figures/preferences_dialog.png \
-+    figures/applet_menu.png \
-+    figures/note_menu.png 
-+
-+docname = stickynotes_applet
-+lang = zh_TW
-+omffile = stickynotes_applet-zh_TW.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/wireless/docs/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/Makefile.am	2003-10-29 06:47:24.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/Makefile.am	2003-10-29 05:28:40.000000000 +0900
-@@ -1,4 +1,4 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
- 
-diff -ruN gnome-applets-2.3.6/wireless/docs/de/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/de/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/de/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/de/Makefile.am	2003-10-29 06:35:20.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = de
-+omffile = wireless-de.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/es/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/es/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/es/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/es/Makefile.am	2003-10-29 06:35:25.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = es
-+omffile = wireless-es.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/fr/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/fr/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/fr/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/fr/Makefile.am	2003-10-29 06:35:29.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = fr
-+omffile = wireless-fr.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/it/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/it/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/it/Makefile.am	2003-10-29 06:35:35.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = it
-+omffile = wireless-it.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/ja/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/ja/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/ja/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/ja/Makefile.am	2003-10-29 06:35:43.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = ja
-+omffile = wireless-ja.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/ko/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/ko/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/ko/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/ko/Makefile.am	2003-10-29 06:35:47.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = ko
-+omffile = wireless-ko.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/sv/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/sv/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/sv/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/sv/Makefile.am	2003-10-29 06:35:52.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = sv
-+omffile = wireless-sv.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/zh_CN/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/zh_CN/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/zh_CN/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/zh_CN/Makefile.am	2003-10-29 06:35:57.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = zh_CN
-+omffile = wireless-zh_CN.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/zh_TW/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/zh_TW/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/zh_TW/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/zh_TW/Makefile.am	2003-10-29 06:36:01.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+   figures/wireless_applet_conn.png \
-+   figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = zh_TW
-+omffile = wireless-zh_TW.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
--- a/patches/gnome-applets-09-battstat-yelp-crash.diff	Tue Jan 06 22:48:00 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gnome-applets-2.3.6/battstat/properties.c	2003-12-05 10:18:01.000000000 +0000
-+++ gnome-applets-2.3.6-new/battstat/properties.c	2003-12-05 15:37:50.000000000 +0000
-@@ -378,6 +378,9 @@ prop_cb (BonoboUIComponent *uic,
-   
-   battstat->eyellow_adj = GTK_OBJECT (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)));
- 
-+  g_signal_connect (G_OBJECT (battstat->prop_win), "delete_event", 
-+		     G_CALLBACK (gtk_true), NULL);
-+
-   gtk_signal_connect (GTK_OBJECT (battstat->eyellow_adj), "value_changed",
- 		       GTK_SIGNAL_FUNC (adj_value_changed_cb), battstat);
-