applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge in the pending changes

Browse source
This commit is contained in:
Jody Goldberg 2002-09-10 04:04:20 +00:00
parent 9605651251
commit 864c769bc3
11 changed files with 67 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
capplets/file-types/ChangeLog
View file

@ -1,3 +1,8 @@
2002-09-09 Jody Goldberg <jody@gnome.org>
* mime-edit-dialog.c (update_sensitivity) : As FCrozat points out
use category default has been lobotomized.
2002-08-31 Jacob Berkman <jacob@krunk.local.> 2002-08-31 Jacob Berkman <jacob@krunk.local.>
* Makefile.am (gnome_file_types_properties_LDADD): link against -lpopt * Makefile.am (gnome_file_types_properties_LDADD): link against -lpopt

10
capplets/file-types/mime-edit-dialog.c
View file

@ -66,7 +66,6 @@ struct _MimeEditDialogPrivate
gboolean component_active : 1; gboolean component_active : 1;
gboolean default_action_active : 1; gboolean default_action_active : 1;
gboolean custom_action : 1; gboolean custom_action : 1;
gboolean use_cat_dfl : 1;
}; };
static guint dialog_signals[LAST_SIGNAL]; static guint dialog_signals[LAST_SIGNAL];
@ -467,7 +466,6 @@ fill_dialog (MimeEditDialog *dialog)
safe_set_entry (dialog, "category_entry", safe_set_entry (dialog, "category_entry",
mime_type_info_get_category_name (dialog->p->info)); mime_type_info_get_category_name (dialog->p->info));
dialog->p->use_cat_dfl = dialog->p->info->use_category;
update_sensitivity (dialog); update_sensitivity (dialog);
gnome_icon_entry_set_filename (GNOME_ICON_ENTRY (WID ("icon_entry")), mime_type_info_get_icon_path (dialog->p->info)); 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 static void
update_sensitivity (MimeEditDialog *dialog) 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 ("component_box"), dialog->p->component_active);
gtk_widget_set_sensitive (WID ("default_action_box"), dialog->p->default_action_active && !dialog->p->use_cat_dfl); 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 && !dialog->p->use_cat_dfl); gtk_widget_set_sensitive (WID ("program_entry_box"), dialog->p->custom_action);
gtk_widget_set_sensitive (WID ("needs_terminal_toggle"), dialog->p->custom_action && !dialog->p->use_cat_dfl); gtk_widget_set_sensitive (WID ("needs_terminal_toggle"), dialog->p->custom_action);
} }

4
capplets/network/gnome-network-preferences.desktop.in
View file

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
_Name=Network Proxy _Name=Network proxy
_Comment=Network Proxy Preferences _Comment=Network proxy preferences
Exec=gnome-network-preferences Exec=gnome-network-preferences
Icon=gnome-globe.png Icon=gnome-globe.png
Terminal=false Terminal=false

4
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,7 @@
2002-08-26 Jody Goldberg <jody@gnome.org>
* theme-switcher.c (drag_data_received_cb) : unescape the string.
2002-09-09 Mark McLoughlin <mark@skynet.ie> 2002-09-09 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: use ../../libwindow-settings/libgnome-window-settings.la * Makefile.am: use ../../libwindow-settings/libgnome-window-settings.la

22
capplets/theme-switcher/theme-switcher.c
View file

