From 864c769bc3aa89ed71b91343af0d3e039aa8b73b Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Tue, 10 Sep 2002 04:04:20 +0000 Subject: [PATCH] merge in the pending changes --- capplets/file-types/ChangeLog | 5 +++++ capplets/file-types/mime-edit-dialog.c | 10 ++++----- .../gnome-network-preferences.desktop.in | 4 ++-- capplets/theme-switcher/ChangeLog | 4 ++++ capplets/theme-switcher/theme-switcher.c | 22 ++++++++++--------- capplets/ui-properties/ChangeLog | 5 +++++ .../ui-properties/gnome-ui-properties.glade | 2 +- configure.in | 1 + gnome-settings-daemon/ChangeLog | 11 ++++++++++ .../gnome-settings-accessibility-keyboard.c | 10 ++++----- gnome-settings-daemon/gnome-settings-wm.c | 19 ++++++++++++++-- 11 files changed, 67 insertions(+), 26 deletions(-) diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index 8c0c45eb0..00cfcbbec 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,3 +1,8 @@ +2002-09-09 Jody Goldberg + + * mime-edit-dialog.c (update_sensitivity) : As FCrozat points out + use category default has been lobotomized. + 2002-08-31 Jacob Berkman * Makefile.am (gnome_file_types_properties_LDADD): link against -lpopt diff --git a/capplets/file-types/mime-edit-dialog.c b/capplets/file-types/mime-edit-dialog.c index 802b405e8..a2f0f112c 100644 --- a/capplets/file-types/mime-edit-dialog.c +++ b/capplets/file-types/mime-edit-dialog.c @@ -66,7 +66,6 @@ struct _MimeEditDialogPrivate gboolean component_active : 1; gboolean default_action_active : 1; gboolean custom_action : 1; - gboolean use_cat_dfl : 1; }; static guint dialog_signals[LAST_SIGNAL]; @@ -467,7 +466,6 @@ fill_dialog (MimeEditDialog *dialog) safe_set_entry (dialog, "category_entry", mime_type_info_get_category_name (dialog->p->info)); - dialog->p->use_cat_dfl = dialog->p->info->use_category; update_sensitivity (dialog); gnome_icon_entry_set_filename (GNOME_ICON_ENTRY (WID ("icon_entry")), mime_type_info_get_icon_path (dialog->p->info)); @@ -990,8 +988,8 @@ response_cb (MimeEditDialog *dialog, gint response_id) static void update_sensitivity (MimeEditDialog *dialog) { - gtk_widget_set_sensitive (WID ("component_box"), dialog->p->component_active && !dialog->p->use_cat_dfl); - gtk_widget_set_sensitive (WID ("default_action_box"), dialog->p->default_action_active && !dialog->p->use_cat_dfl); - gtk_widget_set_sensitive (WID ("program_entry_box"), dialog->p->custom_action && !dialog->p->use_cat_dfl); - gtk_widget_set_sensitive (WID ("needs_terminal_toggle"), dialog->p->custom_action && !dialog->p->use_cat_dfl); + gtk_widget_set_sensitive (WID ("component_box"), dialog->p->component_active); + gtk_widget_set_sensitive (WID ("default_action_box"), dialog->p->default_action_active); + gtk_widget_set_sensitive (WID ("program_entry_box"), dialog->p->custom_action); + gtk_widget_set_sensitive (WID ("needs_terminal_toggle"), dialog->p->custom_action); } diff --git a/capplets/network/gnome-network-preferences.desktop.in b/capplets/network/gnome-network-preferences.desktop.in index 8b29a4625..c7922d82a 100644 --- a/capplets/network/gnome-network-preferences.desktop.in +++ b/capplets/network/gnome-network-preferences.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Network Proxy -_Comment=Network Proxy Preferences +_Name=Network proxy +_Comment=Network proxy preferences Exec=gnome-network-preferences Icon=gnome-globe.png Terminal=false diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index e8c2252ad..b3040169d 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,7 @@ +2002-08-26 Jody Goldberg + + * theme-switcher.c (drag_data_received_cb) : unescape the string. + 2002-09-09 Mark McLoughlin * Makefile.am: use ../../libwindow-settings/libgnome-window-settings.la diff --git a/capplets/theme-switcher/theme-switcher.c b/capplets/theme-switcher/theme-switcher.c index 244d244c3..ef06d2c90 100644 --- a/capplets/theme-switcher/theme-switcher.c +++ b/capplets/theme-switcher/theme-switcher.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -274,8 +275,11 @@ window_read_themes (GladeXML *dialog) client = gconf_client_get_default (); wm = gnome_wm_manager_get_current (); - window_theme_list = gnome_window_manager_get_theme_list (wm); - g_object_unref (G_OBJECT (wm)); + if (wm != NULL) { + window_theme_list = gnome_window_manager_get_theme_list (wm); + g_object_unref (G_OBJECT (wm)); + } else + window_theme_list = NULL; tree_view = GTK_TREE_VIEW (WID ("window_theme_treeview")); model = gtk_tree_view_get_model (tree_view); @@ -652,20 +656,18 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, guint info, guint time, gpointer data) { GList *uris; - gchar *filename; + gchar *filename = NULL; if (!(info == TARGET_URI_LIST || info == TARGET_NS_URL)) return; uris = gnome_vfs_uri_list_parse ((gchar *) selection_data->data); - - filename = gnome_vfs_uri_to_string (uris->data, GNOME_VFS_URI_HIDE_NONE); - if (strncmp (filename, "http://", 7) && strncmp (filename, "ftp://", 6)) - { - g_free (filename); - filename = gnome_vfs_uri_to_string (uris->data, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD); + if (uris != NULL && uris->data != NULL) { + GnomeVFSURI *uri = (GnomeVFSURI *) uris->data; + filename = gnome_vfs_unescape_string ( + gnome_vfs_uri_get_path (uri), G_DIR_SEPARATOR_S); + gnome_vfs_uri_list_unref (uris); } - gnome_vfs_uri_list_unref (uris); real_show_install_dialog (widget, filename); g_free (filename); diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index c943cf142..f62bec1c9 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -1,3 +1,8 @@ +2002-08-23 Jody Goldberg + + * gnome-ui-properties.glade : Priority text was a bonobo-ism. + This is really 'text beside icon' + 2002-08-21 Jody Goldberg * Release 2.1.0 diff --git a/capplets/ui-properties/gnome-ui-properties.glade b/capplets/ui-properties/gnome-ui-properties.glade index 801ac6b49..3568cd7c2 100644 --- a/capplets/ui-properties/gnome-ui-properties.glade +++ b/capplets/ui-properties/gnome-ui-properties.glade @@ -133,7 +133,7 @@ True - Priority Text Beside Icons + Text Beside Icons True diff --git a/configure.in b/configure.in index 2394d7a9f..01313721f 100644 --- a/configure.in +++ b/configure.in @@ -253,5 +253,6 @@ capplets/network/Makefile capplets/windows/Makefile schemas/Makefile libsounds/Makefile +control-center.spec ]) dnl due to a bug in intltool we need to expand something from the root last control-center.spec diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index b2f5d11b4..fd8d21e8a 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,14 @@ +2002-09-09 Jody Goldberg + + http://bugzilla.gnome.org/show_bug.cgi?id=91223 + * gnome-settings-wm.c (gnome_settings_wm_load) : add some valdation to + ensure that we don't set the number of workspaces to 0 + (which pisses off kde). Also apply fcrozat's patch to restore the + names. + + * gnome-settings-accessibility-keyboard.c (set_server_from_gconf) : + the feature beep is not related the the feature timeout. + 2002-08-21 Jody Goldberg * Release 2.1.0 diff --git a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c index 1af93a8d4..16cdcbd7d 100644 --- a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c +++ b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c @@ -169,13 +169,13 @@ set_server_from_gconf (GConfEntry *ignored) XkbAccessXKeysMask | XkbAccessXFeedbackMask); if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/timeout_enable", - XkbAccessXTimeoutMask, enable_accessX)) { + XkbAccessXTimeoutMask, enable_accessX)) desc->ctrls->ax_timeout = get_int (client, CONFIG_ROOT "/timeout"); - desc->ctrls->ax_options = set_clear ( - gconf_client_get_bool (client, CONFIG_ROOT "/feature_state_change_beep", NULL), - desc->ctrls->ax_options, XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask); - } + + desc->ctrls->ax_options = set_clear (enable_accessX && + gconf_client_get_bool (client, CONFIG_ROOT "/feature_state_change_beep", NULL), + desc->ctrls->ax_options, XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask); /* bounce keys */ if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/bouncekeys_enable", diff --git a/gnome-settings-daemon/gnome-settings-wm.c b/gnome-settings-daemon/gnome-settings-wm.c index 8d80a5a38..8a6570793 100644 --- a/gnome-settings-daemon/gnome-settings-wm.c +++ b/gnome-settings-daemon/gnome-settings-wm.c @@ -100,7 +100,22 @@ gnome_settings_wm_init (GConfClient *client) void gnome_settings_wm_load (GConfClient *client) { - set_number_of_workspaces (gconf_client_get_int (client, "/desktop/gnome/applications/window_manager/number_of_workspaces", NULL)); - set_workspace_names (gconf_client_get_list (client, "/desktop/gnome/applications/window_manager/workspace_names", GCONF_VALUE_LIST, NULL)); + GConfValue *value; + GSList * workspace_list, *li; + int n; + + n = gconf_client_get_int (client, "/desktop/gnome/applications/window_manager/number_of_workspaces", NULL); + set_number_of_workspaces (n >= 1 ? n : 1); + + value = gconf_client_get (client, "/desktop/gnome/applications/window_manager/workspace_names", NULL); + if (gconf_value_get_list_type (value) == GCONF_VALUE_STRING) { + workspace_list = gconf_value_get_list (value); + set_workspace_names (workspace_list); + for (li = workspace_list; li != NULL; li = li->next) { + g_free (li->data); + li->data = NULL; + } + g_slist_free (workspace_list); + } }