libgnomekbd r270 - in trunk: . libgnomekbd

[svu svn gnome org]

Author: svu
Date: Sun Apr 13 10:52:15 2008
New Revision: 270
URL: http://svn.gnome.org/viewvc/libgnomekbd?rev=270&view=rev

Log:
opened 2.23 branch, dropped backup in gconf

Modified:
   trunk/configure.in
   trunk/libgnomekbd/gkbd-keyboard-config.c
   trunk/libgnomekbd/gkbd-keyboard-config.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Apr 13 10:52:15 2008
@@ -1,10 +1,10 @@
 dnl ***************************************************************************
 dnl *** configure.in for libgnomekbd                                        ***
 dnl ***************************************************************************
-AC_INIT(libgnomekbd, 2.22.0, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
+AC_INIT(libgnomekbd, 2.23.1, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
 AC_PREREQ(2.59)
 
-VERSION_INFO=2:0:0
+VERSION_INFO=3:0:0
 AC_SUBST(VERSION_INFO)
 
 AM_CONFIG_HEADER(config.h)

Modified: trunk/libgnomekbd/gkbd-keyboard-config.c
==============================================================================
--- trunk/libgnomekbd/gkbd-keyboard-config.c	(original)
+++ trunk/libgnomekbd/gkbd-keyboard-config.c	Sun Apr 13 10:52:15 2008
@@ -48,23 +48,6 @@
 	GKBD_KEYBOARD_CONFIG_KEY_OPTIONS
 };
 
-#define GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_PREFIX GKBD_CONFIG_KEY_PREFIX "/kbd.sysbackup"
-
-const gchar GKBD_KEYBOARD_CONFIG_SYSBACKUP_DIR[] =
-    GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_PREFIX;
-const gchar GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_MODEL[] =
-    GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_PREFIX "/model";
-const gchar GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_LAYOUTS[] =
-    GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_PREFIX "/layouts";
-const gchar GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_OPTIONS[] =
-    GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_PREFIX "/options";
-
-const gchar *GKBD_KEYBOARD_CONFIG_SYSBACKUP[] = {
-	GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_MODEL,
-	GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_LAYOUTS,
-	GKBD_KEYBOARD_CONFIG_SYSBACKUP_KEY_OPTIONS
-};
-
 /**
  * static common functions
  */
@@ -530,14 +513,6 @@
 }
 
 void
-gkbd_keyboard_config_load_from_gconf_backup (GkbdKeyboardConfig *
-					     kbd_config)
-{
-	gkbd_keyboard_config_load_params (kbd_config,
-					  GKBD_KEYBOARD_CONFIG_SYSBACKUP);
-}
-
-void
 gkbd_keyboard_config_load_from_x_current (GkbdKeyboardConfig * kbd_config,
 					  XklConfigRec * data)
 {
@@ -613,28 +588,6 @@
 }
 
 void
-gkbd_keyboard_config_save_to_gconf_backup (GkbdKeyboardConfig * kbd_config)
-{
-	GConfChangeSet *cs;
-	GError *gerror = NULL;
-
-	cs = gconf_change_set_new ();
-
-	gkbd_keyboard_config_save_params (kbd_config, cs,
-					  GKBD_KEYBOARD_CONFIG_SYSBACKUP);
-
-	gconf_client_commit_change_set (kbd_config->conf_client, cs, TRUE,
-					&gerror);
-	if (gerror != NULL) {
-		g_warning ("Error saving backup configuration: %s\n",
-			   gerror->message);
-		g_error_free (gerror);
-		gerror = NULL;
-	}
-	gconf_change_set_unref (cs);
-}
-
-void
 gkbd_keyboard_config_model_set (GkbdKeyboardConfig * kbd_config,
 				const gchar * model_name)
 {

Modified: trunk/libgnomekbd/gkbd-keyboard-config.h
==============================================================================
--- trunk/libgnomekbd/gkbd-keyboard-config.h	(original)
+++ trunk/libgnomekbd/gkbd-keyboard-config.h	Sun Apr 13 10:52:15 2008
@@ -64,12 +64,6 @@
 extern void gkbd_keyboard_config_save_to_gconf (GkbdKeyboardConfig *
 						kbd_config);
 
-extern void gkbd_keyboard_config_load_from_gconf_backup (GkbdKeyboardConfig
-							 * kbd_config);
-
-extern void gkbd_keyboard_config_save_to_gconf_backup (GkbdKeyboardConfig *
-						       kbd_config);
-
 extern void gkbd_keyboard_config_load_from_x_initial (GkbdKeyboardConfig *
 						      kbd_config,
 						      XklConfigRec * buf);