From 97c9f86f499f502cc0af0a818ee1a9161612178d Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Tue, 6 Aug 2002 18:42:54 +0000 Subject: A Pile of pending patches --- capplets/accessibility/keyboard/ChangeLog | 8 +++++ .../keyboard/accessibility-keyboard.c | 18 ++++++++++ .../gnome-accessibility-keyboard-properties.glade | 41 +++++++++++++++------- capplets/file-types/ChangeLog | 15 ++++++++ capplets/file-types/file-types-properties.glade | 6 ++-- capplets/file-types/mime-edit-dialog.c | 21 +++++++---- capplets/file-types/mime-type-info.c | 3 ++ gnome-settings-daemon/ChangeLog | 6 ++++ gnome-settings-daemon/gnome-settings-mouse.c | 11 ++++-- 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 + + * 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 * 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 @@ -226,9 +226,27 @@ cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog) err); } +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 @@ - 2 False 0 - 5 True GTK_BUTTONBOX_END - 10 @@ -507,9 +504,9 @@ two keys pressed simultaneously False 1 0 100 1 10 10 - - + + @@ -786,9 +783,9 @@ two keys pressed simultaneously False 1 0 100 1 10 10 - - + + @@ -1018,9 +1015,9 @@ two keys pressed simultaneously False 1 0 100 1 10 10 - - + + @@ -1095,9 +1092,9 @@ two keys pressed simultaneously False 1 0 100 1 10 10 - - + + @@ -1121,9 +1118,9 @@ two keys pressed simultaneously False 1 0 100 1 10 10 - - + + @@ -1270,6 +1267,24 @@ two keys pressed simultaneously False 10 + + + True + True + _Enable keyboard accessibility + True + GTK_RELIEF_NORMAL + True + False + True + + + 0 + False + False + + + True 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 + + * 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 + + 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 * 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 @@ Edit file type GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False + True True False True @@ -843,7 +843,7 @@ GTK_WINDOW_TOPLEVEL - no + True no no no @@ -1175,7 +1175,7 @@ GTK_WINDOW_TOPLEVEL - no + True no no no 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 + + 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 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++) { -- cgit v1.2.1