A Pile of pending patches

9 files changed, 103 insertions, 26 deletions

diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 0321ca913..d60d35314 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-05  Jody Goldberg <jody@gnome.org>
+
+	* gnome-accessibility-keyboard-properties.glade : Restore the master
+	  toggle.
+
+	* accessibility-keyboard.c (setup_dialog) : support the master toggle.
+	(cb_master_enable_toggle) : new.
+
 2002-08-01  jacob berkman  <jacob@ximian.com>
 
 	* accessibility-keyboard.c (setup_accessX_dialog): fix widget name
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c
index c6d5fbdcc..286ba7bdb 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.c
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.c
@@ -227,8 +227,26 @@ cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog)
 }
 
 static void
+cb_master_enable_toggle (GtkToggleButton *btn, GladeXML *dialog)
+{
+	int i = G_N_ELEMENTS (features);
+	gboolean flag = gtk_toggle_button_get_active (btn);
+
+	while (i-- > 0)
+		gtk_widget_set_sensitive (WID (features [i].checkbox), flag);
+}
+
+static void
 setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
 {
+	GtkWidget *master_enable = WID ("master_enable");
+	g_signal_connect (master_enable,
+		"toggled",
+		G_CALLBACK (cb_master_enable_toggle), dialog);
+	gconf_peditor_new_boolean (changeset,
+		CONFIG_ROOT "/enable",
+		GTK_WIDGET (master_enable), NULL);
+
 	setup_images (dialog);
 	setup_ranges (dialog, changeset);
 	setup_toggles (dialog, changeset);
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
index f80b7c03b..dc393bea7 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
@@ -15,16 +15,13 @@
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="border_width">2</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
 
 	  <child>
 	    <widget class="GtkButton" id="help_button">
@@ -507,9 +504,9 @@ two keys pressed simultaneously</property>
 			  <property name="wrap">False</property>
 			  <property name="adjustment">1 0 100 1 10 10</property>
 			  <accessibility>
-			    <atkrelation target="slowkeys_title" type="labelled-by"/>
-			    <atkrelation target="slowkeys_label" type="labelled-by"/>
 			    <atkrelation target="slowkeys_delay_slide" type="controlled-by"/>
+			    <atkrelation target="slowkeys_label" type="labelled-by"/>
+			    <atkrelation target="slowkeys_title" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -786,9 +783,9 @@ two keys pressed simultaneously</property>
 			  <property name="wrap">False</property>
 			  <property name="adjustment">1 0 100 1 10 10</property>
 			  <accessibility>
-			    <atkrelation target="bouncekeys_title" type="labelled-by"/>
-			    <atkrelation target="bouncekeys_label" type="labelled-by"/>
 			    <atkrelation target="bouncekeys_delay_slide" type="controlled-by"/>
+			    <atkrelation target="bouncekeys_label" type="labelled-by"/>
+			    <atkrelation target="bouncekeys_title" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -1018,9 +1015,9 @@ two keys pressed simultaneously</property>
 		      <property name="wrap">False</property>
 		      <property name="adjustment">1 0 100 1 10 10</property>
 		      <accessibility>
-			<atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_max_speed_title" type="labelled-by"/>
 			<atkrelation target="mousekeys_max_speed_label" type="labelled-by"/>
+			<atkrelation target="mousekeys_max_speed_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1095,9 +1092,9 @@ two keys pressed simultaneously</property>
 		      <property name="wrap">False</property>
 		      <property name="adjustment">1 0 100 1 10 10</property>
 		      <accessibility>
-			<atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_init_delay_title" type="labelled-by"/>
 			<atkrelation target="mousekeys_init_delay_label" type="labelled-by"/>
+			<atkrelation target="mousekeys_init_delay_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1121,9 +1118,9 @@ two keys pressed simultaneously</property>
 		      <property name="wrap">False</property>
 		      <property name="adjustment">1 0 100 1 10 10</property>
 		      <accessibility>
-			<atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_accel_time_title" type="labelled-by"/>
 			<atkrelation target="mousekeys_accel_time_label" type="labelled-by"/>
+			<atkrelation target="mousekeys_accel_time_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1271,6 +1268,24 @@ two keys pressed simultaneously</property>
 		  <property name="spacing">10</property>
 
 		  <child>
+		    <widget class="GtkCheckButton" id="master_enable">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Enable keyboard accessibility</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="active">True</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
 		    <widget class="GtkAlignment" id="alignment3">
 		      <property name="visible">True</property>
 		      <property name="xalign">0</property>
diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index 2c869fb76..d1547a1c8 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,18 @@
+2002-08-05  Jody Goldberg <jody@gnome.org>
+
+	* mime-edit-dialog.c (mime_edit_dialog_get_app) : work around
+	  gnome_file_entry's propensity for prepending the current dir if none
+	  is specified.  This allows a user to type a nme with no
+	  qualifications and have it look things up in the path.
+
+	* mime-type-info.c (mime_category_info_save) : lobotomize this just in
+	  case.
+
+2002-08-03  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=88775
+	* file-types-properties.glade : make the other sub dialogs modal too.
+
 2002-08-01  Federico Mena Quintero  <federico@ximian.com>
 
 	* file-types-properties.glade: Made the file entries modal as they
diff --git a/capplets/file-types/file-types-properties.glade b/capplets/file-types/file-types-properties.glade
index 22b606d4b..92c819894 100644
--- a/capplets/file-types/file-types-properties.glade
+++ b/capplets/file-types/file-types-properties.glade
@@ -199,7 +199,7 @@
   <property name="title" translatable="yes">Edit file type</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="has_separator">True</property>
@@ -843,7 +843,7 @@
 
   <widget class="GtkDialog" id="internet_service_dialog">
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
+    <property name="modal">True</property>
     <property name="allow_shrink">no</property>
     <property name="allow_grow">no</property>
     <property name="visible">no</property>
@@ -1175,7 +1175,7 @@
   </widget>
   <widget class="GtkDialog" id="mime_category_edit_dialog">
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
+    <property name="modal">True</property>
     <property name="allow_shrink">no</property>
     <property name="allow_grow">no</property>
     <property name="visible">no</property>
diff --git a/capplets/file-types/mime-edit-dialog.c b/capplets/file-types/mime-edit-dialog.c
index 1f48b7b63..cd5d5b788 100644
--- a/capplets/file-types/mime-edit-dialog.c
+++ b/capplets/file-types/mime-edit-dialog.c
@@ -671,21 +671,28 @@ mime_edit_dialog_get_app (GladeXML *glade, char const *mime_type,
 	GnomeVFSMimeApplication *res, *app = g_object_get_data (item, "app");
 
 	if (app == NULL) {
-		char *cmd = gnome_file_entry_get_full_path (
-			GNOME_FILE_ENTRY (glade_xml_get_widget (glade, "program_entry")), FALSE);
+		GnomeFileEntry *program_entry =
+			GNOME_FILE_ENTRY (glade_xml_get_widget (glade, "program_entry"));
+		char *cmd = gnome_file_entry_get_full_path (program_entry, TRUE);
 		gboolean requires_terminal = gtk_toggle_button_get_active (
 			GTK_TOGGLE_BUTTON (glade_xml_get_widget (glade, "needs_terminal_toggle")));
 		char *base_cmd;
 
 		GList *ptr, *app_list = NULL;
 		
-		/* I have no idea what semantics people want, but I'll be anal
-		 * and avoid NULL
+		/* If the cmd is NULL its possible that the user just types a
+		 * command name in their path.  Because the file picker seems
+		 * to insist that it only return a valid path we ask it to
+		 * verify the app exists so that we can catch it here and just
+		 * use the raw non-absolute name here.
 		 */
-		if (cmd == NULL)
-			cmd = g_strdup ("");
+		if (cmd == NULL) {
+			char const *tmp = gtk_entry_get_text (
+				GTK_ENTRY (gnome_file_entry_gtk_entry (program_entry)));
+			cmd = g_strdup (tmp == NULL ? "" : tmp);
+		}
 		base_cmd = g_path_get_basename  (cmd);
-		if (base_cmd == NULL);
+		if (base_cmd == NULL)
 			base_cmd = g_strdup ("");
 
 		app_list = gnome_vfs_application_registry_get_applications (NULL);
diff --git a/capplets/file-types/mime-type-info.c b/capplets/file-types/mime-type-info.c
index 1b90f2602..72fbab8e8 100644
--- a/capplets/file-types/mime-type-info.c
+++ b/capplets/file-types/mime-type-info.c
@@ -392,6 +392,9 @@ mime_category_info_save (MimeCategoryInfo *category)
 	gchar   *key, *basename;
 	gboolean set_ids;
 
+	g_warning ("Do not call this, nothing actually observes the gconf settings");
+	return;
+
 	/* Be really anal about validating this action */
 	if (category->default_action != NULL) {
 		if ( category->default_action->command == NULL ||
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 8f91dd8b1..525108152 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-03  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=88634
+	* gnome-settings-mouse.c (set_left_handed) : merge in a variant of the
+	  proposed patch.
+
 2002-07-27  Mark McLoughlin  <mark@skynet.ie>
 
 	Add multiscreen support for background rendering.
diff --git a/gnome-settings-daemon/gnome-settings-mouse.c b/gnome-settings-daemon/gnome-settings-mouse.c
index 953128b93..65f962fe4 100644
--- a/gnome-settings-daemon/gnome-settings-mouse.c
+++ b/gnome-settings-daemon/gnome-settings-mouse.c
@@ -8,16 +8,21 @@
 #include "gnome-settings-locate-pointer.h"
 #include "gnome-settings-daemon.h"
 
-#define MAX_BUTTONS 10
+#define DEFAULT_PTR_MAP_SIZE 128
 
 static void
 set_left_handed (gboolean left_handed)
 {
-  unsigned char buttons[MAX_BUTTONS];
+  unsigned char *buttons;
   gint n_buttons, i;
   gint idx_1 = 0, idx_3 = 1;
 
-  n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, MAX_BUTTONS);
+  buttons = g_alloca (DEFAULT_PTR_MAP_SIZE);
+  n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, DEFAULT_PTR_MAP_SIZE);
+  if (n_buttons > DEFAULT_PTR_MAP_SIZE) {
+    buttons = g_alloca (n_buttons);
+    n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
+  }
 
   for (i = 0; i < n_buttons; i++)
     {