Tidy up xfcekbd-util.{c,h}

src/xfcekbd-config-private.h

@@ -25,11 +25,6 @@
 
 #define XFCEKBD_CONFIG_SCHEMA "org.mate.peripherals-keyboard-xkb"
 
-extern const gchar MATEKBD_PREVIEW_CONFIG_KEY_X[];
-extern const gchar MATEKBD_PREVIEW_CONFIG_KEY_Y[];
-extern const gchar MATEKBD_PREVIEW_CONFIG_KEY_WIDTH[];
-extern const gchar MATEKBD_PREVIEW_CONFIG_KEY_HEIGHT[];
-
 /**
  * General config functions (private)
  */

src/xfcekbd-util.c

@@ -33,85 +33,6 @@
 
 #include <xfcekbd-config-private.h>
 
-static void
-xfcekbd_log_appender (const char file[], const char function[],
-		   int level, const char format[], va_list args)
-{
-	time_t now = time (NULL);
-	g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t",
-	       (long) now, level, file, function);
-	g_logv (NULL, G_LOG_LEVEL_DEBUG, format, args);
-}
-
-void
-xfcekbd_install_glib_log_appender (void)
-{
-	xkl_set_log_appender (xfcekbd_log_appender);
-}
-
-#define MATEKBD_PREVIEW_CONFIG_SCHEMA  XFCEKBD_CONFIG_SCHEMA ".preview"
-
-const gchar MATEKBD_PREVIEW_CONFIG_KEY_X[] = "x";
-const gchar MATEKBD_PREVIEW_CONFIG_KEY_Y[] = "y";
-const gchar MATEKBD_PREVIEW_CONFIG_KEY_WIDTH[] = "width";
-const gchar MATEKBD_PREVIEW_CONFIG_KEY_HEIGHT[] = "height";
-
-/**
- * xfcekbd_preview_load_position:
- *
- * Returns: (transfer full): A rectangle to use
- */
-GdkRectangle *
-xfcekbd_preview_load_position (void)
-{
-	GdkRectangle *rv = NULL;
-	gint x, y, w, h;
-	GSettings* settings = g_settings_new (MATEKBD_PREVIEW_CONFIG_SCHEMA);
-
-	x = g_settings_get_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_X);
-	y = g_settings_get_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_Y);
-	w = g_settings_get_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_WIDTH);
-	h = g_settings_get_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_HEIGHT);
-
-	g_object_unref (settings);
-
-	rv = g_new (GdkRectangle, 1);
-	if (x == -1 || y == -1 || w == -1 || h == -1) {
-		/* default values should be treated as
-		 * "0.75 of the screen size" */
-		GdkScreen *scr = gdk_screen_get_default ();
-		gint w = WidthOfScreen (gdk_x11_screen_get_xscreen (scr));
-		gint h = HeightOfScreen (gdk_x11_screen_get_xscreen (scr));
-		rv->x = w >> 3;
-		rv->y = h >> 3;
-		rv->width = w - (w >> 2);
-		rv->height = h - (h >> 2);
-	} else {
-		rv->x = x;
-		rv->y = y;
-		rv->width = w;
-		rv->height = h;
-	}
-	return rv;
-}
-
-void
-xfcekbd_preview_save_position (GdkRectangle * rect)
-{
-	GSettings* settings = g_settings_new (MATEKBD_PREVIEW_CONFIG_SCHEMA);
-
-	g_settings_delay (settings);
-
-	g_settings_set_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_X, rect->x);
-	g_settings_set_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_Y, rect->y);
-	g_settings_set_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_WIDTH, rect->width);
-	g_settings_set_int (settings, MATEKBD_PREVIEW_CONFIG_KEY_HEIGHT, rect->height);
-
-	g_settings_apply (settings);
-
-	g_object_unref (settings);
-}
-
 /**
  * xfcekbd_strv_append:
  *

src/xfcekbd-util.h

@@ -23,12 +23,6 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
-extern void xfcekbd_install_glib_log_appender (void);
-
-extern GdkRectangle *xfcekbd_preview_load_position (void);
-
-extern void xfcekbd_preview_save_position (GdkRectangle * rect);
-
 /* Missing in glib */
 extern gchar **xfcekbd_strv_append (gchar ** arr, gchar * element);