diff --git a/ChangeLog b/ChangeLog index 3c75087ef..cd1195fc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-01-14 Bastien Nocera + + * schemas/apps_gnome_settings_daemon_keybindings.schemas.in: + Change the labels for a couple of keys, make them more of the style + of the current ones + 2004-01-08 Carlos Perelló Marín * configure.in: The localization capplet is disabled until we remove diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index d5b48d7d0..2e69e7d50 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,12 @@ +2004-01-14 Bastien Nocera + + * Makefile.am: fix compilation with FB Level enabled + * actions/acme.h: fix a stupid typo that made the WWW key not work + * gnome-settings-multimedia-keys.c: (acme_get_screen_from_event), + (acme_filter_events), (gnome_settings_multimedia_keys_init): + only get the current screen if we actually need to, fix locating the + glade file when compiling with a prefix not ending in '/' + 2004-01-13 Bastien Nocera * gnome-settings-multimedia-keys.c: (acme_filter_events): let's diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am index cc49d859e..94472cfab 100644 --- a/gnome-settings-daemon/Makefile.am +++ b/gnome-settings-daemon/Makefile.am @@ -1,10 +1,16 @@ SUBDIRS = xrdb actions +if HAVE_FB +FB_CFLAGS = -DHAVE_FB +endif + INCLUDES=$(LIBXKLAVIER_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DESD_SERVER="\"$(ESD_SERVER)\"" \ -DDATADIR="\"$(datadir)\"" \ - -DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" + -DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \ + $(FB_CFLAGS) + libexec_PROGRAMS=gnome-settings-daemon gnome_settings_daemon_SOURCES = \ diff --git a/gnome-settings-daemon/actions/acme.h b/gnome-settings-daemon/actions/acme.h index 017f8338e..2017bb40d 100644 --- a/gnome-settings-daemon/actions/acme.h +++ b/gnome-settings-daemon/actions/acme.h @@ -72,7 +72,7 @@ static struct { { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, { SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL }, { HELP_KEY, GCONF_BINDING_DIR "/help", NULL }, - { WWW_KEY, GCONF_BINDING_DIR "/www_key_str", NULL }, + { WWW_KEY, GCONF_BINDING_DIR "/www", NULL }, #ifdef USE_FBLEVEL { BRIGHT_DOWN_KEY, GCONF_BINDING_DIR "/brightness_down", NULL }, { BRIGHT_UP_KEY, GCONF_BINDING_DIR "/brightness_up", NULL }, diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c index 9b86ca0e3..acf5bb5a9 100644 --- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c +++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c @@ -814,34 +814,37 @@ do_action (int type, Acme *acme) } } +static GdkScreen * +acme_get_screen_from_event (Acme *acme, XAnyEvent *xanyev) +{ + GdkWindow *window; + GdkScreen *screen; + GSList *l; + + /* Look for which screen we're receiving events */ + for (l = acme->screens; l != NULL; l = l->next) + { + screen = (GdkScreen *) l->data; + window = gdk_screen_get_root_window (screen); + + if (GDK_WINDOW_XID (window) == xanyev->window) + { + return screen; + } + } + + return NULL; +} + static GdkFilterReturn acme_filter_events (GdkXEvent *xevent, GdkEvent *event, gpointer data) { Acme *acme = (Acme *) data; XEvent *xev = (XEvent *) xevent; XAnyEvent *xanyev = (XAnyEvent *) xevent; - GdkScreen *event_screen = NULL; guint keycode, state; - GSList *l; int i; - /* Look for which screen we're receiving events */ - for (l = acme->screens; (l != NULL) && (event_screen == NULL); - l = l->next) - { - GdkWindow *window; - GdkScreen *screen; - - screen = (GdkScreen *) l->data; - window = gdk_screen_get_root_window (screen); - - if (GDK_WINDOW_XID (window) == xanyev->window) - { - event_screen = screen; - break; - } - } - keycode = xev->xkey.keycode; state = xev->xkey.state; @@ -869,7 +872,8 @@ acme_filter_events (GdkXEvent *xevent, GdkEvent *event, gpointer data) return GDK_FILTER_CONTINUE; } - acme->current_screen = event_screen; + acme->current_screen = acme_get_screen_from_event + (acme, xanyev); do_action (keys[i].key_type, acme); return GDK_FILTER_REMOVE; @@ -890,7 +894,7 @@ gnome_settings_multimedia_keys_init (GConfClient *client) acme->conf_client = client; glade_gnome_init (); - acme->xml = glade_xml_new (DATADIR "control-center-2.0/interfaces/acme.glade", NULL, NULL); + acme->xml = glade_xml_new (DATADIR "/control-center-2.0/interfaces/acme.glade", NULL, NULL); if (acme->xml == NULL) { acme_error (_("Couldn't load the Glade file.\n" diff --git a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in index 240b161f8..a0ce869d3 100644 --- a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +++ b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in @@ -20,7 +20,7 @@ Volume mute - Volume mute key's shortcut + Volume mute's shortcut @@ -32,7 +32,7 @@ Volume down - Volume down key's shortcut. + Volume down's shortcut. @@ -55,8 +55,8 @@ string - Power - Power key's shortcut. + Log Out + Log Out's shortcut. @@ -68,7 +68,7 @@ Eject - Eject key's shortcut. + Eject's shortcut. @@ -80,7 +80,7 @@ Home Folder - My Home Folder shortcut. + My Home Folder's shortcut. @@ -92,7 +92,7 @@ Search - Search key's shortcut. + Search's shortcut. @@ -104,7 +104,7 @@ E-mail - E-mail key's shortcut. + E-mail's shortcut. @@ -116,7 +116,7 @@ Sleep - Sleep key's shortcut. + Sleep's shortcut. @@ -127,8 +127,8 @@ string - Activate Screensaver - Screensaver key's shortcut. + Lock Screen + Lock Screen's shortcut. @@ -140,7 +140,7 @@ Launch Help Browser - Help key's shortcut. + Launch Help Browser's shortcut. @@ -152,7 +152,7 @@ Launch Web Browser - World Wide Web key's shortcut. + Launch Web Browser's shortcut. @@ -164,7 +164,7 @@ Brightness down - Brightness down key's shortcut. + Brightness down's shortcut. @@ -176,7 +176,7 @@ Brightness up - Brightness up key's shortcut. + Brightness up's shortcut. @@ -187,7 +187,7 @@ string - Play CD-Rom + Play (or Play/Pause) Play (or Play/Pause) key's shortcut. @@ -199,7 +199,7 @@ string - Pause CD-Rom + Pause Pause key's shortcut. @@ -211,8 +211,8 @@ string - Stop CD-Rom - Stop key's shortcut. + Stop playback key + Stop playback key's shortcut. @@ -223,8 +223,8 @@ string - Previous CD-Rom Track - Previous (audio) key's shortcut. + Skip to Previous track + Previous track key's shortcut. @@ -235,8 +235,8 @@ string - Next CD-Rom Track - Next (audio) key's shortcut. + Skip to Next track + Next track key's shortcut.