applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the path from which we'd load the keybindings

Browse source 
2007-03-19  Bastien Nocera  <hadess@hadess.net>

	* Makefile.am:
	* gnome-keybinding-properties.c: (reload_key_entries):
	Fix the path from which we'd load the keybindings


svn path=/trunk/; revision=7398
This commit is contained in:
Bastien Nocera 2007-03-19 15:23:33 +00:00 • committed by Bastien Nocera
parent fc29de6d6b
commit b7e17af415
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
capplets/keybindings/ChangeLog
View file

@ -1,15 +1,21 @@
2007-03-19 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* gnome-keybinding-properties.c: (reload_key_entries):
Fix the path from which we'd load the keybindings
2007-02-19 Jens Granseuer <jensgr@gmx.net>
* gnome-keybinding-properties.c: (clear_old_model): clear GConf client
cache before reloading since cached values don't pass the schema name
along which can make entries vanish from the list (fixes bug 394776)
2007-02-08 Mariano Suárez-Alvarez <mariano@gnome.org>
2007-02-08 Mariano Su?rez-Alvarez <mariano@gnome.org>
* gnome-keybinding-properties.c (metacity_key_list): added
gconf:/apps/metacity/global_keybindings/cycle_group
2007-02-07 Mariano Suárez-Alvarez <mariano@gnome.org>
2007-02-07 Mariano Su?rez-Alvarez <mariano@gnome.org>
* gnome-keybinding-properties.c (clear_old_model, reload_key_entries,
cb_dialog_response, setup_dialog, main): organize the way things a cleared
@ -172,7 +178,7 @@
* gnome-keybinding-properties.c: (setup_dialog):
Use themed icon for WM hint.
2004-07-23 David Sedeño <david@alderia.com>
2004-07-23 David Sede?o <david@alderia.com>
http://bugzilla.gnome.org/show_bug.cgi?id=148208
* gnome-keybinding-properties.glade: Expand to false to the hbox1

5
capplets/keybindings/Makefile.am
View file

@ -22,7 +22,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_XML_NOMERGE_RULE@
xmldir = $(pkgdatadir)/glade
xmldir = $(pkgdatadir)/keybindings
xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
@ -30,7 +30,8 @@ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
-DGNOMECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA)

3
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -742,8 +742,7 @@ reload_key_entries (gpointer wm_name, GladeXML *dialog)
clear_old_model (dialog);
//FIXME path
dir = g_dir_open ("./", 0, NULL);
dir = g_dir_open (GNOMECC_KEYBINDINGS_DIR, 0, NULL);
if (!dir)
return;