Commit graph

43 commits

Author SHA1 Message Date
Jens Granseuer
9c0c8e49ec add a frame to the media popup (closes bug #451674)
2007-06-29  Jens Granseuer  <jensgr@gmx.net>

	* actions/acme.glade:
	* gsd-media-keys-window.c: (gsd_media_keys_window_init): add a frame to
	the media popup (closes bug #451674)

svn path=/trunk/; revision=7803
2007-06-29 16:16:24 +00:00
Jan Arne Petersen
d2b6d5ef48 set the device property to the correct value before opening the mixer.
2007-05-28  Jan Arne Petersen  <jpetersen@jpetersen.org>

	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): set
	the device property to the correct value before opening the mixer.
	(closes bug #441552)


svn path=/trunk/; revision=7668
2007-05-28 12:25:56 +00:00
Priit Laes
a0427192af Added handler for media keybinding. Add defines for media key.
2007-03-20  Priit Laes  <plaes@svn.gnome.org>

	* gnome-settings-multimedia-keys.c: (do_media_action), (do_action): Added
	handler for media keybinding.
	* actions/acme.h: Add defines for media key.

	Introduces preferred media application support. Bug #362578.

svn path=/trunk/; revision=7404
2007-03-20 19:01:26 +00:00
Jens Granseuer
a4f80edf07 ref the master track (fixes bug #412467)
2007-02-28  Jens Granseuer  <jensgr@gmx.net>

	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): ref
	the master track (fixes bug #412467)

svn path=/trunk/; revision=7346
2007-02-28 17:08:55 +00:00
Jens Granseuer
ebb2630851 properly round volumess so that volume-up and volume-down act
2007-02-14  Jens Granseuer  <jensgr@gmx.net>

	* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_set_mute),
	(acme_volume_gstreamer_get_volume),
	(acme_volume_gstreamer_set_volume): properly round volumess so that
	volume-up and volume-down act symmetrically, ie. lowering and raising
	volume will end up at the original level (fixes bug #389996)

svn path=/trunk/; revision=7294
2007-02-14 17:17:59 +00:00
Christian Persch
43d40d7a0a Don't define directories in configure. Remove some obsolete defines, and
2007-02-02  Christian Persch  <chpe@svn.gnome.org>

	* Makefile.am:
	* capplets/about-me/Makefile.am:
	* capplets/about-me/gnome-about-me-password.c: (passdlg_init):
	* capplets/about-me/gnome-about-me.c: (about_me_setup_dialog):
	* capplets/accessibility/at-properties/Makefile.am:
	* capplets/accessibility/keyboard/Makefile.am:
	* capplets/accessibility/keyboard/accessibility-keyboard.c:
	(setup_accessX_dialog):
	* capplets/background/Makefile.am:
	* capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog):
	* capplets/common/Makefile.am:
	* capplets/common/capplet-util.c: (capplet_set_icon):
	* capplets/default-applications/Makefile.am:
	* capplets/display/Makefile.am:
	* capplets/file-types/Makefile.am:
	* capplets/file-types/file-types-capplet.c: (create_dialog):
	* capplets/file-types/mime-category-edit-dialog.c:
	(mime_category_edit_dialog_init):
	* capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init):
	* capplets/file-types/service-edit-dialog.c:
	(service_edit_dialog_init):
	* capplets/font/Makefile.am:
	* capplets/keybindings/Makefile.am:
	* capplets/keybindings/gnome-keybinding-properties.c:
	(create_dialog):
	* capplets/keyboard/Makefile.am:
	* capplets/keyboard/gnome-keyboard-properties-xkblt.c:
	(xkb_layout_choose):
	* capplets/keyboard/gnome-keyboard-properties-xkbmc.c:
	(choose_model):
	* capplets/keyboard/gnome-keyboard-properties.c: (create_dialog):
	* capplets/localization/Makefile.am:
	* capplets/localization/gnome-localization-properties.c:
	(create_dialog):
	* capplets/mime-type/Makefile.am:
	* capplets/mouse/Makefile.am:
	* capplets/mouse/gnome-mouse-properties.c: (create_dialog):
	* capplets/network/Makefile.am:
	* capplets/network/gnome-network-preferences.c:
	(cb_http_details_button_clicked), (main):
	* capplets/rollback/Makefile.am:
	* capplets/sound/Makefile.am:
	* capplets/sound/sound-properties-capplet.c: (create_dialog),
	(device_test_button_clicked):
	* capplets/theme-switcher/Makefile.am:
	* capplets/ui-properties/Makefile.am:
	* capplets/ui-properties/gnome-ui-properties.c: (create_dialog):
	* capplets/url-properties/Makefile.am:
	* capplets/windows/Makefile.am:
	* capplets/wm-properties/wm-desktops/Makefile.am:
	* configure.in:
	* gnome-settings-daemon/Makefile.am:
	* gnome-settings-daemon/actions/Makefile.am:
	* gnome-settings-daemon/gnome-settings-xmodmap.c:
	(gnome_settings_modmap_dialog_call):
	* gnome-settings-daemon/gnome-settings-xrdb.c:
	* gnome-settings-daemon/gsd-media-keys-window.c: (action_changed),
	(gsd_media_keys_window_init):
	* gnome-settings-daemon/xrdb/Makefile.am:
	* typing-break/Makefile.am:
	* vfs-methods/themus/Makefile.am: Don't define directories in
	configure. Remove some obsolete defines, and use the standard
	installation paths. Bug #395383.

svn path=/trunk/; revision=7226
2007-02-02 18:12:40 +00:00
Jens Granseuer
39ed90d6f3 round volume instead of truncating on unmute so a simple mute/unmute
2007-02-02  Jens Granseuer  <jensgr@gmx.net>

	* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_set_mute): round volume instead of
	truncating on unmute so a simple mute/unmute doesn't lower the
	volume (fixes bug #400966)

svn path=/trunk/; revision=7223
2007-02-01 22:53:22 +00:00
Jens Granseuer
5332e54d66 initialize 'vol' variable to prevent crashes/assertion failures trying to
2007-01-30  Jens Granseuer  <jensgr@gmx.net>
                                           
        * actions/acme-volume-gstreamer.c: (update_state): initialize 'vol'
        variable to prevent crashes/assertion failures trying to set
        ridiculously high/low volume (fixes bug #401376)

svn path=/trunk/; revision=7207
2007-01-30 17:26:39 +00:00
Jan Arne Petersen
a196720a15 Fixes #395083
2007-01-10  Jan Arne Petersen  <jpetersen@jpetersen.org>

	Fixes #395083

	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): added
	missing NULL-check.


svn path=/trunk/; revision=7128
2007-01-10 17:33:07 +00:00
Jan Arne Petersen
90b67faf65 Fixes #173035
2007-01-08  Jan Arne Petersen  <jpetersen@jpetersen.org>

	Fixes #173035

	* configure.in: updated sound capplet requirements.

	* gnome-settings-daemon/actions/Makefile.am:
	* gnome-settings-daemon/actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute),
	(update_state), (acme_volume_gstreamer_get_mute),
	(acme_volume_gstreamer_get_volume),
	(acme_volume_gstreamer_set_volume),
	(acme_volume_gstreamer_close_real), (_acme_set_mixer),
	(acme_volume_gstreamer_open), (acme_volume_gstreamer_init): added
	support for multiple mixer tracks. Added support for gconf device and
	track selection.

	* capplets/sound/Makefile.am, mixer-support.c, mixer-support.h: Add new files.
	* capplets/sound/sound-properties-capplet.c: (mixer_device_combobox_changed),
	(add_track_label_to_list), (mixer_tracks_selection_changed),
	(update_mixer_tracks_selection), (default_mixer_tracks_notify),
	(update_mixer_device_combobox), (default_mixer_device_notify),
	(setup_default_mixer), (setup_dialog):
	* capplets/sound/sound-properties.glade: added support for selecting mixer device and
	tracks in the capplet.


