summaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-xfce/xfce4-settings
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-12-23 13:02:36 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-27 16:14:21 +0100
commit7b35cdc554ee3f42f9619996604d4674126711c1 (patch)
tree9fef801f1662e67f1e9632e916dd57e720a673d1 /meta-xfce/recipes-xfce/xfce4-settings
parent701f87736f3d745d5948b8a0b8aa0e5838a6a0b6 (diff)
downloadmeta-openembedded-7b35cdc554ee3f42f9619996604d4674126711c1.tar.gz
xfce4-settings: update to 4.11.0
this is a development release: * tests did not show errors * the new option to store default keyboard layout makes it worth to update Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-xfce/xfce4-settings')
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch117
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch8
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb)5
3 files changed, 62 insertions, 68 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
index 4151c3d78..d5a1f2c95 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
@@ -149,10 +149,10 @@ index d3aab0d..573c551 100644
149 </child> 149 </child>
150 </object> 150 </object>
151diff --git a/dialogs/mouse-settings/mouse-dialog_ui.h b/dialogs/mouse-settings/mouse-dialog_ui.h 151diff --git a/dialogs/mouse-settings/mouse-dialog_ui.h b/dialogs/mouse-settings/mouse-dialog_ui.h
152index 9e0c267..8a68c3b 100644 152index 59806a2..8a68c3b 100644
153--- a/dialogs/mouse-settings/mouse-dialog_ui.h 153--- a/dialogs/mouse-settings/mouse-dialog_ui.h
154+++ b/dialogs/mouse-settings/mouse-dialog_ui.h 154+++ b/dialogs/mouse-settings/mouse-dialog_ui.h
155@@ -31,545 +31,555 @@ static const char mouse_dialog_ui[] = 155@@ -31,540 +31,555 @@ static const char mouse_dialog_ui[] =
156 "</property></object><object class=\"GtkImage\" id=\"image5\"><property " 156 "</property></object><object class=\"GtkImage\" id=\"image5\"><property "
157 "name=\"visible\">True</property><property name=\"can_focus\">False</pro" 157 "name=\"visible\">True</property><property name=\"can_focus\">False</pro"
158 "perty><property name=\"stock\">gtk-revert-to-saved</property></object><" 158 "perty><property name=\"stock\">gtk-revert-to-saved</property></object><"
@@ -479,51 +479,21 @@ index 9e0c267..8a68c3b 100644
479- "operty name=\"spacing\">6</property><child><object class=\"GtkHBox\" id" 479- "operty name=\"spacing\">6</property><child><object class=\"GtkHBox\" id"
480- "=\"hbox4\"><property name=\"visible\">True</property><property name=\"c" 480- "=\"hbox4\"><property name=\"visible\">True</property><property name=\"c"
481- "an_focus\">False</property><property name=\"spacing\">12</property><chi" 481- "an_focus\">False</property><property name=\"spacing\">12</property><chi"
482- "ld><object class=\"GtkRadioButton\" id=\"synaptics-scroll-no\"><propert" 482- "ld><object class=\"GtkLabel\" id=\"label23\"><property name=\"visible\""
483- "y name=\"label\" translatable=\"yes\">Di_sabled</property><property nam" 483- ">True</property><property name=\"can_focus\">False</property><property "
484- "e=\"visible\">True</property><property name=\"can_focus\">True</propert" 484- "name=\"xalign\">0</property><property name=\"label\" translatable=\"yes"
485- "y><property name=\"receives_default\">False</property><property name=\"" 485- "\">Scro_lling mode:</property><property name=\"use_underline\">True</pr"
486- "use_action_appearance\">False</property><property name=\"use_underline\"" 486- "operty><property name=\"mnemonic_widget\">synaptics-scroll</property></"
487- ">True</property><property name=\"active\">True</property><property name" 487- "object><packing><property name=\"expand\">False</property><property nam"
488- "=\"draw_indicator\">True</property></object><packing><property name=\"e" 488- "e=\"fill\">True</property><property name=\"position\">0</property></pac"
489- "xpand\">False</property><property name=\"fill\">True</property><propert" 489- "king></child><child><object class=\"GtkComboBox\" id=\"synaptics-scroll"
490+ "efault\">False</property><property name=\"use_underline\">True</propert" 490- "\"><property name=\"visible\">True</property><property name=\"can_focus"
491+ "y><property name=\"active\">True</property><property name=\"draw_indica" 491- "\">False</property><property name=\"model\">synaptics-scroll-store</pro"
492+ "tor\">True</property></object><packing><property name=\"expand\">False<" 492- "perty><child><object class=\"GtkCellRendererText\" id=\"cellrenderertex"
493+ "/property><property name=\"fill\">True</property><property name=\"posit" 493- "t3\"/><attributes><attribute name=\"text\">0</attribute><attribute name"
494+ "ion\">0</property></packing></child><child><object class=\"GtkRadioButt" 494- "=\"sensitive\">1</attribute></attributes></child></object><packing><pro"
495+ "on\" id=\"device-left-handed\"><property name=\"label\" translatable=\""
496+ "yes\">Le_ft-handed</property><property name=\"use_action_appearance\">F"
497+ "alse</property><property name=\"visible\">True</property><property name"
498+ "=\"can_focus\">True</property><property name=\"receives_default\">False"
499+ "</property><property name=\"use_underline\">True</property><property na"
500+ "me=\"draw_indicator\">True</property><property name=\"group\">device-ri"
501+ "ght-handed</property></object><packing><property name=\"expand\">False<"
502+ "/property><property name=\"fill\">True</property><property name=\"posit"
503+ "ion\">1</property></packing></child></object><packing><property name=\""
504+ "expand\">True</property><property name=\"fill\">True</property><propert"
505 "y name=\"position\">0</property></packing></child><child><object class="
506- "\"GtkRadioButton\" id=\"synaptics-scroll-edge\"><property name=\"label\""
507- " translatable=\"yes\">Edge scro_lling</property><property name=\"visibl"
508+ "\"GtkCheckButton\" id=\"device-reverse-scrolling\"><property name=\"lab"
509+ "el\" translatable=\"yes\">Reverse scroll d_irection</property><property"
510+ " name=\"use_action_appearance\">False</property><property name=\"visibl"
511 "e\">True</property><property name=\"can_focus\">True</property><propert"
512- "y name=\"receives_default\">False</property><property name=\"use_action"
513- "_appearance\">False</property><property name=\"use_underline\">True</pr"
514- "operty><property name=\"draw_indicator\">True</property><property name="
515- "\"group\">synaptics-scroll-no</property></object><packing><property nam"
516- "e=\"expand\">False</property><property name=\"fill\">True</property><pr"
517- "operty name=\"position\">1</property></packing></child><child><object c"
518- "lass=\"GtkRadioButton\" id=\"synaptics-scroll-two\"><property name=\"la"
519- "bel\" translatable=\"yes\">Two-_finger scrolling</property><property na"
520- "me=\"visible\">True</property><property name=\"can_focus\">True</proper"
521- "ty><property name=\"receives_default\">False</property><property name=\""
522- "use_action_appearance\">False</property><property name=\"use_underline\""
523- ">True</property><property name=\"draw_indicator\">True</property><prope"
524- "rty name=\"group\">synaptics-scroll-no</property></object><packing><pro"
525- "perty name=\"expand\">True</property><property name=\"fill\">True</prop" 495- "perty name=\"expand\">True</property><property name=\"fill\">True</prop"
526- "erty><property name=\"position\">2</property></packing></child></object" 496- "erty><property name=\"position\">1</property></packing></child></object"
527- "><packing><property name=\"expand\">True</property><property name=\"fil" 497- "><packing><property name=\"expand\">True</property><property name=\"fil"
528- "l\">True</property><property name=\"position\">0</property></packing></" 498- "l\">True</property><property name=\"position\">0</property></packing></"
529- "child><child><object class=\"GtkCheckButton\" id=\"synaptics-scroll-hor" 499- "child><child><object class=\"GtkCheckButton\" id=\"synaptics-scroll-hor"
@@ -550,6 +520,26 @@ index 9e0c267..8a68c3b 100644
550- "ty></object><packing><property name=\"position\">1</property><property " 520- "ty></object><packing><property name=\"position\">1</property><property "
551- "name=\"tab_fill\">False</property></packing></child><child><object clas" 521- "name=\"tab_fill\">False</property></packing></child><child><object clas"
552- "s=\"GtkVBox\" id=\"wacom-tab\"><property name=\"visible\">True</propert" 522- "s=\"GtkVBox\" id=\"wacom-tab\"><property name=\"visible\">True</propert"
523+ "efault\">False</property><property name=\"use_underline\">True</propert"
524+ "y><property name=\"active\">True</property><property name=\"draw_indica"
525+ "tor\">True</property></object><packing><property name=\"expand\">False<"
526+ "/property><property name=\"fill\">True</property><property name=\"posit"
527+ "ion\">0</property></packing></child><child><object class=\"GtkRadioButt"
528+ "on\" id=\"device-left-handed\"><property name=\"label\" translatable=\""
529+ "yes\">Le_ft-handed</property><property name=\"use_action_appearance\">F"
530+ "alse</property><property name=\"visible\">True</property><property name"
531+ "=\"can_focus\">True</property><property name=\"receives_default\">False"
532+ "</property><property name=\"use_underline\">True</property><property na"
533+ "me=\"draw_indicator\">True</property><property name=\"group\">device-ri"
534+ "ght-handed</property></object><packing><property name=\"expand\">False<"
535+ "/property><property name=\"fill\">True</property><property name=\"posit"
536+ "ion\">1</property></packing></child></object><packing><property name=\""
537+ "expand\">True</property><property name=\"fill\">True</property><propert"
538+ "y name=\"position\">0</property></packing></child><child><object class="
539+ "\"GtkCheckButton\" id=\"device-reverse-scrolling\"><property name=\"lab"
540+ "el\" translatable=\"yes\">Reverse scroll d_irection</property><property"
541+ " name=\"use_action_appearance\">False</property><property name=\"visibl"
542+ "e\">True</property><property name=\"can_focus\">True</property><propert"
553+ "y name=\"receives_default\">False</property><property name=\"tooltip_te" 543+ "y name=\"receives_default\">False</property><property name=\"tooltip_te"
554+ "xt\" translatable=\"yes\">When selected, the scroll wheel will work in " 544+ "xt\" translatable=\"yes\">When selected, the scroll wheel will work in "
555+ "the opposite direction</property><property name=\"use_underline\">True<" 545+ "the opposite direction</property><property name=\"use_underline\">True<"
@@ -1116,19 +1106,26 @@ index 9e0c267..8a68c3b 100644
1116- "roperty name=\"lower\">16</property><property name=\"upper\">48</proper" 1106- "roperty name=\"lower\">16</property><property name=\"upper\">48</proper"
1117- "ty><property name=\"value\">24</property><property name=\"step_incremen" 1107- "ty><property name=\"value\">24</property><property name=\"step_incremen"
1118- "t\">1</property><property name=\"page_increment\">11</property></object" 1108- "t\">1</property><property name=\"page_increment\">11</property></object"
1119- "><object class=\"GtkListStore\" id=\"wacom-mode-store\"><columns><colum" 1109- "><object class=\"GtkListStore\" id=\"synaptics-scroll-store\"><columns>"
1120- "n type=\"gchararray\"/><column type=\"gchararray\"/></columns><data><ro" 1110- "<column type=\"gchararray\"/><column type=\"gboolean\"/></columns><data"
1121- "w><col id=\"0\">ABSOLUTE</col><col id=\"1\" translatable=\"yes\">Pen (a" 1111- "><row><col id=\"0\" translatable=\"yes\">Disabled</col><col id=\"1\">Tr"
1122- "bsolute)</col></row><row><col id=\"0\">RELATIVE</col><col id=\"1\" tran" 1112- "ue</col></row><row><col id=\"0\" translatable=\"yes\">Edge scrolling</c"
1123- "slatable=\"yes\">Mouse (relative)</col></row></data></object><object cl" 1113- "ol><col id=\"1\">True</col></row><row><col id=\"0\" translatable=\"yes\""
1124- "ass=\"GtkListStore\" id=\"wacom-rotation-store\"><columns><column type=" 1114- ">Two-finger scrolling</col><col id=\"1\">True</col></row><row><col id=\""
1125- "\"gint\"/><column type=\"gchararray\"/></columns><data><row><col id=\"0" 1115- "0\" translatable=\"yes\">Circular scrolling</col><col id=\"1\">True</co"
1126- "\">0</col><col id=\"1\" translatable=\"yes\">None (right-handed)</col><" 1116- "l></row></data></object><object class=\"GtkListStore\" id=\"wacom-mode-"
1127- "/row><row><col id=\"0\">3</col><col id=\"1\" translatable=\"yes\">Half " 1117- "store\"><columns><column type=\"gchararray\"/><column type=\"gchararray"
1128- "(left-handed)</col></row><row><col id=\"0\">1</col><col id=\"1\" transl" 1118- "\"/></columns><data><row><col id=\"0\">ABSOLUTE</col><col id=\"1\" tran"
1129- "atable=\"yes\">Clockwise</col></row><row><col id=\"0\">2</col><col id=\"" 1119- "slatable=\"yes\">Pen (absolute)</col></row><row><col id=\"0\">RELATIVE<"
1130- "1\" translatable=\"yes\">Counterclockwise</col></row></data></object></" 1120- "/col><col id=\"1\" translatable=\"yes\">Mouse (relative)</col></row></d"
1131- "interface>" 1121- "ata></object><object class=\"GtkListStore\" id=\"wacom-rotation-store\""
1122- "><columns><column type=\"gint\"/><column type=\"gchararray\"/></columns"
1123- "><data><row><col id=\"0\">0</col><col id=\"1\" translatable=\"yes\">Non"
1124- "e (right-handed)</col></row><row><col id=\"0\">3</col><col id=\"1\" tra"
1125- "nslatable=\"yes\">Half (left-handed)</col></row><row><col id=\"0\">1</c"
1126- "ol><col id=\"1\" translatable=\"yes\">Clockwise</col></row><row><col id"
1127- "=\"0\">2</col><col id=\"1\" translatable=\"yes\">Counterclockwise</col>"
1128- "</row></data></object></interface>"
1132+ "l\" translatable=\"yes\">_Behavior</property><property name=\"use_under" 1129+ "l\" translatable=\"yes\">_Behavior</property><property name=\"use_under"
1133+ "line\">True</property></object><packing><property name=\"position\">1</" 1130+ "line\">True</property></object><packing><property name=\"position\">1</"
1134+ "property><property name=\"tab_fill\">False</property></packing></child>" 1131+ "property><property name=\"tab_fill\">False</property></packing></child>"
@@ -1228,7 +1225,7 @@ index 9e0c267..8a68c3b 100644
1228+ "nterface>" 1225+ "nterface>"
1229 }; 1226 };
1230 1227
1231-static const unsigned mouse_dialog_ui_length = 37918u; 1228-static const unsigned mouse_dialog_ui_length = 37588u;
1232+static const unsigned mouse_dialog_ui_length = 38582u; 1229+static const unsigned mouse_dialog_ui_length = 38582u;
1233 1230
1234-- 1231--
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch
index 180ccfd55..cacb5c3a1 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch
@@ -235,17 +235,15 @@ index 7657465..76bcea1 100644
235 XCloseDisplay (xdisplay); 235 XCloseDisplay (xdisplay);
236 236
237 if (gdk_error_trap_pop () != 0) 237 if (gdk_error_trap_pop () != 0)
238diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
239index 0a579d6..baa413c 100644
240--- a/xfsettingsd/xsettings.xml 238--- a/xfsettingsd/xsettings.xml
241+++ b/xfsettingsd/xsettings.xml 239+++ b/xfsettingsd/xsettings.xml
242@@ -41,5 +41,6 @@ 240@@ -36,5 +36,6 @@
243 <property name="MenuBarAccel" type="string" value="F10"/> 241 <property name="MenuBarAccel" type="string" value="F10"/>
244 <property name="CursorThemeName" type="string" value=""/> 242 <property name="CursorThemeName" type="string" value=""/>
245 <property name="CursorThemeSize" type="int" value="0"/> 243 <property name="CursorThemeSize" type="int" value="0"/>
246+ <property name="TouchscreenMode" type="bool" value="false"/> 244+ <property name="TouchscreenMode" type="bool" value="false"/>
247 <property name="IMModule" type="string" value=""/>
248 </property> 245 </property>
249</channel>-- 246 </channel>
247--
2501.7.6.5 2481.7.6.5
251 249
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
index aa878ae48..c5cb03371 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
@@ -3,7 +3,6 @@ SECTION = "x11/wm"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "exo garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier" 5DEPENDS = "exo garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier"
6PR = "r3"
7 6
8inherit xfce 7inherit xfce
9 8
@@ -18,8 +17,8 @@ SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
18 file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \ 17 file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \
19 file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \ 18 file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \
20" 19"
21SRC_URI[md5sum] = "cc4dd9179ead9046c056431f01a12000" 20SRC_URI[md5sum] = "3bf42281b64b10b2691008cd693f7dbd"
22SRC_URI[sha256sum] = "0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e" 21SRC_URI[sha256sum] = "4a4f1e79a58b524f3a6dd030b6fc687671b35566f847e6f516c6f84211191698"
23 22
24FILES_${PN} += "${libdir}/xfce4" 23FILES_${PN} += "${libdir}/xfce4"
25 24