@ -10,6 +10,7 @@
#include <glade/glade.h> #include <glade/glade.h>
#include <libgnomevfs/gnome-vfs-async-ops.h> #include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnomevfs/gnome-vfs-ops.h> #include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libwindow-settings/gnome-wm-manager.h> #include <libwindow-settings/gnome-wm-manager.h>
@ -274,8 +275,11 @@ window_read_themes (GladeXML *dialog)
client = gconf_client_get_default (); client = gconf_client_get_default ();
wm = gnome_wm_manager_get_current (); wm = gnome_wm_manager_get_current ();
window_theme_list = gnome_window_manager_get_theme_list (wm); if (wm != NULL) {
g_object_unref (G_OBJECT (wm)); 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")); tree_view = GTK_TREE_VIEW (WID ("window_theme_treeview"));
model = gtk_tree_view_get_model (tree_view); 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) guint info, guint time, gpointer data)
{ {
GList *uris; GList *uris;
gchar *filename; gchar *filename = NULL;
if (!(info == TARGET_URI_LIST || info == TARGET_NS_URL)) if (!(info == TARGET_URI_LIST || info == TARGET_NS_URL))
return; return;
uris = gnome_vfs_uri_list_parse ((gchar *) selection_data->data); uris = gnome_vfs_uri_list_parse ((gchar *) selection_data->data);
if (uris != NULL && uris->data != NULL) {
filename = gnome_vfs_uri_to_string (uris->data, GNOME_VFS_URI_HIDE_NONE); GnomeVFSURI *uri = (GnomeVFSURI *) uris->data;
if (strncmp (filename, "http://", 7) && strncmp (filename, "ftp://", 6)) filename = gnome_vfs_unescape_string (
{ gnome_vfs_uri_get_path (uri), G_DIR_SEPARATOR_S);
g_free (filename); gnome_vfs_uri_list_unref (uris);
filename = gnome_vfs_uri_to_string (uris->data, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD);
} }
gnome_vfs_uri_list_unref (uris);
real_show_install_dialog (widget, filename); real_show_install_dialog (widget, filename);
g_free (filename); g_free (filename);

5
capplets/ui-properties/ChangeLog
View file

@ -1,3 +1,8 @@
2002-08-23 Jody Goldberg <jody@gnome.org>
* gnome-ui-properties.glade : Priority text was a bonobo-ism.
This is really 'text beside icon'
2002-08-21 Jody Goldberg <jody@gnome.org> 2002-08-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.0 * Release 2.1.0

2
capplets/ui-properties/gnome-ui-properties.glade
View file

@ -133,7 +133,7 @@
<child> <child>
<widget class="GtkMenuItem" id="convertwidget3"> <widget class="GtkMenuItem" id="convertwidget3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Priority Text Beside Icons</property> <property name="label" translatable="yes">Text Beside Icons</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</widget> </widget>
</child> </child>

1
configure.in
View file

@ -253,5 +253,6 @@ capplets/network/Makefile
capplets/windows/Makefile capplets/windows/Makefile
schemas/Makefile schemas/Makefile
libsounds/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 dnl due to a bug in intltool we need to expand something from the root last control-center.spec

11
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,14 @@
2002-09-09 Jody Goldberg <jody@gnome.org>
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 <jody@gnome.org> 2002-08-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.0 * Release 2.1.0

10
gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
View file

@ -169,13 +169,13 @@ set_server_from_gconf (GConfEntry *ignored)
XkbAccessXKeysMask | XkbAccessXFeedbackMask); XkbAccessXKeysMask | XkbAccessXFeedbackMask);
if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/timeout_enable", if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/timeout_enable",
XkbAccessXTimeoutMask, enable_accessX)) { XkbAccessXTimeoutMask, enable_accessX))
desc->ctrls->ax_timeout = get_int (client, desc->ctrls->ax_timeout = get_int (client,
CONFIG_ROOT "/timeout"); 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 = set_clear (enable_accessX &&
desc->ctrls->ax_options, XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask); gconf_client_get_bool (client, CONFIG_ROOT "/feature_state_change_beep", NULL),
} desc->ctrls->ax_options, XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
/* bounce keys */ /* bounce keys */
if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/bouncekeys_enable", if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/bouncekeys_enable",

19
gnome-settings-daemon/gnome-settings-wm.c
View file

@ -100,7 +100,22 @@ gnome_settings_wm_init (GConfClient *client)
void void
gnome_settings_wm_load (GConfClient *client) gnome_settings_wm_load (GConfClient *client)
{ {
set_number_of_workspaces (gconf_client_get_int (client, "/desktop/gnome/applications/window_manager/number_of_workspaces", NULL)); GConfValue *value;
set_workspace_names (gconf_client_get_list (client, "/desktop/gnome/applications/window_manager/workspace_names", GCONF_VALUE_LIST, NULL)); 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);
}
} }