summaryrefslogtreecommitdiff
path: root/capplets/sound
diff options
context:
space:
mode:
Diffstat (limited to 'capplets/sound')
-rw-r--r--capplets/sound/.cvsignore9
-rw-r--r--capplets/sound/ChangeLog401
-rw-r--r--capplets/sound/Makefile.am24
-rw-r--r--capplets/sound/sound-capplet.pngbin4655 -> 0 bytes
-rw-r--r--capplets/sound/sound-properties-capplet.c258
-rw-r--r--capplets/sound/sound-properties.glade359
-rw-r--r--capplets/sound/sound.desktop.in13
-rw-r--r--capplets/sound/visual-bell.pngbin2357 -> 0 bytes
8 files changed, 0 insertions, 1064 deletions
diff --git a/capplets/sound/.cvsignore b/capplets/sound/.cvsignore
deleted file mode 100644
index f1494e164..000000000
--- a/capplets/sound/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-*.o
-gnome-sound-properties
-sound.desktop
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
deleted file mode 100644
index f64235df5..000000000
--- a/capplets/sound/ChangeLog
+++ /dev/null
@@ -1,401 +0,0 @@
-2003-10-28 Jody Goldberg <jody@gnome.org>
-
- * Release 2.5.0
-
-2003-08-01 Dennis Cranston <dennis_cranston at yahoo com>
-
- * sound-properties-capplet.c: Patch to fix spacing between action
- area and vbox of preferences dialog.
-
-2003-07-11 Dennis Cranston <dennis_cranston at yahoo com>
-
- * sound-properties.glade, sound-properties-capplet.c:
- More fixes for ui-review bug number 99533.
-
-2003-07-07 Jody Goldberg <jody@gnome.org>
-
- * Release 2.3.4
-
-2003-07-07 Calum Benson <calum.benson@sun.com>
-
- * visual-bell.png:
- Replace Bill's placeholder icon before the UI freeze :)
-
-2003-06-24 Jody Goldberg <jody@gnome.org>
-
- * Release 2.3.3
-
-Fri Jun 6 19:16:43 2003 Jonathan Blandford <jrb@gnome.org>
-
- * sound-properties-capplet.c (bell_flash_to_widget),
- (bell_flash_from_widget): Use a peditor for the visual bell
- instead.
-
-2003-06-06 Bill Haneman <bill.haneman@sun.com>
-
- * sound-properties.glade:
- Added page tab and UI from "visual bell" capplet
- (UI originally from Calum, except for ugly icon)
-
- * visual-bell.png:
- Ugly new icon which needs TLC from Calum.
-
- * sound-properties-capplet.c:
- Added gconf keys for visual bell feature and control of
- audio bell.
- (visual_bell_type_changed): New, called when visual bell radiobuttons
- are toggled.
- (create_dialog):
- Set the image on the "System Bell" notebook tab.
- (setup_dialog):
- Added peditors for visual-bell and audio-bell checkboxes/gconf keys.
- Added guards for the visual-bell type buttons, controlled by
- the visual-bell-enabling checkbox.
- Connected visual_bell_type_changed to "toggled" signal on radiobuttons.
-
-2003-05-07 Jody Goldberg <jody@gnome.org>
-
- * Release 2.3.1
-
-2003-04-30 Alex Duggan <aldug@astrolinux.com>
-
- * sound-properties-capplet.c: use appropriate
- window border icon.
-
-2003-04-29 Kjartan Maraas <kmaraas@gnome.org>
-
- * sound-properties-capplet.c: (main): Plug a leak.
-
-Tue Feb 4 17:09:18 2003 Jonathan Blandford <jrb@redhat.com>
-
- * Release 2.2.0.1
-
-Tue Jan 21 01:15:14 2003 Jonathan Blandford <jrb@gnome.org>
-
- * Release 2.2.0
-
-Thu Jan 16 02:41:09 2003 Jonathan Blandford <jrb@gnome.org>
-
- * Release 2.1.7
-
-2003-01-10 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.6
-
-2002-12-18 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.5
-
-2002-11-23 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.3
-
-2002-11-02 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.2
-
-2002-10-21 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.1
-
-2002-10-08 Deepa Natarajan <deepa.natarajan@wipro.com>
-
- *sound-properties.glade: Remove mnemonics for notebook tabs.
- Fixes bug# 94160.
-
-2002-10-01 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.0.1
-
-2002-08-21 Jody Goldberg <jody@gnome.org>
-
- * Release 2.1.0
-
-2002-08-19 Ross Burton <ross@burtonini.com>
-
- * sound.desktop.in: Fix the desktop file so that it validates.
-
-2002-07-31 Federico Mena Quintero <federico@ximian.com>
-
- * sound-properties-capplet.c (main): Do not pass -1 for the dialog
- flags; just pass GTK_DIALOG_NO_SEPARATOR. Fixes #89408 and #88614.
-
-2002-06-17 Jody Goldberg <jody@gnome.org>
-
- * Release 2.0.0
-
-2002-05-28 Satyajit Kanungo <satyajit.kanungo@wipro.com>
-
- * sound-properties-capplet.c : Changed the help file link
- to get the help document from user-guide.
-
-2002-05-26 Jody Goldberg <jody@gnome.org>
-
- * sound-properties-capplet.c (dialog_button_clicked_cb) : Improve
- handling of help failures.
-
-Sun May 26 11:32:09 2002 Jonathan Blandford <jrb@gnome.org>
-
- * sound-properties-capplet.c (main): use APPID instead of argv[0]
-
-2002-05-08 Jody Goldberg <jody@gnome.org>
-
- * sound-properties-capplet.c (dialog_button_clicked_cb) : fix help path
-
-2002-05-07 Jody Goldberg <jody@gnome.org>
-
- * sound-properties-capplet.c (main) : add help.
- (dialog_button_clicked_cb) : support help and support WM based exit.
-
-Wed Apr 10 18:05:30 2002 Jonathan Blandford <jrb@gnome.org>
-
- * sound.desktop.in (Exec): s/gnome2/gnome
-
-2002-03-27 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties.glade: Add mnemonics.
-
- * sound-properties-capplet.c (create_dialog): Connect to
- properties so we know when to save.
-
-2002-03-27 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties.glade: Add mnemonics.
-
- * sound-properties-capplet.c (create_dialog): Connect to
- properties so we know when to save.
-
-2002-03-10 Seth Nickell <snickell@stanford.edu>
-
- * main.c: (main):
- * sound-properties-capplet.c: (main):
-
- Activate the settings daemon if its not already running.
-
-2002-03-07 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties-capplet.c (main): Okay, so I'm an idiot.
-
-2002-03-06 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties-capplet.c (main): Remove textdomain stuff.
- I'm not 100% certain this is correct, but none of the other capplets
- have it.
-
-2002-03-07 Lauris Kaplinski <lauris@ximian.com>
-
- * sound-properties-capplet.c: Do not include unused <esd.h>
-
-2002-02-27 Kjartan Maraas <kmaraas@gnome.org>
-
- * sound-properties-capplet.c: s/PACKAGE/GETTEXT_PACKAGE/g
-
-2002-02-11 Seth Nickell <snickell@stanford.edu>
-
- * sound-properties-capplet.c: (setup_dialog),
- (dialog_button_clicked_cb), (main):
-
- Convert to instant apply.
-
-2002-02-04 Lauris Kaplinski <lauris@ximian.com>
-
- * sound-properties-capplet.c (create_dialog): Use g_object_set_data,
- use g_signal_connect
- (dialog_button_clicked_cb): GtkDialog instead of GnomeDialog
- (create_dialog): Use gtk_widget_set_size_request
-
-2002-01-27 Seth Nickell <snickell@stanford.edu>
-
- * sound.desktop.in:
-
- Add categories field to .desktop file.
-
-2002-01-19 Seth Nickell <snickell@stanford.edu>
-
- * Makefile.am:
-
- Install icons into the pixmaps directory so the Panel
- & Nautilus will pick up on them.
-
-2002-01-14 Bradford Hovinen <hovinen@ximian.com>
-
- * Makefile.am (bin_PROGRAMS): Rename binary gnome2-sound-properties
-
-2002-01-08 Richard Hestilow <hestilow@ximian.com>
-
- * Port to GNOME 2.0.
-
-2001-11-18 Richard Hestilow <hestilow@ximian.com>
-
- * Makefile.am (sound_properties_control_LDADD): Add libsounds.a.
-
- * prefs-widget.c (apply_settings): Export our settings to
- gnome-config (needed by gnome-libs). Also save and reload event
- sounds.
- (create_dialog): Add a SoundView on the sound events.
-
- * sound-properties.glade: Add a tab for the sound events.
-
-2001-10-12 Bradford Hovinen <hovinen@ximian.com>
-
- * Makefile.am: Make OAF file creation generic
-
-2001-09-28 Bradford Hovinen <hovinen@ximian.com>
-
- * Makefile.am: Remove support for disabling bonobo-conf build
-
- * Makefile.am: Change the binary name to
- mouse-properties-control and create a wrapper script from
- ../common/wrapper-script.in to be named mouse-properties-capplet
-
-2001-07-31 Chema Celorio <chema@celorio.com>
-
- * Makefile.am (cappletname): add DISTDIR to install-data-local
-
-2001-07-27 Bradford Hovinen <hovinen@ximian.com>
-
- * RELEASE : 1.5.2
-
-2001-07-25 Chema Celorio <chema@celorio.com>
-
- * Makefile.am: remove the OAF_FILE_IN_RULE and copy it here
- * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here
-
-2001-07-25 Bradford Hovinen <hovinen@ximian.com>
-
- * prefs-widget.c (prefs_widget_init): Fix macro name
-
- * main.c (main): Fix macro name
-
-2001-07-24 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties-capplet.c (main): Pass in legacy files to
- capplet_init.
- (get_legacy_settings): Use the "Main" config prefix.
-
-2001-07-23 Bradford Hovinen <hovinen@ximian.com>
-
- * sound-properties-capplet.c (apply_settings): Make sure ESD gets
- killed if it's supposed to
-
-2001-07-20 Chema Celorio <chema@celorio.com>
-
- * RELEASE : 1.5.0
-
-2001-07-19 Bradford Hovinen <hovinen@ximian.com>
-
- * Makefile.am: Remove SUBDIRS
- Remove extraneous EXTRA_DIST
- Make sure to include defaults and OAF info files
-
-2001-07-18 Bradford Hovinen <hovinen@ximian.com>
-
- * Bonobo_Control_Capplet_sound_properties.oaf: Update for new
- binary name
-
-2001-07-18 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties-capplet.c (create_dialog): Revert that.
-
-2001-07-18 Richard Hestilow <hestilow@ximian.com>
-
- * sound-properties-capplet.c (create_dialog): Change to reflect
- new prototype.
-
-2001-07-17 Chema Celorio <chema@celorio.com>
-
- * Makefile.am (SUBDIRS): clean
-
-2001-07-17 Bradford Hovinen <hovinen@ximian.com>
-
- * sound-properties-capplet.c (create_dialog): Implement
- (main): Call glade_gnome_init; pass create_dialog to capplet_init
- (setup_dialog): Retrieve the Glade data from the widget passed to
- this function
- (create_dialog): Make sure dialog is destroyed when widget is
-
- * Makefile.am (EXTRA_DIST): Changed Applications_DATA to
- Applications_in_files
- (INCLUDES): Add -DGLADE_DATADIR
-
- * sound-properties-capplet.c (setup_dialog): Sensitize events
- check box only if ESD is already enabled
-
- * sound-properties.glade: Prune dialog down to the two check
- buttons
-
-2001-07-13 Bradford Hovinen <hovinen@ximian.com>
-
- * sound-properties-capplet.c (set_moniker_cb): Resolve
- configuration database and store in property frame
- (apply_cb): Retrieve configuration database from property frame
- (create_control_cb): Don't store config database in property
- control
- (create_control_cb): Add listener for property change in config
- database
- (changed_cb): Implement
-
-2001-07-12 Bradford Hovinen <hovinen@ximian.com>
-
- * sound-properties-capplet.c (apply_settings): Disable launch of
- esd, due to esd's general suckiness
-
- * sound-properties.xml: Update to use correct names for settings
-
- * sound-properties-capplet.c (set_moniker_cb): Change event_sound
- to event_sounds
-
-2001-07-10 Bradford Hovinen <hovinen@ximian.com>
-
- * sound-properties-capplet.c (set_moniker_cb): Make full moniker
- (apply_settings): Release the return value
- (main): Support --get-legacy option
- (get_legacy_settings): Implement
- (create_control_cb): Connect apply_cb
- (COPY_FROM_LEGACY): Use bonobo_config_set_...
- (main): Open config database regardless of what operation is
- requested; pass to create_control callback
- (apply_settings): Use bonobo_config_get_...
- (get_legacy_settings):
- (apply_settings): Don't accept CORBA_Environment *ev any more
- (create_control_cb): Store the config database in the property control
- (apply_settings): Use the correct setting name
- (apply_cb): Apply settings and sync
- (apply_settings): Kill esd when requested
- (get_legacy_settings): Sync database
-
- * sound-properties.xml: Fixed path name
-
-2001-07-09 Bradford Hovinen <hovinen@ximian.com>
-
- * sound-properties.xml: Use 0 and 1 rather than true and false
-
- * sound-properties-capplet.c (create_control_cb): Implement
- (main): Use create_control_cb
-
- * Bonobo_Control_Capplet_sound_properties.oaf: Use PropertyControl interface
-
- * sound-properties-capplet.c (create_dialog_cb): Update signature
- for use as a BonoboPropertyControlGetControlFn
-
- * Makefile.am (defaults_DATA): Add sound-properties.xml
- (EXTRA_DIST): Add defaults_DATA
-
- * sound-properties-capplet.c (close_cb): Don't destroy the widget
- -- it's already destroyed
-
-2001-06-07 Christian Rose <menthos@menthos.com>
-
- * sound-properties.desktop: Modified Swedish translation.
-
-2001-04-27 Bradford Hovinen <hovinen@ximian.com>
-
- * preferences.c (category_read_xml): Make description a child node
- rather than an attribute
- (sound_event_read_xml): Make name an attribute rather than a child
- node
-
-2000-10-08 Bradford Hovinen <hovinen@helixcode.com>
-
- * Makefile.am (EXTRA_DIST): Add translation file
-
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
deleted file mode 100644
index a892489f2..000000000
--- a/capplets/sound/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-bin_PROGRAMS = gnome-sound-properties
-
-gnome_sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(SOUND_CAPPLET_LIBS) $(top_builddir)/libsounds/libsounds.a
-gnome_sound_properties_SOURCES = sound-properties-capplet.c
-
-@INTLTOOL_DESKTOP_RULE@
-
-Gladedir = $(GNOMECC_GLADE_DIR)
-Glade_DATA = sound-properties.glade
-
-iconsdir = $(GNOMECC_ICONS_DIR)
-icons_DATA = sound-capplet.png
-
-desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR)
-desktop_icons_DATA = sound-capplet.png visual-bell.png
-
-desktopdir = $(GNOMECC_DESKTOP_DIR)
-Desktop_in_files = sound.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS)
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA) $(Desktop_in_files)
-
diff --git a/capplets/sound/sound-capplet.png b/capplets/sound/sound-capplet.png
deleted file mode 100644
index 12a18763b..000000000
--- a/capplets/sound/sound-capplet.png
+++ /dev/null
Binary files differ
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
deleted file mode 100644
index 2257dfcf3..000000000
--- a/capplets/sound/sound-properties-capplet.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -*- mode: c; style: linux -*- */
-
-/* sound-properties-capplet.c
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Written by Bradford Hovinen <hovinen@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gconf/gconf-client.h>
-
-#include "capplet-util.h"
-#include "gconf-property-editor.h"
-#include "libsounds/sound-view.h"
-
-#include <glade/glade.h>
-
-/* Needed only for the sound capplet */
-
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include "activate-settings-daemon.h"
-
-#define ENABLE_ESD_KEY "/desktop/gnome/sound/enable_esd"
-#define EVENT_SOUNDS_KEY "/desktop/gnome/sound/event_sounds"
-#define VISUAL_BELL_KEY "/apps/metacity/general/visual_bell"
-#define AUDIO_BELL_KEY "/apps/metacity/general/audible_bell"
-#define VISUAL_BELL_TYPE_KEY "/apps/metacity/general/visual_bell_type"
-
-/* Capplet-specific prototypes */
-
-static SoundProperties *props = NULL;
-
-static void
-props_changed_cb (SoundProperties *p, SoundEvent *event, gpointer data)
-{
- sound_properties_user_save (p);
-}
-
-
-
-static GConfEnumStringPair bell_flash_enums[] = {
- { 0, "frame_flash" },
- { 1, "fullscreen_flash" },
- { -1, NULL }
-};
-
-static GConfValue *
-bell_flash_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
-{
- GConfValue *new_value;
-
- new_value = gconf_value_new (GCONF_VALUE_STRING);
- gconf_value_set_string (new_value,
- gconf_enum_to_string (bell_flash_enums, gconf_value_get_int (value)));
-
- return new_value;
-}
-
-static GConfValue *
-bell_flash_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
-{
- GConfValue *new_value;
- const gchar *str;
- gint val = 2;
-
- str = (value && (value->type == GCONF_VALUE_STRING)) ? gconf_value_get_string (value) : NULL;
-
- new_value = gconf_value_new (GCONF_VALUE_INT);
- if (value->type == GCONF_VALUE_STRING) {
- gconf_string_to_enum (bell_flash_enums,
- str,
- &val);
- }
- gconf_value_set_int (new_value, val);
-
- return new_value;
-}
-
-/* create_dialog
- *
- * Create the dialog box and return it as a GtkWidget
- */
-
-static GladeXML *
-create_dialog (void)
-{
- GladeXML *dialog;
- GtkWidget *widget, *box;
-
- dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", "prefs_widget", NULL);
- widget = glade_xml_get_widget (dialog, "prefs_widget");
- g_object_set_data (G_OBJECT (widget), "glade-data", dialog);
-
- props = sound_properties_new ();
- sound_properties_add_defaults (props, NULL);
- g_signal_connect (G_OBJECT (props), "event_changed",
- (GCallback) props_changed_cb, NULL);
- box = glade_xml_get_widget (dialog, "events_vbox");
- gtk_box_pack_start (GTK_BOX (box), sound_view_new (props),
- TRUE, TRUE, 0);
-
- g_signal_connect_swapped (G_OBJECT (widget), "destroy",
- (GCallback) gtk_object_destroy, props);
-
- gtk_image_set_from_file (GTK_IMAGE (WID ("bell_image")),
- GNOMECC_DATA_DIR "/pixmaps/visual-bell.png");
-
- gtk_widget_set_size_request (widget, -1, 250); /* Can this be right? Seems broken for large fonts. */
-
- return dialog;
-}
-
-/* setup_dialog
- *
- * Set up the property editors for our dialog
- */
-
-static void
-setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
-{
- GObject *peditor;
-
- peditor = gconf_peditor_new_boolean (NULL, ENABLE_ESD_KEY, WID ("enable_toggle"), NULL);
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_toggle"));
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_vbox"));
-
- gconf_peditor_new_boolean (NULL, EVENT_SOUNDS_KEY, WID ("events_toggle"), NULL);
-
- gconf_peditor_new_boolean (NULL, AUDIO_BELL_KEY, WID ("bell_audible_toggle"), NULL);
-
- peditor = gconf_peditor_new_boolean (NULL, VISUAL_BELL_KEY, WID ("bell_visual_toggle"), NULL);
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("bell_flash_vbox"));
-
- /* peditor not so convenient for the radiobuttons */
- gconf_peditor_new_select_radio (NULL,
- VISUAL_BELL_TYPE_KEY,
- gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("bell_flash_window_radio"))),
- "conv-to-widget-cb", bell_flash_to_widget,
- "conv-from-widget-cb", bell_flash_from_widget,
- NULL);
-}
-
-/* get_legacy_settings
- *
- * Retrieve older gnome_config -style settings and store them in the
- * configuration database.
- *
- * In most cases, it's best to use the COPY_FROM_LEGACY macro defined in
- * capplets/common/capplet-util.h.
- */
-
-static void
-get_legacy_settings (void)
-{
- GConfClient *client;
- gboolean val_bool, def;
-
- client = gconf_client_get_default ();
- COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/enable_esd", "/sound/system/settings/start_esd=false");
- COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/event_sounds", "/sound/system/settings/event_sounds=false");
- g_object_unref (G_OBJECT (client));
-}
-
-static void
-dialog_button_clicked_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changeset)
-{
- if (response_id == GTK_RESPONSE_HELP)
- capplet_help (GTK_WINDOW (dialog),
- "wgoscustdesk.xml",
- "goscustmulti-2");
- else
- gtk_main_quit ();
-}
-
-int
-main (int argc, char **argv)
-{
- GConfClient *client;
- GConfChangeSet *changeset;
- GladeXML *dialog = NULL;
- GtkWidget *dialog_win;
-
- static gboolean apply_only;
- static gboolean get_legacy;
- static struct poptOption cap_options[] = {
- { "apply", '\0', POPT_ARG_NONE, &apply_only, 0,
- N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL },
- { "init-session-settings", '\0', POPT_ARG_NONE, &apply_only, 0,
- N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL },
- { "get-legacy", '\0', POPT_ARG_NONE, &get_legacy, 0,
- N_("Retrieve and store legacy settings"), NULL },
- { NULL, '\0', 0, NULL, 0, NULL, NULL }
- };
-
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
- gnome_program_init ("gnome-sound-properties", VERSION,
- LIBGNOMEUI_MODULE, argc, argv,
- GNOME_PARAM_POPT_TABLE, cap_options,
- NULL);
-
- activate_settings_daemon ();
-
- client = gconf_client_get_default ();
- gconf_client_add_dir (client, "/desktop/gnome/sound", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- gconf_client_add_dir (client, "/apps/metacity/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
- if (get_legacy) {
- get_legacy_settings ();
- } else {
- changeset = gconf_change_set_new ();
- dialog = create_dialog ();
- setup_dialog (dialog, changeset);
-
- dialog_win = gtk_dialog_new_with_buttons
- (_("Sound preferences"), NULL, GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- NULL);
-
- gtk_container_set_border_width (GTK_CONTAINER (dialog_win), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG(dialog_win)->vbox), 2);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog_win), GTK_RESPONSE_CLOSE);
- g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, 0);
- capplet_set_icon (dialog_win, "sound-capplet.png");
- gtk_widget_show_all (dialog_win);
-
- gtk_main ();
- gconf_change_set_unref (changeset);
- }
-
- g_object_unref (dialog);
- return 0;
-}
diff --git a/capplets/sound/sound-properties.glade b/capplets/sound/sound-properties.glade
deleted file mode 100644
index a414420eb..000000000
--- a/capplets/sound/sound-properties.glade
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="window1">
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Sound Preferences</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
-
- <child>
- <widget class="GtkNotebook" id="prefs_widget">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox5">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkCheckButton" id="enable_toggle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">E_nable sound server startup</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="enable_toggled_cb"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="events_toggle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Sounds for events</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="events_toggled_cb"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="events_vbox">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sound Events</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="bell_vbox">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkImage" id="bell_image">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkCheckButton" id="bell_audible_toggle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Sound an audible bell</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="GtkCheckButton" id="bell_visual_toggle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Visual feedback:</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</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="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">1</property>
-
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="width_request">20</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="bell_flash_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkRadioButton" id="bell_flash_window_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Flash _window titlebar</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</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="GtkRadioButton" id="bell_flash_screen_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Flash _entire screen</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">bell_flash_window_radio</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">System Bell</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/capplets/sound/sound.desktop.in b/capplets/sound/sound.desktop.in
deleted file mode 100644
index f1f813108..000000000
--- a/capplets/sound/sound.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Sound
-_Comment=Enable sound and associate sounds with events
-Exec=gnome-sound-properties
-Icon=gnome-audio.png
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;Application;Settings;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=control-center
-X-GNOME-Bugzilla-Component=sound
diff --git a/capplets/sound/visual-bell.png b/capplets/sound/visual-bell.png
deleted file mode 100644
index 91fb9490d..000000000
--- a/capplets/sound/visual-bell.png
+++ /dev/null
Binary files differ