diff options
| author | Jonathan Blandford <jrb@gnome.org> | 2002-04-10 06:08:08 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2002-04-10 06:08:08 +0000 |
| commit | 6f1fa592ecec0b32dc1ee4cc87c621e47ad67ad2 (patch) | |
| tree | 596a1880cb831b39d363cb26f24e9dbd129c0985 /capplets/accessibility | |
| parent | 5a1e076eedda885d2bcad37186182be687045833 (diff) | |
| download | gnome-control-center-6f1fa592ecec0b32dc1ee4cc87c621e47ad67ad2.tar.gz | |
Change gnome2-* to gnome-* ditto ditto ditto ditto ditto ditto ditto ditto
Tue Apr 9 11:43:08 2002 Jonathan Blandford <jrb@gnome.org>
* capplets/accessibility/keyboard/Makefile.am: Change gnome2-* to
gnome-*
* capplets/default-applications/Makefile.am: ditto
* capplets/file-types/Makefile.am: ditto
* capplets/font/Makefile.am: ditto
* capplets/keyboard/Makefile.am: ditto
* capplets/mouse/Makefile.am: ditto
* capplets/sound/Makefile.am: ditto
* capplets/theme-switcher/Makefile.am: ditto
* capplets/ui-properties/Makefile.am: ditto
* control-center/Makefile.am: ditto
* gnome-settings-daemon/Makefile.am: ditto
* gnome-keybinding-properties.c (setup_dialog): man, was this code
silly. Also, themes are case sensitive.
(is_metacity_running): Add support for metacity keybindings. This
is off by default until I write code to actually detect metacity.
Tue Apr 9 11:58:10 2002 Jonathan Blandford <jrb@gnome.org>
* Makefile.am: Add commented out disk support until I finish the code.
Diffstat (limited to 'capplets/accessibility')
3 files changed, 14 insertions, 7 deletions
diff --git a/capplets/accessibility/keyboard/Makefile.am b/capplets/accessibility/keyboard/Makefile.am index b0193e20e..aa01d58c4 100644 --- a/capplets/accessibility/keyboard/Makefile.am +++ b/capplets/accessibility/keyboard/Makefile.am @@ -4,10 +4,10 @@ libaccessibility_keyboard_a_SOURCES = \ accessibility-keyboard.c \ accessibility-keyboard.h -bin_PROGRAMS = gnome2-accessibility-keyboard-properties +bin_PROGRAMS = gnome-accessibility-keyboard-properties -gnome2_accessibility_keyboard_properties_SOURCES = gnome-accessibility-keyboard-properties.c -gnome2_accessibility_keyboard_properties_LDADD = \ +gnome_accessibility_keyboard_properties_SOURCES = gnome-accessibility-keyboard-properties.c +gnome_accessibility_keyboard_properties_LDADD = \ libaccessibility-keyboard.a $(GNOMECC_CAPPLETS_LIBS) @INTLTOOL_DESKTOP_RULE@ diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c index 27aa2214d..4f5c31c3b 100644 --- a/capplets/accessibility/keyboard/accessibility-keyboard.c +++ b/capplets/accessibility/keyboard/accessibility-keyboard.c @@ -236,9 +236,10 @@ setup_images (GladeXML *dialog, gboolean as_dialog) int i = G_N_ELEMENTS (features); while (i-- > 0) if (features [i].image != NULL && - (as_dialog || !features [i].only_for_dialog)) + (as_dialog || !features [i].only_for_dialog)) { gtk_image_set_from_file (GTK_IMAGE (WID (features [i].image)), features [i].image_file); + } } static void @@ -248,6 +249,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset, gboolean as_dialog) GtkWidget *page = WID ("accessX_page"); GObject *label; + g_return_if_fail (content != NULL); g_return_if_fail (page != NULL); @@ -466,12 +468,18 @@ GtkWidget * setup_accessX_dialog (GConfChangeSet *changeset, gboolean as_dialog) { GConfClient *client; +#if 1 char const *toplevel_name = as_dialog ? "accessX_dialog" : "accessX_page"; GladeXML *dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-accessibility-keyboard-properties.glade2", toplevel_name, NULL); GtkWidget *toplevel = WID (toplevel_name); - +#else + char const *toplevel_name = "key_access_dialog"; + GladeXML *dialog = glade_xml_new ("access-foo.glade", + toplevel_name, NULL); + GtkWidget *toplevel = WID (toplevel_name); +#endif client = gconf_client_get_default (); gconf_client_add_dir (client, CONFIG_ROOT, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c index 5d8d360a3..328f7d7ae 100644 --- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c +++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c @@ -45,7 +45,6 @@ main (int argc, char **argv) { GtkWidget *dialog; GConfChangeSet *changeset; - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -54,7 +53,7 @@ main (int argc, char **argv) GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, NULL); activate_settings_daemon (); - + changeset = NULL; dialog = setup_accessX_dialog (changeset, TRUE); g_signal_connect (G_OBJECT (dialog), |