Author: stephan
Date: 2008-06-16 05:46:20 +0000 (Mon, 16 Jun 2008)
New Revision: 27074
Modified:
xfce4-settings/trunk/dialogs/accessibility-settings/main.c
xfce4-settings/trunk/dialogs/appearance-settings/main.c
xfce4-settings/trunk/dialogs/keyboard-settings/main.c
xfce4-settings/trunk/xfce4-settings-helper/accessx.c
xfce4-settings/trunk/xfce4-settings-helper/main.c
xfce4-settings/trunk/xfce4-settings-helper/xkb.c
xfce4-settings/trunk/xfce4-settings-helper/xkb.h
Log:
Compile with --enable-debug=full
Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-06-16
04:59:09 UTC (rev 27073)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-06-16
05:46:20 UTC (rev 27074)
@@ -85,7 +85,6 @@
GtkWidget *
accessibility_settings_dialog_new_from_xml (GladeXML *gxml)
{
- XfconfChannel *xsettings_channel = xfconf_channel_new("xsettings");
XfconfChannel *accessx_channel = xfconf_channel_new("accessx");
GtkWidget *xkb_accessx_mouse_check = glade_xml_get_widget (gxml,
"xkb_accessx_mouse_check");
@@ -175,9 +174,7 @@
main(int argc, char **argv)
{
GladeXML *gxml;
- XfconfChannel *channel;
GError *cli_error = NULL;
- gchar *data_dirs = NULL;
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-06-16
04:59:09 UTC (rev 27073)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-06-16
05:46:20 UTC (rev 27074)
@@ -294,7 +294,7 @@
g_free (dir_name);
dir_name = g_build_filename (g_get_user_data_dir(), "icons", NULL);
- xdg_user_theme_list, read_themes_from_dir (dir_name, THEME_TYPE_ICONS);
+ xdg_user_theme_list = read_themes_from_dir (dir_name, THEME_TYPE_ICONS);
g_free (dir_name);
while (*xdg_system_data_dirs)
@@ -406,7 +406,7 @@
g_free (dir_name);
dir_name = g_build_filename (g_get_user_data_dir(), "themes", NULL);
- xdg_user_theme_list, read_themes_from_dir (dir_name, THEME_TYPE_GTK);
+ xdg_user_theme_list = read_themes_from_dir (dir_name, THEME_TYPE_GTK);
g_free (dir_name);
while (*xdg_system_data_dirs)
@@ -719,9 +719,7 @@
main(int argc, char **argv)
{
GladeXML *gxml;
- XfconfChannel *channel;
GError *cli_error = NULL;
- gchar *data_dirs = NULL;
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-06-16
04:59:09 UTC (rev 27073)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-06-16
05:46:20 UTC (rev 27074)
@@ -115,9 +115,7 @@
main(int argc, char **argv)
{
GladeXML *gxml;
- XfconfChannel *channel;
GError *cli_error = NULL;
- gchar *data_dirs = NULL;
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
Modified: xfce4-settings/trunk/xfce4-settings-helper/accessx.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/accessx.c 2008-06-16
04:59:09 UTC (rev 27073)
+++ xfce4-settings/trunk/xfce4-settings-helper/accessx.c 2008-06-16
05:46:20 UTC (rev 27074)
@@ -160,7 +160,8 @@
gboolean sticky_keys_ltl = xfconf_channel_get_bool (channel,
"/AccessX/StickyKeys/LatchToLock", FALSE);
gboolean sticky_keys_tk = xfconf_channel_get_bool (channel,
"/AccessX/StickyKeys/TwoKeysDisable", FALSE);
- if (xkbpresent)
+ /* assume xkb is present, this has laready been checked */
+ if (TRUE)
{
XkbDescPtr xkb = XkbAllocKeyboard ();
if (xkb)
@@ -238,8 +239,6 @@
{
g_return_if_fail (accessx_initialized == FALSE);
- int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
- int xkbopcode, xkbevent, xkberror;
accessx_channel = channel;
g_signal_connect(G_OBJECT(channel), "property-changed",
(GCallback)cb_accessx_channel_property_changed, NULL);
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-06-16 04:59:09 UTC
(rev 27073)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-06-16 05:46:20 UTC
(rev 27074)
@@ -42,11 +42,8 @@
if (debug) g_print (str)
static gboolean version = FALSE;
-static gboolean force_replace = FALSE;
-static gboolean running = FALSE;
static gboolean debug = FALSE;
-static GList *registries = NULL;
static GOptionEntry entries[] =
{
@@ -66,9 +63,6 @@
main(int argc, char **argv)
{
GError *cli_error = NULL;
- GdkDisplay *gdpy;
- gint n_screens, screen;
- gboolean keep_running = FALSE;
XfconfChannel *accessx_channel, *xkb_channel;
xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
@@ -98,12 +92,12 @@
notify_init("xfce4-settings-helper");
- accessx_channel = xfconf_channel_new("accessx");
xkb_channel = xfconf_channel_new("xkb");
+ accessx_channel = xfconf_channel_new("accessx");
- accessx_notification_init(accessx_channel);
- xkb_notification_init(accessx_channel);
+ if (xkb_notification_init(accessx_channel))
+ accessx_notification_init(accessx_channel);
if(!debug) /* If not in debug mode, fork to background */
{
Modified: xfce4-settings/trunk/xfce4-settings-helper/xkb.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/xkb.c 2008-06-16 04:59:09 UTC
(rev 27073)
+++ xfce4-settings/trunk/xfce4-settings-helper/xkb.c 2008-06-16 05:46:20 UTC
(rev 27074)
@@ -37,6 +37,8 @@
#define HAVE_XKB
+#include <string.h>
+
#include <glib.h>
#include <gtk/gtk.h>
@@ -48,6 +50,8 @@
#include "xkb.h"
+static gboolean xkbpresent = FALSE;
+
static XfconfChannel *xkb_channel;
static gboolean xkb_initialized = FALSE;
@@ -146,10 +150,10 @@
}
}
-void
+gint
xkb_notification_init (XfconfChannel *channel)
{
- g_return_if_fail (xkb_initialized == FALSE);
+ g_return_val_if_fail (xkb_initialized == FALSE, 1);
int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
int xkbopcode, xkbevent, xkberror;
@@ -179,5 +183,6 @@
g_signal_connect(G_OBJECT(channel), "property-changed",
(GCallback)cb_xkb_channel_property_changed, NULL);
xkb_initialized = TRUE;
+ return xkbpresent;
}
Modified: xfce4-settings/trunk/xfce4-settings-helper/xkb.h
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/xkb.h 2008-06-16 04:59:09 UTC
(rev 27073)
+++ xfce4-settings/trunk/xfce4-settings-helper/xkb.h 2008-06-16 05:46:20 UTC
(rev 27074)
@@ -19,7 +19,5 @@
* by Olivier Fourdan.
*/
-static gboolean xkbpresent = FALSE;
-
-void
+gint
xkb_notification_init (XfconfChannel *channel);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
