--- a/ChangeLog	Wed Jul 21 23:20:26 2004 +0000
+++ b/ChangeLog	Thu Jul 22 04:40:02 2004 +0000
@@ -1,3 +1,23 @@
+2004-07-22  Glynn Foster  <[email protected]>
+
+	* gnome-applets.spec: Update to remove wireless stuff.
+	* patches/control-center-01-menu-icon-reorder.diff: Update to 
+	rename menu entries.
+	* patches/gnome-applets-08-accessx-fix-crash.diff: Rename.
+	* patches/gnome-applets-08-wireless-tooltip.diff: Remove since we
+	don't want to ship it anymore.
+	* patches/gnome-applets-09-accessx-fix-crash.diff: Remove.
+	* patches/gnome-applets-09-gkb-crash.diff: Rename.
+	* patches/gnome-applets-10-docs_figures.diff: Rename.
+	* patches/gnome-applets-10-gkb-crash.diff: Remove.
+	* patches/gnome-applets-11-accessx-xkb-crash.diff: Rename.
+	* patches/gnome-applets-11-docs_figures.diff: Remove.
+	* patches/gnome-applets-12-accessx-xkb-crash.diff: Remove.
+	* patches/gnome-applets-12-disable-wireless.diff: Add to disable
+	wireless.
+	* patches/nautilus-02-default-setup.diff: Update to rename menu
+	entry.
+
 2004-07-22  Glynn Foster  <[email protected]>
 
 	* gpdf.spec: Remove the .desktop file so that we don't show

--- a/gnome-applets.spec	Wed Jul 21 23:20:26 2004 +0000
+++ b/gnome-applets.spec	Thu Jul 22 04:40:02 2004 +0000
@@ -17,11 +17,11 @@
 Patch5:       gnome-applets-05-mailcheck-pop3.diff
 Patch6:       gnome-applets-06-mini-commander-tooltip.diff
 Patch7:       gnome-applets-07-accessx-xkb-check.diff
-Patch8:       gnome-applets-08-wireless-tooltip.diff
-Patch9:       gnome-applets-09-accessx-fix-crash.diff
-Patch10:      gnome-applets-10-gkb-crash.diff
-Patch11:      gnome-applets-11-docs_figures.diff
-Patch12:      gnome-applets-12-accessx-xkb-crash.diff
+Patch8:       gnome-applets-08-accessx-fix-crash.diff
+Patch9:       gnome-applets-09-gkb-crash.diff
+Patch10:      gnome-applets-10-docs_figures.diff
+Patch11:      gnome-applets-11-accessx-xkb-crash.diff
+Patch12:      gnome-applets-12-disable-wireless.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -100,7 +100,6 @@
 javahelp-convert-install $RPM_BUILD_ROOT mailcheck mailcheck.xml
 javahelp-convert-install $RPM_BUILD_ROOT mixer_applet2 mixer_applet2.xml
 javahelp-convert-install $RPM_BUILD_ROOT stickynotes_applet stickynotes_applet.xml
-javahelp-convert-install $RPM_BUILD_ROOT wireless wireless.xml
 
 %ifos linux
 javahelp-convert-install $RPM_BUILD_ROOT battstat battstat.xml
