diff -crN ./acme/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/configure.in *** ./acme/configure.in Sat Feb 1 19:14:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/configure.in Mon Apr 28 16:03:51 2003 *************** *** 4,17 **** AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) - AC_DEFINE(PACKAGE, AC_PACKAGE_NAME, [package name]) - AC_DEFINE(VERSION, AC_PACKAGE_VERSION, [package version]) AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo]) GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_PROG_INTLTOOL([0.20]) GOB2_CHECK() PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeui-2.0 libglade-2.0 libwnck-1.0 >= 2.1.5) --- 4,20 ---- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo]) GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_PROG_INTLTOOL([0.20]) + AC_PATH_XTRA + if test "$X_DISPLAY_MISSING" != ""; then + AC_MSG_ERROR([X11 not available]) + fi + GOB2_CHECK() PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeui-2.0 libglade-2.0 libwnck-1.0 >= 2.1.5) diff -crN ./acme/src/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/Makefile.am *** ./acme/src/Makefile.am Sat Feb 1 19:33:47 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/Makefile.am Mon Apr 28 16:04:30 2003 *************** *** 49,55 **** acme_LDFLAGS = \ $(EXTRA_GNOME_LIBS) \ $(ALSA_LIBS) \ ! $(INTLLIBS) acme_properties_SOURCES = \ acme-properties.c \ --- 49,57 ---- acme_LDFLAGS = \ $(EXTRA_GNOME_LIBS) \ $(ALSA_LIBS) \ ! $(INTLLIBS) \ ! $(X_LIBS) \ ! -lX11 acme_properties_SOURCES = \ acme-properties.c \ *************** *** 80,86 **** acme_properties_LDFLAGS = \ $(EXTRA_GNOME_LIBS) \ ! $(INTLLIBS) EXTRA_DIST = \ $(Data_DATA) \ --- 82,90 ---- acme_properties_LDFLAGS = \ $(EXTRA_GNOME_LIBS) \ ! $(INTLLIBS) \ ! $(X_LIBS) \ ! -lX11 EXTRA_DIST = \ $(Data_DATA) \ diff -crN ./acme/src/acme.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/acme.c *** ./acme/src/acme.c Sat Feb 1 19:13:20 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/acme.c Mon Apr 28 16:05:08 2003 *************** *** 76,82 **** ICON_MUTED, ICON_LOUD, ICON_BRIGHT, ! ICON_EJECT, }; static void init_tray (Acme *acme); --- 76,82 ---- ICON_MUTED, ICON_LOUD, ICON_BRIGHT, ! ICON_EJECT }; static void init_tray (Acme *acme); diff -crN ./acme/src/acme.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/acme.h *** ./acme/src/acme.h Tue Jan 7 19:25:56 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/acme.h Mon Apr 28 16:05:27 2003 *************** *** 58,64 **** BRIGHT_DOWN_KEY, BRIGHT_UP_KEY, #endif ! HANDLED_KEYS, }; --- 58,64 ---- BRIGHT_DOWN_KEY, BRIGHT_UP_KEY, #endif ! HANDLED_KEYS }; diff -crN ./acme/src/eggcellrendererkeys.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/eggcellrendererkeys.c *** ./acme/src/eggcellrendererkeys.c Wed Jan 8 17:34:51 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/eggcellrendererkeys.c Mon Apr 28 16:06:04 2003 *************** *** 584,590 **** void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint keyval, ! GdkModifierType mask) { char *text; gboolean changed; --- 584,590 ---- void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint keyval, ! EggVirtualModifierType mask) { char *text; gboolean changed; *************** *** 625,631 **** void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, guint *keyval, ! GdkModifierType *mask) { g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); --- 625,631 ---- void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, guint *keyval, ! EggVirtualModifierType *mask) { g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); diff -crN ./acme/src/eggcellrendererkeys.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/eggcellrendererkeys.h *** ./acme/src/eggcellrendererkeys.h Wed Jan 8 17:34:51 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/eggcellrendererkeys.h Mon Apr 28 16:06:18 2003 *************** *** 39,45 **** typedef enum { EGG_CELL_RENDERER_KEYS_MODE_GTK, ! EGG_CELL_RENDERER_KEYS_MODE_X, } EggCellRendererKeysMode; struct _EggCellRendererKeys --- 39,45 ---- typedef enum { EGG_CELL_RENDERER_KEYS_MODE_GTK, ! EGG_CELL_RENDERER_KEYS_MODE_X } EggCellRendererKeysMode; struct _EggCellRendererKeys diff -crN ./acme/src/g-volume.gob /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/g-volume.gob *** ./acme/src/g-volume.gob Thu Sep 19 01:53:56 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./acme/src/g-volume.gob Mon Apr 28 16:07:00 2003 *************** *** 26,36 **** { ARG = volume_oss_get_volume (VOLUME_OSS (self->_priv->volume_object)); - goto get_volume_end; } #endif ! ARG = 0; ! get_volume_end: } set { --- 26,35 ---- { ARG = volume_oss_get_volume (VOLUME_OSS (self->_priv->volume_object)); } + else #endif ! ARG = 0; } set { *************** *** 47,56 **** { volume_oss_set_volume (VOLUME_OSS (self->_priv->volume_object), ARG); - goto set_volume_end; } #endif - set_volume_end: }; /* the current muting status */ --- 46,53 ---- *************** *** 70,80 **** { ARG = volume_oss_get_mute (VOLUME_OSS (self->_priv->volume_object)); - goto get_mute_end; } #endif ! ARG = FALSE; ! get_mute_end: } set { --- 67,76 ---- { ARG = volume_oss_get_mute (VOLUME_OSS (self->_priv->volume_object)); } + else #endif ! ARG = FALSE; } set { *************** *** 92,101 **** volume_oss_set_mute (VOLUME_OSS (self->_priv->volume_object), ARG); - goto set_mute_end; } #endif - set_mute_end: }; public gboolean use_pcm = FALSE; --- 88,95 ---- *************** *** 106,115 **** { ARG = volume_oss_get_use_pcm (VOLUME_OSS (self->_priv->volume_object)); - goto set_use_pcm_end; } #endif - set_use_pcm_end: } set { --- 100,107 ---- *************** *** 118,127 **** { volume_oss_set_use_pcm (VOLUME_OSS (self->_priv->volume_object), ARG); - goto set_use_pcm_end; } #endif - set_use_pcm_end: }; --- 110,117 ----