Author: olivier
Date: 2008-11-08 16:48:10 +0000 (Sat, 08 Nov 2008)
New Revision: 28666
Modified:
xfwm4/trunk/ChangeLog
xfwm4/trunk/src/settings.c
xfwm4/trunk/themes/default.keys/keythemerc
Log:
* src/settings.c: Do not display warnings for "workspace_names" either.
* settings-dialogs/xfwm4-settings.c: Fix possible crash when the
dbl_click_action setting gets unset.
Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog 2008-11-08 16:01:26 UTC (rev 28665)
+++ xfwm4/trunk/ChangeLog 2008-11-08 16:48:10 UTC (rev 28666)
@@ -1,3 +1,12 @@
+2008-11-08 olivier
+
+ * src/settings.c: Do not display warnings for "workspace_names" either.
+
+2008-11-08 brian
+
+ * settings-dialogs/xfwm4-settings.c: Fix possible crash when the
+ dbl_click_action setting gets unset.
+
2008-11-02 olivier
* src/parserc.c, src/settings.c: Do not display warnings for values
Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c 2008-11-08 16:01:26 UTC (rev 28665)
+++ xfwm4/trunk/src/settings.c 2008-11-08 16:48:10 UTC (rev 28666)
@@ -1138,7 +1138,8 @@
set_placement_mode (screen_info, g_value_get_string
(value));
}
else if ((!strcmp (name, "title_shadow_active"))
- || (!strcmp (name, "title_shadow_inactive")))
+ || (!strcmp (name, "title_shadow_inactive"))
+ || (!strcmp (name, "workspace_names")))
{
/* These properties are not configurable via xfconf */
}
Modified: xfwm4/trunk/themes/default.keys/keythemerc
===================================================================
--- xfwm4/trunk/themes/default.keys/keythemerc 2008-11-08 16:01:26 UTC (rev
28665)
+++ xfwm4/trunk/themes/default.keys/keythemerc 2008-11-08 16:48:10 UTC (rev
28666)
@@ -1,67 +1,255 @@
-above_key=Alt+F12
-add_workspace_key=Alt+Insert
-add_adjacent_workspace_key=None
-cancel_key=Escape
-left_key=Left
-right_key=Right
-up_key=Up
-down_key=Down
-close_window_key=Alt+F4
-cycle_windows_key=Alt+Tab
-del_workspace_key=Alt+Delete
-del_active_workspace_key=None
-down_workspace_key=Control+Alt+Down
-fill_horiz_key=None
-fill_vert_key=None
-fill_window_key=None
-fullscreen_key=Alt+F11
-hide_window_key=Alt+F9
-left_workspace_key=Control+Alt+Left
-lower_window_key=Shift+Alt+Page_Down
-maximize_horiz_key=None
-maximize_vert_key=None
-maximize_window_key=Alt+F10
-move_window_key=Alt+F7
-move_window_down_workspace_key=None
-move_window_left_key=Control+Shift+Alt+Left
-move_window_left_workspace_key=None
-move_window_next_workspace_key=Alt+Control+End
-move_window_prev_workspace_key=Alt+Control+Home
-move_window_right_key=Control+Shift+Alt+Right
-move_window_right_workspace_key=None
-move_window_up_key=Control+Shift+Alt+Up
-move_window_up_workspace_key=None
-move_window_workspace_10_key=None
-move_window_workspace_11_key=None
-move_window_workspace_12_key=None
-move_window_workspace_1_key=Alt+Control+KP_1
-move_window_workspace_2_key=Alt+Control+KP_2
-move_window_workspace_3_key=Alt+Control+KP_3
-move_window_workspace_4_key=Alt+Control+KP_4
-move_window_workspace_5_key=Alt+Control+KP_5
-move_window_workspace_6_key=Alt+Control+KP_6
-move_window_workspace_7_key=Alt+Control+KP_7
-move_window_workspace_8_key=Alt+Control+KP_8
-move_window_workspace_9_key=Alt+Control+KP_9
-next_workspace_key=None
-popup_menu_key=Alt+space
-prev_workspace_key=None
-raise_window_key=Shift+Alt+Page_Up
-resize_window_key=Alt+F8
-right_workspace_key=Control+Alt+Right
-shade_window_key=Alt+F9
-show_desktop_key=Control+Alt+d
-stick_window_key=Alt+F6
-up_workspace_key=Control+Alt+Up
-workspace_10_key=Control+F10
-workspace_11_key=Control+F11
-workspace_12_key=Control+F12
-workspace_1_key=Control+F1
-workspace_2_key=Control+F2
-workspace_3_key=Control+F3
-workspace_4_key=Control+F4
-workspace_5_key=Control+F5
-workspace_6_key=Control+F6
-workspace_7_key=Control+F7
-workspace_8_key=Control+F8
-workspace_9_key=Control+F9
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F12" type="string" value="above_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>Insert" type="string"
value="add_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="Escape" type="string" value="cancel_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="Left" type="string" value="left_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="Right" type="string" value="right_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="Up" type="string" value="up_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="Down" type="string" value="down_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F4" type="string" value="close_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>Tab" type="string" value="cycle_windows_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>Delete" type="string"
value="del_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Alt>Down" type="string"
value="down_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F11" type="string" value="fullscreen_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F9" type="string" value="hide_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Alt>Left" type="string"
value="left_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Shift><Alt>Page_Down" type="string"
value="lower_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F10" type="string"
value="maximize_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F7" type="string" value="move_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Shift><Alt>Left"
type="string" value="move_window_left_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>End" type="string"
value="move_window_next_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>Home" type="string"
value="move_window_prev_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Shift><Alt>Right"
type="string" value="move_window_right_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Shift><Alt>Up" type="string"
value="move_window_up_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_1" type="string"
value="move_window_workspace_1_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_2" type="string"
value="move_window_workspace_2_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_3" type="string"
value="move_window_workspace_3_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_4" type="string"
value="move_window_workspace_4_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_5" type="string"
value="move_window_workspace_5_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_6" type="string"
value="move_window_workspace_6_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_7" type="string"
value="move_window_workspace_7_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_8" type="string"
value="move_window_workspace_8_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt><Control>KP_9" type="string"
value="move_window_workspace_9_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>space" type="string" value="popup_menu_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Shift><Alt>Page_Up" type="string"
value="raise_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F8" type="string" value="resize_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Alt>Right" type="string"
value="right_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F9" type="string" value="shade_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Alt>d" type="string"
value="show_desktop_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F6" type="string" value="stick_window_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control><Alt>Up" type="string"
value="up_workspace_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F10" type="string"
value="workspace_10_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F11" type="string"
value="workspace_11_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F12" type="string"
value="workspace_12_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F1" type="string"
value="workspace_1_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F2" type="string"
value="workspace_2_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F3" type="string"
value="workspace_3_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F4" type="string"
value="workspace_4_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F5" type="string"
value="workspace_5_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F6" type="string"
value="workspace_6_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F7" type="string"
value="workspace_7_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F8" type="string"
value="workspace_8_key"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Control>F9" type="string"
value="workspace_9_key"/>
+ </property>
+ </property>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