@@ -156,13 +155,11 @@
 %{_datadir}/gswitchit/*
 %{_datadir}/gnome/gkb/*
 %{_datadir}/stickynotes/stickynotes.glade
-%{_datadir}/wireless-applet/wireless-applet.glade
 %{_datadir}/gweather/Locations
 %{_datadir}/xmodmap/xmodmap.*
 %{_datadir}/pixmaps/gkb/*.png
 %{_datadir}/pixmaps/mixer/*.png
 %{_datadir}/pixmaps/stickynotes/*.png
-%{_datadir}/pixmaps/wireless-applet/*.png
 %{_datadir}/gnome/help/*
 %{_datadir}/gnome/javahelp/*
 %{_datadir}/geyes/Horrid/*
@@ -175,6 +172,9 @@
 %{_libexecdir}/*
 
 %changelog
+* Thu Jul 22 2004 - [email protected]
+- Disable the wireless applet.
+
 * Thu Jul 08 2004 - [email protected]
 - Updated l10n content to gnome-applets-l10n-po-1.2.tar.bz2
 

--- a/patches/control-center-01-menu-icon-reorder.diff	Wed Jul 21 23:20:26 2004 +0000
+++ b/patches/control-center-01-menu-icon-reorder.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -102,18 +102,6 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
  X-GNOME-Bugzilla-Component=Keyboard
-diff -urN control-center-2.6.0.3/capplets/network/gnome-network-preferences.glade control-center-2.6.0.3-hacked/capplets/network/gnome-network-preferences.glade
---- control-center-2.6.0.3/capplets/network/gnome-network-preferences.glade	2004-03-09 05:25:45.000000000 +1300
-+++ control-center-2.6.0.3-hacked/capplets/network/gnome-network-preferences.glade	2004-04-06 13:17:24.000000000 +1200
-@@ -6,7 +6,7 @@
- 
- <widget class="GtkDialog" id="network_dialog">
-   <property name="border_width">5</property>
--  <property name="title" translatable="yes">Network Proxy Configuration</property>
-+  <property name="title" translatable="yes">Internet</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_NONE</property>
-   <property name="modal">False</property>
 diff -urN control-center-2.6.0.3/capplets/sound/sound-properties.glade control-center-2.6.0.3-hacked/capplets/sound/sound-properties.glade
 diff -urN control-center-2.6.0.3/capplets/theme-switcher/gtk-theme-selector.desktop.in control-center-2.6.0.3-hacked/capplets/theme-switcher/gtk-theme-selector.desktop.in
 --- control-center-2.6.0.3/capplets/theme-switcher/gtk-theme-selector.desktop.in	2003-12-16 10:28:08.000000000 +1300
@@ -167,7 +155,7 @@
  Encoding=UTF-8
 -_Name=Network Proxy
 -_Comment=Network proxy preferences
-+_Name=Internet
++_Name=Proxy Configuration
 +_Comment=Configure your internet settings
  Exec=gnome-network-preferences
  Icon=stock_proxy

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-08-accessx-fix-crash.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -0,0 +1,99 @@
+--- gnome-applets-2.6.1-orig/accessx-status/applet.c	Fri May 28 14:17:41 2004
++++ gnome-applets-2.6.1/accessx-status/applet.c	Fri May 28 15:06:31 2004
+@@ -997,7 +997,8 @@
+ 
+ 	gtk_widget_show (sapplet->box);
+ 	gtk_widget_show (GTK_WIDGET (sapplet->applet));
+-	if (GTK_WIDGET_REALIZED (sapplet->applet))
++	if (GTK_WIDGET_REALIZED (sapplet->applet) &&
++	    sapplet->initialized)
+ 		accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
+ }
+ 
+@@ -1051,25 +1052,6 @@
+ 	g_free (error_txt);
+ }
+ 
+-static void
+-accessx_status_applet_realize (GtkWidget *widget, gpointer user_data)
+-{
+-	AccessxStatusApplet *sapplet = user_data;
+-	if (!sapplet->initialized) {
+-		sapplet->initialized = True;
+-		if (!accessx_status_applet_xkb_select (sapplet)) {
+-			disable_applet (sapplet);
+-			popup_error_dialog (sapplet);
+-			return;
+-		}
+-
+-		gdk_window_add_filter (NULL, accessx_status_xkb_filter, sapplet);
+-	}
+-	accessx_status_applet_init_modifiers (sapplet);
+-	accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
+-	return;
+-}
+-
+ static AccessxStatusApplet *
+ create_applet (PanelApplet *applet)
+ {
+@@ -1262,17 +1244,45 @@
+ 	return FALSE;
+ }
+ 
++static void
++accessx_status_applet_initialize (AccessxStatusApplet *sapplet)
++{
++	if (!sapplet->initialized) {
++		sapplet->initialized = True;
++		accessx_status_applet_xkb_select (sapplet);
++		gdk_window_add_filter (NULL, accessx_status_xkb_filter, sapplet);
++	}
++	accessx_status_applet_init_modifiers (sapplet);
++	accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
++}
++
++static void
++accessx_status_applet_realize (GtkWidget *widget, gpointer user_data)
++{
++	AccessxStatusApplet *sapplet = user_data;
++
++	accessx_status_applet_initialize (sapplet);
++	g_idle_add (accessx_status_applet_reset, sapplet);
++	return;
++}
++
+ static gboolean
+ accessx_status_applet_fill (PanelApplet *applet)
+ {
+ 	AccessxStatusApplet *sapplet;
+ 	AtkObject           *atk_object;
++	gboolean was_realized = FALSE;
+ 
+ 	sapplet = create_applet (applet);
+ 
+-	g_signal_connect_after (G_OBJECT (sapplet->box), 
+-				"realize", G_CALLBACK (accessx_status_applet_realize), 
+-				sapplet);
++	if (!GTK_WIDGET_REALIZED (sapplet->box)) {
++		g_signal_connect_after (G_OBJECT (sapplet->box), 
++					"realize", G_CALLBACK (accessx_status_applet_realize), 
++					sapplet);
++	} else {
++		accessx_status_applet_initialize (sapplet);
++		was_realized = TRUE;
++	}
+ 
+ 	g_object_connect (sapplet->applet,
+ 			  "signal::destroy", accessx_status_applet_destroy, sapplet,
+@@ -1317,8 +1327,9 @@
+ 	atk_object_set_description (atk_object,
+ 				    _("Displays current state of keyboard accessibility features"));
+ 	gtk_widget_show_all (GTK_WIDGET (sapplet->applet));
+-	/* hack for race insurance */
+-	reset_timeout = g_timeout_add (1000, accessx_status_applet_reset, sapplet);
++	if (was_realized) {
++		accessx_status_applet_reset (sapplet);
++	}
+ 
+ 	return TRUE;
+ }

