Author: nick
Date: 2008-07-15 19:39:00 +0000 (Tue, 15 Jul 2008)
New Revision: 27298
Modified:
xfce4-settings/trunk/ChangeLog
xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
xfce4-settings/trunk/xfce4-settings-helper/main.c
xfce4-settings/trunk/xfce4-settings-helper/xkb.c
Log:
* xfce4-settings-helper/keyboard-shortcuts.c: Make it compile
here.
* xfce4-settings-helper/xkb.c: Avoid vision by zerro.
Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog 2008-07-15 15:12:05 UTC (rev 27297)
+++ xfce4-settings/trunk/ChangeLog 2008-07-15 19:39:00 UTC (rev 27298)
@@ -1,5 +1,11 @@
2008-07-15 Jannis Pohlmann <[EMAIL PROTECTED]>
+ * xfce4-settings-helper/keyboard-shortcuts.c: Make it compile
+ here.
+ * xfce4-settings-helper/xkb.c: Avoid vision by zerro.
+
+2008-07-15 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* xfce4-settings-helper/keyboard-shortcuts{c,h},
xfce4-settings-helper/Makefile.am,
xfce4-settings-helper/main.c: Add support for keyboard shortcuts.
Modified: xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
2008-07-15 15:12:05 UTC (rev 27297)
+++ xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
2008-07-15 19:39:00 UTC (rev 27298)
@@ -33,6 +33,7 @@
#include <xfconf/xfconf.h>
#include <libxfcegui4/libxfcegui4.h>
+#include <dbus/dbus-glib.h>
#include "keyboard-shortcuts.h"
@@ -217,7 +218,7 @@
GValue *value,
GParamSpec *pspec)
{
- XfceKeyboardShortcutsHelper *helper = XFCE_KEYBOARD_SHORTCUTS_HELPER
(object);
+ /* XfceKeyboardShortcutsHelper *helper = XFCE_KEYBOARD_SHORTCUTS_HELPER
(object); */
switch (prop_id)
{
@@ -235,7 +236,7 @@
const GValue *value,
GParamSpec *pspec)
{
- XfceKeyboardShortcutsHelper *helper = XFCE_KEYBOARD_SHORTCUTS_HELPER
(object);
+ /* XfceKeyboardShortcutsHelper *helper = XFCE_KEYBOARD_SHORTCUTS_HELPER
(object); */
switch (prop_id)
{
@@ -251,14 +252,18 @@
xfce_keyboard_shortcuts_helper_add_filter (XfceKeyboardShortcutsHelper *helper)
{
GdkDisplay *display;
+#if 0
GdkScreen *screen;
gint screens;
gint i;
+#endif
g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
display = gdk_display_get_default ();
+#if 0
screens = gdk_display_get_n_screens (display);
+#endif
/* Flush events before adding the event filter */
XAllowEvents (GDK_DISPLAY_XDISPLAY (display), AsyncBoth, CurrentTime);
@@ -285,7 +290,7 @@
{
XEvent *xevent = (XEvent *) gdk_xevent;
- g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
+ g_return_val_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper),
GDK_FILTER_CONTINUE);
switch (xevent->type)
{
@@ -316,7 +321,6 @@
const GValue *action_value;
const gchar *type;
const gchar *action;
- GtkTreeIter iter;
g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
@@ -438,8 +442,8 @@
KeyCode
*keycode,
guint
*grab_mask)
{
- g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
- g_return_if_fail (GDK_IS_DISPLAY (display));
+ g_return_val_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper), FALSE);
+ g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
/* Reset keycode and grab mask */
*keycode = 0;
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-07-15 15:12:05 UTC
(rev 27297)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-07-15 19:39:00 UTC
(rev 27298)
@@ -138,7 +138,6 @@
accessx_helper = g_object_new (XFCE_TYPE_ACCESSX_HELPER, NULL);
shortcuts_helper = g_object_new (XFCE_TYPE_KEYBOARD_SHORTCUTS_HELPER,
NULL);
-
/* enter the main loop */
gtk_main();
Modified: xfce4-settings/trunk/xfce4-settings-helper/xkb.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/xkb.c 2008-07-15 15:12:05 UTC
(rev 27297)
+++ xfce4-settings/trunk/xfce4-settings-helper/xkb.c 2008-07-15 19:39:00 UTC
(rev 27298)
@@ -205,7 +205,7 @@
/* set new values */
xkb->ctrls->repeat_delay = delay;
- xkb->ctrls->repeat_interval = 1000 / rate;
+ xkb->ctrls->repeat_interval = rate != 0 ? 1000 / rate : 0;
/* set updated controls */
XkbSetControls (GDK_DISPLAY (), XkbRepeatKeysMask, xkb);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