svn path=/trunk/; revision=7113
2007-01-08 22:50:39 +00:00
Christian Persch
64df6d6315 Update svn:ignore and remove .cvsignore files
svn path=/trunk/; revision=7040
2007-01-03 13:38:23 +00:00
William Jon McCann
e7ba3dd216 Add a new media keys window that takes advantage of compositing when
2006-12-07  William Jon McCann  <mccann@jhu.edu>

	* gnome-settings-daemon/Makefile.am:
	* gnome-settings-daemon/actions/Makefile.am:
	* gnome-settings-daemon/actions/acme.glade:
	* gnome-settings-daemon/actions/gnome-speakernotes-muted.png:
	* gnome-settings-daemon/actions/gnome-speakernotes.png:
	* gnome-settings-daemon/gnome-settings-multimedia-keys.c:
	(execute), (dialog_init), (unhookup_keysym), (update_kbd_cb),
	(init_kbd), (dialog_show), (do_eject_action), (do_sound_action),
	(gnome_settings_multimedia_keys_load):
	* gnome-settings-daemon/gsd-media-keys-window.c: (hide_timeout),
	(remove_hide_timeout), (add_hide_timeout), (update_window),
	(volume_controls_set_visible), (window_set_icon_name),
	(window_set_icon_file), (action_changed), (volume_level_changed),
	(volume_muted_changed), (gsd_media_keys_window_set_action),
	(gsd_media_keys_window_set_volume_muted),
	(gsd_media_keys_window_set_volume_level), (curved_rectangle),
	(draw_action_eject), (draw_waves), (draw_speaker),
	(draw_volume_boxes), (draw_action_volume), (draw_action),
	(on_expose_event), (gsd_media_keys_window_real_show),
	(gsd_media_keys_window_real_hide),
	(gsd_media_keys_window_class_init), (initialize_alpha_mode),
	(gsd_media_keys_window_init), (gsd_media_keys_window_finalize),
	(gsd_media_keys_window_new):
	* gnome-settings-daemon/gsd-media-keys-window.h:
	Add a new media keys window that takes advantage of
	compositing when available.  Fixes #383066