--- a/patches/gnome-applets-08-wireless-tooltip.diff	Wed Jul 21 23:20:26 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
---- gnome-applets-2.6.0/wireless/wireless-applet.c	2004-03-10 18:25:40.000000000 +0530
-+++ cinnabar-07/gnome-applets-2.6.0/wireless/wireless-applet.c	2004-04-23 14:55:45.000000000 +0530
-@@ -141,7 +141,7 @@ wireless_applet_draw (WirelessApplet *ap
- 
- 	/* Update the percentage */
- 	if (percent > 0) {
--		tmp = g_strdup_printf ("%2.0d%%", percent);
-+		tmp = g_strdup_printf (_("Link Strength: %2.0d%%"), percent);
- 	} else {
- 		tmp = g_strdup_printf (_("N/A"));
- 	}
-@@ -360,10 +360,6 @@ start_file_read (WirelessApplet *applet)
- {
- 	applet->file = fopen ("/proc/net/wireless", "rt");
- 	if (applet->file == NULL) {
--		gtk_tooltips_set_tip (applet->tips,
--				GTK_WIDGET (applet),
--				_("No Wireless Devices"),
--				NULL);
- 		show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
- 	}
- }
-@@ -824,6 +820,11 @@ wireless_applet_new (WirelessApplet *app
- 	start_file_read (applet);
- 	wireless_applet_timeout_handler (applet);
- 
-+	gtk_tooltips_set_tip (applet->tips,
-+			      GTK_WIDGET (applet),
-+			      _("No Wireless Devices"),
-+			      NULL);
-+
- 	applet->timeout_handler_id = gtk_timeout_add
- 		(CFG_UPDATE_INTERVAL * 1000,
- 		 (GtkFunction)wireless_applet_timeout_handler,

--- a/patches/gnome-applets-09-accessx-fix-crash.diff	Wed Jul 21 23:20:26 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
---- gnome-applets-2.6.1-orig/accessx-status/applet.c	Fri May 28 14:17:41 2004
-+++ gnome-applets-2.6.1/accessx-status/applet.c	Fri May 28 15:06:31 2004
-@@ -997,7 +997,8 @@
- 
- 	gtk_widget_show (sapplet->box);
- 	gtk_widget_show (GTK_WIDGET (sapplet->applet));
--	if (GTK_WIDGET_REALIZED (sapplet->applet))
-+	if (GTK_WIDGET_REALIZED (sapplet->applet) &&
-+	    sapplet->initialized)
- 		accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
- }
- 
-@@ -1051,25 +1052,6 @@
- 	g_free (error_txt);
- }
- 
--static void
--accessx_status_applet_realize (GtkWidget *widget, gpointer user_data)
--{
--	AccessxStatusApplet *sapplet = user_data;
--	if (!sapplet->initialized) {
--		sapplet->initialized = True;
--		if (!accessx_status_applet_xkb_select (sapplet)) {
--			disable_applet (sapplet);
--			popup_error_dialog (sapplet);
--			return;
--		}
--
--		gdk_window_add_filter (NULL, accessx_status_xkb_filter, sapplet);
--	}
--	accessx_status_applet_init_modifiers (sapplet);
--	accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
--	return;
--}
--
- static AccessxStatusApplet *
- create_applet (PanelApplet *applet)
- {
-@@ -1262,17 +1244,45 @@
- 	return FALSE;
- }
- 
-+static void
-+accessx_status_applet_initialize (AccessxStatusApplet *sapplet)
-+{
-+	if (!sapplet->initialized) {
-+		sapplet->initialized = True;
-+		accessx_status_applet_xkb_select (sapplet);
-+		gdk_window_add_filter (NULL, accessx_status_xkb_filter, sapplet);
-+	}
-+	accessx_status_applet_init_modifiers (sapplet);
-+	accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
-+}
-+
-+static void
-+accessx_status_applet_realize (GtkWidget *widget, gpointer user_data)
-+{
-+	AccessxStatusApplet *sapplet = user_data;
-+
-+	accessx_status_applet_initialize (sapplet);
-+	g_idle_add (accessx_status_applet_reset, sapplet);
-+	return;
-+}
-+
- static gboolean
- accessx_status_applet_fill (PanelApplet *applet)
- {
- 	AccessxStatusApplet *sapplet;
- 	AtkObject           *atk_object;
-+	gboolean was_realized = FALSE;
- 
- 	sapplet = create_applet (applet);
- 
--	g_signal_connect_after (G_OBJECT (sapplet->box), 
--				"realize", G_CALLBACK (accessx_status_applet_realize), 
--				sapplet);
-+	if (!GTK_WIDGET_REALIZED (sapplet->box)) {
-+		g_signal_connect_after (G_OBJECT (sapplet->box), 
-+					"realize", G_CALLBACK (accessx_status_applet_realize), 
-+					sapplet);
-+	} else {
-+		accessx_status_applet_initialize (sapplet);
-+		was_realized = TRUE;
-+	}
- 
- 	g_object_connect (sapplet->applet,
- 			  "signal::destroy", accessx_status_applet_destroy, sapplet,
-@@ -1317,8 +1327,9 @@
- 	atk_object_set_description (atk_object,
- 				    _("Displays current state of keyboard accessibility features"));
- 	gtk_widget_show_all (GTK_WIDGET (sapplet->applet));
--	/* hack for race insurance */
--	reset_timeout = g_timeout_add (1000, accessx_status_applet_reset, sapplet);
-+	if (was_realized) {
-+		accessx_status_applet_reset (sapplet);
-+	}
- 
- 	return TRUE;
- }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-09-gkb-crash.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -0,0 +1,36 @@
+--- gnome-applets-2.6.0/gswitchit/switch.c	2004-05-26 05:44:39.770000000 +0100
++++ gnome-applets-2.6.0-new/gswitchit/switch.c	2004-05-26 05:44:57.499997000 +0100
+@@ -28,8 +28,7 @@ static gboolean
+ GKBAppletNew (PanelApplet * applet)
+ {
+ 	fprintf (stderr, "No xkb found, fallback to gkb\n");
+-	gkb_factory (applet, "OAFIID:GNOME_KeyboardApplet", NULL);
+-	return FALSE;
++	return gkb_factory (applet, "OAFIID:GNOME_KeyboardApplet", NULL);
+ }
+ 
+ static gboolean
+
+--- gnome-applets-2.6.0/gkb-new/gkb-applet.c	2004-05-26 05:44:25.439996000 +0100
++++ gnome-applets-2.6.0-new/gkb-new/gkb-applet.c	2004-05-26 07:44:15.849997000 +0100
+@@ -253,9 +253,10 @@ gkb_update_handlers (GKB *gkb, gboolean 
+ 	root_window = gdk_get_default_root_window ();
+ 
+ 	if (disconnect) {
+-		if (gkb->button_press_id != -1)
++		if (gkb->button_press_id != -1) {
+ 			g_signal_handler_disconnect (gkb->applet, gkb->button_press_id);
+-		gkb->button_press_id = -1;
++			gkb->button_press_id = -1;
++		}
+ 
+ 		gdk_window_remove_filter (root_window, event_filter, gkb);
+ 	} else {
+@@ -273,6 +274,7 @@ gkb_applet_shutdown (GKB *gkb)
+ {
+ 	if (gkb->propwindow)
+ 		gtk_widget_destroy (gkb->propwindow);
++	gkb->button_press_id = -1;
+ 	gkb_update_handlers (gkb, TRUE);
+ 	g_free (gkb);
+ }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-10-docs_figures.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -0,0 +1,22 @@
+--- gnome-applets-2.6.1/stickynotes/docs/C/Makefile.am.orig	Thu Jun 10 17:04:20 2004
++++ gnome-applets-2.6.1/stickynotes/docs/C/Makefile.am	Thu Jun 10 17:04:56 2004
+@@ -5,7 +5,7 @@
+     figures/preferences_dialog.png \
+     figures/applet_menu.png \
+     figures/note_menu.png 
+-
++figdir = figures
+ docname = stickynotes_applet
+ lang = C
+ omffile = stickynotes_applet-C.omf
+--- gnome-applets-2.6.1/wireless/docs/C/Makefile.am.orig	Thu Jun 10 17:09:05 2004
++++ gnome-applets-2.6.1/wireless/docs/C/Makefile.am	Thu Jun 10 17:09:13 2004
+@@ -3,7 +3,7 @@
+ figs = \
+    figures/wireless_applet_conn.png \
+    figures/wireless_applet_no_conn.png
+-
++figdir = figures
+ docname = wireless
+ lang = C
+ omffile = wireless-C.omf

--- a/patches/gnome-applets-10-gkb-crash.diff	Wed Jul 21 23:20:26 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
---- gnome-applets-2.6.0/gswitchit/switch.c	2004-05-26 05:44:39.770000000 +0100
-+++ gnome-applets-2.6.0-new/gswitchit/switch.c	2004-05-26 05:44:57.499997000 +0100
-@@ -28,8 +28,7 @@ static gboolean
- GKBAppletNew (PanelApplet * applet)
- {
- 	fprintf (stderr, "No xkb found, fallback to gkb\n");
--	gkb_factory (applet, "OAFIID:GNOME_KeyboardApplet", NULL);
--	return FALSE;
-+	return gkb_factory (applet, "OAFIID:GNOME_KeyboardApplet", NULL);
- }
- 
- static gboolean
-
---- gnome-applets-2.6.0/gkb-new/gkb-applet.c	2004-05-26 05:44:25.439996000 +0100
-+++ gnome-applets-2.6.0-new/gkb-new/gkb-applet.c	2004-05-26 07:44:15.849997000 +0100
-@@ -253,9 +253,10 @@ gkb_update_handlers (GKB *gkb, gboolean 
- 	root_window = gdk_get_default_root_window ();
- 
- 	if (disconnect) {
--		if (gkb->button_press_id != -1)
-+		if (gkb->button_press_id != -1) {
- 			g_signal_handler_disconnect (gkb->applet, gkb->button_press_id);
--		gkb->button_press_id = -1;
-+			gkb->button_press_id = -1;
-+		}
- 
- 		gdk_window_remove_filter (root_window, event_filter, gkb);
- 	} else {
-@@ -273,6 +274,7 @@ gkb_applet_shutdown (GKB *gkb)
- {
- 	if (gkb->propwindow)
- 		gtk_widget_destroy (gkb->propwindow);
-+	gkb->button_press_id = -1;
- 	gkb_update_handlers (gkb, TRUE);
- 	g_free (gkb);
- }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-11-accessx-xkb-crash.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -0,0 +1,51 @@
+--- gnome-applets-2.6.1/accessx-status/applet.c	2004-06-25 15:03:01.399991000 +0530
++++ gnome-applets-2.6.1-new/accessx-status/applet.c	2004-06-25 19:45:08.039991000 +0530
+@@ -1030,6 +1030,12 @@ popup_error_dialog (AccessxStatusApplet*
+ 	case ACCESSX_STATUS_ERROR_XKB_DISABLED :
+ 		error_txt = g_strdup (_("XKB Extension is not enabled"));
+ 		break;
++
++	case ACCESSX_STATUS_ERROR_UNKNOWN :
++
++	default : 
++		error_txt = g_strdup (_("Unknown error"));
++		break;
+ 	}
+ 
+ 	dialog =   gtk_message_dialog_new (NULL,
+@@ -1244,16 +1250,22 @@ accessx_status_applet_reset (gpointer us
+ 	return FALSE;
+ }
+ 
+-static void
++static gboolean
+ accessx_status_applet_initialize (AccessxStatusApplet *sapplet)
+ {
+ 	if (!sapplet->initialized) {
+ 		sapplet->initialized = True;
+-		accessx_status_applet_xkb_select (sapplet);
++		if (!accessx_status_applet_xkb_select (sapplet)) {
++			disable_applet (sapplet);
++			popup_error_dialog (sapplet);
++			return FALSE;
++		}
+ 		gdk_window_add_filter (NULL, accessx_status_xkb_filter, sapplet);
+ 	}
+ 	accessx_status_applet_init_modifiers (sapplet);
+ 	accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
++
++	return TRUE;
+ }
+ 
+ static void
+@@ -1261,7 +1273,9 @@ accessx_status_applet_realize (GtkWidget
+ {
+ 	AccessxStatusApplet *sapplet = user_data;
+ 
+-	accessx_status_applet_initialize (sapplet);
++	if (!accessx_status_applet_initialize (sapplet))
++		return;
++
+ 	g_idle_add (accessx_status_applet_reset, sapplet);
+ 	return;
+ }

--- a/patches/gnome-applets-11-docs_figures.diff	Wed Jul 21 23:20:26 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- gnome-applets-2.6.1/stickynotes/docs/C/Makefile.am.orig	Thu Jun 10 17:04:20 2004
-+++ gnome-applets-2.6.1/stickynotes/docs/C/Makefile.am	Thu Jun 10 17:04:56 2004
-@@ -5,7 +5,7 @@
-     figures/preferences_dialog.png \
-     figures/applet_menu.png \
-     figures/note_menu.png 
--
-+figdir = figures
- docname = stickynotes_applet
- lang = C
- omffile = stickynotes_applet-C.omf
---- gnome-applets-2.6.1/wireless/docs/C/Makefile.am.orig	Thu Jun 10 17:09:05 2004
-+++ gnome-applets-2.6.1/wireless/docs/C/Makefile.am	Thu Jun 10 17:09:13 2004
-@@ -3,7 +3,7 @@
- figs = \
-    figures/wireless_applet_conn.png \
-    figures/wireless_applet_no_conn.png
--
-+figdir = figures
- docname = wireless
- lang = C
- omffile = wireless-C.omf

--- a/patches/gnome-applets-12-accessx-xkb-crash.diff	Wed Jul 21 23:20:26 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
---- gnome-applets-2.6.1/accessx-status/applet.c	2004-06-25 15:03:01.399991000 +0530
-+++ gnome-applets-2.6.1-new/accessx-status/applet.c	2004-06-25 19:45:08.039991000 +0530
-@@ -1030,6 +1030,12 @@ popup_error_dialog (AccessxStatusApplet*
- 	case ACCESSX_STATUS_ERROR_XKB_DISABLED :
- 		error_txt = g_strdup (_("XKB Extension is not enabled"));
- 		break;
-+
-+	case ACCESSX_STATUS_ERROR_UNKNOWN :
-+
-+	default : 
-+		error_txt = g_strdup (_("Unknown error"));
-+		break;
- 	}
- 
- 	dialog =   gtk_message_dialog_new (NULL,
-@@ -1244,16 +1250,22 @@ accessx_status_applet_reset (gpointer us
- 	return FALSE;
- }
- 
--static void
-+static gboolean
- accessx_status_applet_initialize (AccessxStatusApplet *sapplet)
- {
- 	if (!sapplet->initialized) {
- 		sapplet->initialized = True;
--		accessx_status_applet_xkb_select (sapplet);
-+		if (!accessx_status_applet_xkb_select (sapplet)) {
-+			disable_applet (sapplet);
-+			popup_error_dialog (sapplet);
-+			return FALSE;
-+		}
- 		gdk_window_add_filter (NULL, accessx_status_xkb_filter, sapplet);
- 	}
- 	accessx_status_applet_init_modifiers (sapplet);
- 	accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
-+
-+	return TRUE;
- }
- 
- static void
-@@ -1261,7 +1273,9 @@ accessx_status_applet_realize (GtkWidget
- {
- 	AccessxStatusApplet *sapplet = user_data;
- 
--	accessx_status_applet_initialize (sapplet);
-+	if (!accessx_status_applet_initialize (sapplet))
-+		return;
-+
- 	g_idle_add (accessx_status_applet_reset, sapplet);
- 	return;
- }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-12-disable-wireless.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -0,0 +1,19 @@
+diff -urN gnome-applets-2.6.1/Makefile.am gnome-applets-2.6.1-hacked/Makefile.am
+--- gnome-applets-2.6.1/Makefile.am	2004-03-18 23:49:02.000000000 +1300
++++ gnome-applets-2.6.1-hacked/Makefile.am	2004-07-22 16:25:07.000000000 +1200
+@@ -49,7 +49,6 @@
+ 	mailcheck	\
+ 	mini-commander	\
+ 	gkb-new		\
+-	wireless	\
+ 	stickynotes
+ 
+ SUBDIRS = \
+@@ -83,7 +82,6 @@
+ 	gweather 	\
+ 	mini-commander	\
+ 	man		\
+-	wireless	\
+ 	accessx-status	\
+ 	stickynotes	\
+ 	libgswitchit	\

--- a/patches/nautilus-02-default-setup.diff	Wed Jul 21 23:20:26 2004 +0000
+++ b/patches/nautilus-02-default-setup.diff	Thu Jul 22 04:40:02 2004 +0000
@@ -842,3 +842,14 @@
  }
  
  void
+diff -urN nautilus-2.6.1/nautilus-file-management-properties.desktop.in nautilus-2.6.1-hacked/nautilus-file-management-properties.desktop.in
+--- nautilus-2.6.1/nautilus-file-management-properties.desktop.in	2004-03-06 02:30:49.000000000 +1300
++++ nautilus-2.6.1-hacked/nautilus-file-management-properties.desktop.in	2004-07-22 16:15:24.000000000 +1200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=File Management
++_Name=Folders
+ _Comment=Change how files are managed
+ Exec=nautilus-file-management-properties
+ Icon=file-manager