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

dropping unneeded kbd indicator's dbus server, bumping libgnomekbd version requirement

Browse source 
svn path=/trunk/; revision=8161
This commit is contained in:
Sergey V. Udaltsov 2007-10-08 17:16:09 +00:00
parent e70244159a
commit 72db6fd6de
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-10-08 Sergey Udaltsov <svu@gnome.org>
* configure.in: bumping libgnomekbd requirement to 2.21.1
2007-10-02 Jens Granseuer <jensgr@gmx.net> 2007-10-02 Jens Granseuer <jensgr@gmx.net>
Patch by: Stephane Loeuillet <leroutier@gmail.com> Patch by: Stephane Loeuillet <leroutier@gmail.com>

6
configure.in
View file

@ -109,7 +109,7 @@ PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0) PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
PKG_CHECK_MODULES(METACITY, libmetacity-private) PKG_CHECK_MODULES(METACITY, libmetacity-private)
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.13 gconf-2.0 gtk+-2.0) PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
dnl dnl
dnl Check for Xft version 2; we build in extra functionality to the font capplet dnl Check for Xft version 2; we build in extra functionality to the font capplet
@ -182,11 +182,11 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
dnl ============== dnl ==============
dnl gswitchit dnl gswitchit
dnl ============== dnl ==============
PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 0.1 libxklavier >= 3.2]) PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21 libxklavier >= 3.2])
AC_SUBST(LIBGNOMEKBD_CFLAGS) AC_SUBST(LIBGNOMEKBD_CFLAGS)
AC_SUBST(LIBGNOMEKBD_LIBS) AC_SUBST(LIBGNOMEKBD_LIBS)
PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 0.1]) PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.21])
AC_SUBST(LIBGNOMEKBDUI_CFLAGS) AC_SUBST(LIBGNOMEKBDUI_CFLAGS)
AC_SUBST(LIBGNOMEKBDUI_LIBS) AC_SUBST(LIBGNOMEKBDUI_LIBS)

4
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,7 @@
2007-10-08 Sergey Udaltsov <svu@gnome.org>
* gnome-settings-keyboard-xkb.c: dropping unneeded dbus server
2007-08-22 Sergey Udaltsov <svu@gnome.org> 2007-08-22 Sergey Udaltsov <svu@gnome.org>
* gnome-settings-keyboard-xkb.c: initializing current_*config early, * gnome-settings-keyboard-xkb.c: initializing current_*config early,

5
gnome-settings-daemon/gnome-settings-keyboard-xkb.c
View file

@ -35,7 +35,6 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <libgnomekbd/gkbd-config-registry.h>
#include <libgnomekbd/gkbd-desktop-config.h> #include <libgnomekbd/gkbd-desktop-config.h>
#include <libgnomekbd/gkbd-keyboard-config.h> #include <libgnomekbd/gkbd-keyboard-config.h>
@ -392,7 +391,6 @@ gnome_settings_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
void void
gnome_settings_keyboard_xkb_init (GConfClient * client) gnome_settings_keyboard_xkb_init (GConfClient * client)
{ {
GObject *reg = NULL;
#ifdef GSDKX #ifdef GSDKX
xkl_set_debug_level (200); xkl_set_debug_level (200);
logfile = fopen ("/tmp/gsdkx.log", "a"); logfile = fopen ("/tmp/gsdkx.log", "a");
@ -424,9 +422,6 @@ gnome_settings_keyboard_xkb_init (GConfClient * client)
xkl_engine_start_listen (xkl_engine, xkl_engine_start_listen (xkl_engine,
XKLL_MANAGE_LAYOUTS | XKLL_MANAGE_LAYOUTS |
XKLL_MANAGE_WINDOW_STATES); XKLL_MANAGE_WINDOW_STATES);
reg =
g_object_new (gkbd_config_registry_get_type (), NULL);
} }
} }