2006-12-07 17:54:56 +00:00
Joe Marcus Clarke
71339b526e Fixes #338849
2006-04-28  Joe Marcus Clarke <marcusi@freebsd.org>

	Fixes #338849

	* actions/acme-volume-gstreamer.c: added missing header to avoid
	64bit crash on missing prototype.
2006-04-28 10:34:16 +00:00
Bastien Nocera
8bf679ab31 remove checks for fb-level support Remove the brightness keybindings
2006-04-27  Bastien Nocera  <hadess@hadess.net>

	* configure.in: remove checks for fb-level support
	* schemas/apps_gnome_settings_daemon_keybindings.schemas.in:
	Remove the brightness keybindings (Closes: #339857)

2006-04-27  Bastien Nocera  <hadess@hadess.net>

	* gnome-keybinding-properties.c: remove brightness keybindings, as
	they duplicate with gnome-power-manager's (greater) functionality
	(Closes: #339857)

2006-04-27  Bastien Nocera  <hadess@hadess.net>

	* actions/Makefile.am:
	* actions/acme-brightness.png:
	* actions/acme-fb-level.c:
	* actions/acme-fb-level.h:
	* actions/acme.h:
	* gnome-settings-multimedia-keys.c: (do_action),
	(acme_filter_events), (gnome_settings_multimedia_keys_load):
	Remove references to the brightness controls, we have moved the
	functionality (and enhanced it!) to gnome-power-manager
	(Closes: #339857)
2006-04-27 09:50:43 +00:00
Jens Granseuer
6a122e312a Fixes #331168
2006-02-15  Jens Granseuer <jensgr@gmx.net>

	Fixes #331168

	* acme-volume-gstreamer.c (acme_volume_gstreamer_open): C89 compilation
	fixes.
2006-02-15 14:20:38 +00:00
Rodrigo Moya
37927636ab reverted commit from 2006-01-11.
2006-01-30  Rodrigo Moya <rodrigo@novell.com>

	* gnome-settings-multimedia-keys.c: reverted commit from 2006-01-11.
2006-01-30 15:02:50 +00:00
Sebastien Bacher
95ceaa7ea5 optional use of gstreamer0.10, patch based on the work
done by Saleem Abdulrasool and Tim-Philipp Mller (Fixes: #326257)
2006-01-15 21:56:50 +00:00
Sebastien Bacher
b62b47635a reviewed by: Bastien Nocera <hadess@hadess.net>
2006-01-11  Sebastien Bacher  <seb128@debian.org>

	reviewed by: Bastien Nocera <hadess@hadess.net>

	* actions/acme-fb-level.c: (acme_fblevel_error_quark),
	(acme_fblevel_new):
	* actions/acme-fb-level.h:
	* gnome-settings-multimedia-keys.c:
	(gnome_settings_multimedia_keys_load):
	cleanup messages about pmu on powerbook,
	patch by Jeroen Zwartepoorte <jeroen.zwartepoorte@gmail.com>
	(Closes: #132655)
2006-01-11 18:37:17 +00:00
Sebastien Bacher
1cd8e070fd drop the keysym/keycode binding code, it's an hack and
doesn't work fine, patch by Bastien Nocera <hadess@hadess.net>
(Closes: #133815)
2006-01-11 15:10:13 +00:00
Kjartan Maraas
564a9d03aa Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. ANSIfy
2005-11-14  Kjartan Maraas  <kmaraas@gnome.org>

	* */*: Huge cleanup. Individual ChangeLogs have info.
	Closing bug #320157.
	* libkbddraw/keyboard-drawing.h: ANSIfy some function declarations.
2005-11-14 15:18:09 +00:00
Sebastien Bacher
7b57ffb538 fix the build without gstreamer and with alsa, patch by Paul Drain
2005-08-03  Sebastien Bacher  <seb128@debian.org>

        * actions/Makefile.am: fix the build without gstreamer and with alsa,
        patch by Paul Drain <pd@cipherfunk.org> (Closes: #307368).
2005-08-03 16:38:27 +00:00
Christophe Fergeau
fc8728e747 fix crash when trying to change volume using the multimedia keys, fixes
2005-06-12  Christophe Fergeau  <teuf@gnome.org>

	* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_get_volume): fix crash when trying to change
	volume using the multimedia keys, fixes #307351
2005-06-12 11:43:01 +00:00
Ronald Bultje
6ce4e37a4f Fix mute handling, particularly for devices without hardware mute support
* actions/Makefile.am:
* actions/acme-volume-gstreamer.c:
(acme_volume_gstreamer_set_mute), (update_state),
(acme_volume_gstreamer_get_mute),
(acme_volume_gstreamer_get_volume),
(acme_volume_gstreamer_set_volume):
Fix mute handling, particularly for devices without hardware
mute support or with applications that use volume=0 for mute.
Also fix the fact that we linked against all of ALSA, OSS and
GStreamer if they were all available; default to GStreamer.
Fixes #306036.
2005-06-05 13:04:26 +00:00
Bastien Nocera
4a6eb07d1d mute properly when the system has hardware mute, patch from Pierre Ossman
2004-12-16  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-alsa.c: (acme_volume_alsa_set_mute): mute
	properly when the system has hardware mute, patch from Pierre Ossman
	<drzeus-bugzilla@drzeus.cx> (Closes: #144489)
2004-12-16 12:27:52 +00:00
Sebastien Bacher
a76902382e 2004-11-30 Sebastien Bacher <seb128@debian.org>
* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute),
	(acme_volume_gstreamer_get_mute),
	(acme_volume_gstreamer_get_volume),
	(acme_volume_gstreamer_set_volume),
	(acme_volume_gstreamer_close_real), (acme_volume_gstreamer_open),
2004-12-09 16:53:52 +00:00
Sebastien Bacher
16e644c1ad free the alsa device, after 4 seconds, with gstreamer too. Patch from
2004-11-30  Sebastien Bacher  <seb128@debian.org>

	* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute),
	(acme_volume_gstreamer_get_mute),
	(acme_volume_gstreamer_get_volume),
	(acme_volume_gstreamer_set_volume),
	(acme_volume_gstreamer_close_real), (acme_volume_gstreamer_open),
	(acme_volume_gstreamer_close), (acme_volume_gstreamer_init):
	free the alsa device, after 4 seconds, with gstreamer too.
	Patch from Arnaud Patard <Arnaud Patard> (Closes: #141793).
2004-11-30 16:46:38 +00:00
James Henstridge
ebd8e46d44 use GNOMELOCALEDIR.
2004-11-28  James Henstridge  <james@jamesh.id.au>

	* vfs-methods/themus/themus-properties-main.c: use GNOMELOCALEDIR.

	* vfs-methods/themus/Makefile.am: similar changes to the fontilus
	ones.

	* vfs-methods/fontilus/fontilus-context-menu.c: same here.

	* vfs-methods/fontilus/font-view.c: use GNOMELOCALEDIR rather than
	FONTILUS_LOCALEDIR in the bindtextdomain() call, to match the rest
	of gnome-control-center.

	* vfs-methods/fontilus/Makefile.am: similar schema and desktop
	file fixes.  Don't include the old mime files in the dist.

	* schemas/Makefile.am: remove .schemas files on clean, when
	installing schemas, look for them in builddir rather than srcdir.

	* gnome-settings-daemon/actions/Makefile.am: fix up build rules so
	that ALSA_CFLAGS isn't defined multiple times (use the newer
	automake += syntax).

	* control-center/Makefile.am: distribute $(icon_DATA).

	* capplets/*/Makefile.am: put the .desktop and .desktop.in files
	in CLEANFILES.  The .desktop.in.in file gets included because it
	is listed in the configure script.

	* configure.in: update configure script, and remove macro calls
	that are not needed by modern versions of Automake.

	* Makefile.am: remove intltool files on distclean.

	* autogen.sh: request Automake >= 1.7.
2004-11-28 08:14:05 +00:00
Christophe Fergeau
95f4986924 switch ALSA_LIBS and GST_LIBS order in libacme_la_LIBADD, fixes some
2004-10-08  Christophe Fergeau  <teuf@gnome.org>

	* gnome-settings-daemon/actions/Makefile.am: switch ALSA_LIBS and
	  GST_LIBS order in libacme_la_LIBADD, fixes some libtool link
	  issues on Debian.
2004-10-08 21:16:07 +00:00
Bastien Nocera
3c2c6c3b26 better way to look for the volume track (patch by Michal Bukovjan
2004-09-29  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_init):
	better way to look for the volume track (patch by Michal Bukovjan
	<bukovjan@mbox.dkm.cz>) (Closes: #153866)
2004-09-29 20:29:12 +00:00
Jeroen Zwartepoorte
c392d60376 Use the parent type in the G_DEFINE_TYPE macro, not its own type (fixes rh
2004-08-22  Jeroen Zwartepoorte  <jeroen@xs4all.nl>

	* actions/acme-fb-level.c: Use the parent type in the G_DEFINE_TYPE
	macro, not its own type (fixes rh #130473).
2004-08-22 12:17:03 +00:00
Bastien Nocera
3a7566628f fix a crash when there aren't any ALSA mixers (or soundcards) present on
2004-07-16  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-alsa.c: (acme_volume_alsa_finalize),
	(acme_volume_alsa_close_real), (acme_volume_alsa_open),
	(acme_volume_alsa_init): fix a crash when there aren't any ALSA mixers
	(or soundcards) present on the system
2004-07-16 22:06:35 +00:00
Bastien Nocera
daa9f3a0f6 fix OSS detection on NetBSD, patch from Julio M. Merino Vidal
2004-07-15  Bastien Nocera  <hadess@hadess.net>

	* configure.in: fix OSS detection on NetBSD, patch from Julio M.
	Merino Vidal <jmmv@menta.net> (Closes: #145038)

2004-07-15  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-oss.c: fix OSS compilation on NetBSD
2004-07-15 22:47:55 +00:00
Bastien Nocera
b5699a40ce rework the ALSA mixer so that: - the ALSA device isn't kept open at all
2004-07-15  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-alsa.c: (acme_volume_alsa_finalize),
	(acme_volume_alsa_set_mute), (acme_volume_alsa_get_mute),
	(acme_volume_alsa_get_volume), (acme_volume_alsa_set_volume),
	(acme_volume_alsa_close_real), (acme_volume_alsa_open),
	(acme_volume_alsa_close), (acme_volume_alsa_init):
	rework the ALSA mixer so that:
	- the ALSA device isn't kept open at all times, only for 4 seconds
	  after the last use (Closes: #141793)
	- the hardware mute is used if it is available
	  (Closes: #141404, #144489, #140937)
	- lowering the volume doesn't move the balance to the right
	- it doesn't leak alsa-lib mixers all around
2004-07-15 22:41:06 +00:00
Bastien Nocera
626c8e98db make AcmeVolume descend of a GObject, not itself (spotted by Mariano
2004-06-18  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume.c: make AcmeVolume descend of a GObject, not
	itself (spotted by Mariano Suárez-Alvarez <mariano@gnome.org>)
2004-06-18 09:35:21 +00:00
Bastien Nocera
6be6e425ed cleanups, and warning fixes
2004-06-15  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-fb-level.c: (acme_fblevel_init):
	* actions/acme-volume-alsa.c: (acme_volume_alsa_init),
	(acme_volume_alsa_class_init):
	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_init):
	* actions/acme-volume-oss.c: (acme_volume_oss_init),
	(acme_volume_oss_class_init):
	* actions/acme-volume.c: (acme_volume_class_init),
	(acme_volume_init): cleanups, and warning fixes

2004-06-15  Bastien Nocera  <hadess@hadess.net>

	* .cvsignore: upd
2004-06-15 15:39:36 +00:00
Thomas Vander Stichele
690c349e08 check for 0.8 of gst, not 0.7
dist gstreamer settings daemon files properly
2004-03-31 11:14:29 +00:00
Jody Goldberg
1df948d905 Release 2.6.0
2004-03-23  Jody Goldberg <jody@gnome.org>

	* Release 2.6.0
2004-03-24 02:58:55 +00:00
Bastien Nocera
c1f9cb3926 initialise GStreamer if we want to use it ;) (Patch by Christophe Fergeau
2004-03-01  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_class_init): initialise GStreamer if we
	want to use it ;) (Patch by Christophe Fergeau
	<teuf@users.sourceforge.net>) (Closes: #131316)
2004-03-01 13:38:36 +00:00
Bastien Nocera
d6b98e4435 better ALSA volume steps, using rounding up rather than normal float to
2004-02-29  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-volume-alsa.c: (acme_volume_alsa_get_volume),
	(acme_volume_alsa_set_volume): better ALSA volume steps, using
	rounding up rather than normal float to int casting
	(Closes: #124741)
2004-02-29 23:40:17 +00:00
Bastien Nocera
b87b234730 check for GStreamer, make it possible to disable ALSA support even if the
2004-02-25  Bastien Nocera  <hadess@hadess.net>

	* configure.in: check for GStreamer, make it possible to disable
	ALSA support even if the libraries are there

2004-02-25  Bastien Nocera  <hadess@hadess.net>

	* actions/Makefile.am:
	* actions/acme-volume-gstreamer.[ch]:
	* actions/acme-volume.c: (acme_volume_class_init),
	(acme_volume_new): add GStreamer mixer support
2004-02-25 18:00:37 +00:00
Anders Carlsson
8f243a9569 Link with ALSA_LIBS.
2004-02-15  Anders Carlsson  <andersca@gnome.org>

	* actions/Makefile.am: Link with ALSA_LIBS.
2004-02-15 18:32:53 +00:00
Bastien Nocera
a634112d99 - plenty of fixes for ACME integration 2004-01-14 00:22:55 +00:00
Jonathan Blandford
92999c9380 Merge in acme. We now have a variety of actions for the keybinding
Tue Jan 13 10:48:57 2004  Jonathan Blandford  <jrb@gnome.org>

        * gnome-settings-daemon: Merge in acme.  We now have a variety of
        actions for the keybinding capplet.
2004-01-13 15:59:09 +00:00