desktop/xfce4-xkb-plugin: Updated for version 0.5.4.3.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman
parent
172b83cee4
commit
b171a92cd8
|
|
@ -1,278 +0,0 @@
|
||||||
diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.am xfce4-xkb-plugin-0.5.3.3/flags/Makefile.am
|
|
||||||
--- xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.am 2009-03-06 07:16:06.000000000 -0600
|
|
||||||
+++ xfce4-xkb-plugin-0.5.3.3/flags/Makefile.am 2011-06-20 12:43:15.982508648 -0500
|
|
||||||
@@ -11,7 +11,7 @@
|
|
||||||
bg.svg \
|
|
||||||
bh.svg \
|
|
||||||
br.svg \
|
|
||||||
- bs.svg \
|
|
||||||
+ ba.svg \
|
|
||||||
by.svg \
|
|
||||||
ca.svg \
|
|
||||||
ch.svg \
|
|
||||||
diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.in xfce4-xkb-plugin-0.5.3.3/flags/Makefile.in
|
|
||||||
--- xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.in 2009-03-06 07:16:29.000000000 -0600
|
|
||||||
+++ xfce4-xkb-plugin-0.5.3.3/flags/Makefile.in 2011-06-20 12:43:15.983508640 -0500
|
|
||||||
@@ -259,7 +259,7 @@
|
|
||||||
bg.svg \
|
|
||||||
bh.svg \
|
|
||||||
br.svg \
|
|
||||||
- bs.svg \
|
|
||||||
+ ba.svg \
|
|
||||||
by.svg \
|
|
||||||
ca.svg \
|
|
||||||
ch.svg \
|
|
||||||
diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/ba.svg xfce4-xkb-plugin-0.5.3.3/flags/ba.svg
|
|
||||||
--- xfce4-xkb-plugin-0.5.3.3.orig//flags/ba.svg 1969-12-31 18:00:00.000000000 -0600
|
|
||||||
+++ xfce4-xkb-plugin-0.5.3.3/flags/ba.svg 2011-06-20 12:43:05.472594747 -0500
|
|
||||||
@@ -0,0 +1,123 @@
|
|
||||||
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
+<svg
|
|
||||||
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
+ xmlns:cc="http://web.resource.org/cc/"
|
|
||||||
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
+ xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
+ xmlns="http://www.w3.org/2000/svg"
|
|
||||||
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
+ width="1000"
|
|
||||||
+ height="500"
|
|
||||||
+ id="svg11581"
|
|
||||||
+ sodipodi:version="0.32"
|
|
||||||
+ inkscape:version="0.44"
|
|
||||||
+ version="1.0"
|
|
||||||
+ sodipodi:docbase="C:\Documents and Settings\David Nelson\Archives\Svg"
|
|
||||||
+ sodipodi:docname="Flag_of_Bosnia_and_Herzegovina.svg"
|
|
||||||
+ viewBox="0 0 200 100">
|
|
||||||
+ <defs
|
|
||||||
+ id="defs11583" />
|
|
||||||
+ <sodipodi:namedview
|
|
||||||
+ id="base"
|
|
||||||
+ pagecolor="#ffffff"
|
|
||||||
+ bordercolor="#666666"
|
|
||||||
+ borderopacity="1.0"
|
|
||||||
+ gridtolerance="10000"
|
|
||||||
+ guidetolerance="10"
|
|
||||||
+ objecttolerance="50"
|
|
||||||
+ inkscape:pageopacity="0.0"
|
|
||||||
+ inkscape:pageshadow="2"
|
|
||||||
+ inkscape:zoom="0.754"
|
|
||||||
+ inkscape:cx="500"
|
|
||||||
+ inkscape:cy="250"
|
|
||||||
+ inkscape:document-units="px"
|
|
||||||
+ inkscape:current-layer="layer1"
|
|
||||||
+ width="200px"
|
|
||||||
+ height="100px"
|
|
||||||
+ showgrid="true"
|
|
||||||
+ inkscape:grid-points="true"
|
|
||||||
+ inkscape:grid-bbox="true"
|
|
||||||
+ inkscape:object-nodes="false"
|
|
||||||
+ inkscape:object-paths="false"
|
|
||||||
+ inkscape:object-points="false"
|
|
||||||
+ inkscape:window-width="853"
|
|
||||||
+ inkscape:window-height="573"
|
|
||||||
+ inkscape:window-x="11"
|
|
||||||
+ inkscape:window-y="22" />
|
|
||||||
+ <metadata
|
|
||||||
+ id="metadata11586">
|
|
||||||
+ <rdf:RDF>
|
|
||||||
+ <cc:Work
|
|
||||||
+ rdf:about="">
|
|
||||||
+ <dc:format>image/svg+xml</dc:format>
|
|
||||||
+ <dc:type
|
|
||||||
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
+ </cc:Work>
|
|
||||||
+ </rdf:RDF>
|
|
||||||
+ </metadata>
|
|
||||||
+ <g
|
|
||||||
+ inkscape:label="Layer 1"
|
|
||||||
+ inkscape:groupmode="layer"
|
|
||||||
+ id="layer1">
|
|
||||||
+ <rect
|
|
||||||
+ style="opacity:1;fill:#171796;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.403;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
+ id="rect11593"
|
|
||||||
+ width="200"
|
|
||||||
+ height="100"
|
|
||||||
+ x="0"
|
|
||||||
+ y="0" />
|
|
||||||
+ <path
|
|
||||||
+ style="fill:#f7d117;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ d="M 53,0 L 153,0 L 153,100 L 53,0 z "
|
|
||||||
+ id="path11595" />
|
|
||||||
+ <path
|
|
||||||
+ id="path11682"
|
|
||||||
+ d="M 81.53125,51.125 L 85,51.125 L 88.46875,51.125 L 90.58396,57.685662 L 85,53.625 L 79.41604,57.685661 L 81.53125,51.125 z "
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ transform="translate(-50,-51.125)"
|
|
||||||
+ sodipodi:nodetypes="ccccccc" />
|
|
||||||
+ <path
|
|
||||||
+ id="path11689"
|
|
||||||
+ d="M 81.53125,51.125 L 75.964963,47.064338 L 82.875,47.0625 L 85,40.5 L 87.125,47.0625 L 94.035037,47.064339 L 88.46875,51.125 L 85,51.125 L 81.53125,51.125 z "
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ transform="translate(50,48.875)"
|
|
||||||
+ sodipodi:nodetypes="ccccccccc" />
|
|
||||||
+ <path
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ id="path11746"
|
|
||||||
+ transform="translate(-37.5,-38.625)" />
|
|
||||||
+ <path
|
|
||||||
+ id="path11754"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ transform="translate(-25,-26.125)" />
|
|
||||||
+ <path
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ id="path11762"
|
|
||||||
+ transform="translate(-12.5,-13.625)" />
|
|
||||||
+ <path
|
|
||||||
+ id="path11770"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ transform="translate(0,-1.125)" />
|
|
||||||
+ <path
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ id="path11778"
|
|
||||||
+ transform="translate(12.5,11.375)" />
|
|
||||||
+ <path
|
|
||||||
+ id="path11786"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ transform="translate(25,23.875)" />
|
|
||||||
+ <path
|
|
||||||
+ style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
+ d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
+ id="path11794"
|
|
||||||
+ transform="translate(37.5,36.375)" />
|
|
||||||
+ </g>
|
|
||||||
+</svg>
|
|
||||||
diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/bs.svg xfce4-xkb-plugin-0.5.3.3/flags/bs.svg
|
|
||||||
--- xfce4-xkb-plugin-0.5.3.3.orig//flags/bs.svg 2009-03-06 07:16:06.000000000 -0600
|
|
||||||
+++ xfce4-xkb-plugin-0.5.3.3/flags/bs.svg 1969-12-31 18:00:00.000000000 -0600
|
|
||||||
@@ -1,123 +0,0 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
-<svg
|
|
||||||
- xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
- xmlns:cc="http://web.resource.org/cc/"
|
|
||||||
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
- xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
- xmlns="http://www.w3.org/2000/svg"
|
|
||||||
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
- width="1000"
|
|
||||||
- height="500"
|
|
||||||
- id="svg11581"
|
|
||||||
- sodipodi:version="0.32"
|
|
||||||
- inkscape:version="0.44"
|
|
||||||
- version="1.0"
|
|
||||||
- sodipodi:docbase="C:\Documents and Settings\David Nelson\Archives\Svg"
|
|
||||||
- sodipodi:docname="Flag_of_Bosnia_and_Herzegovina.svg"
|
|
||||||
- viewBox="0 0 200 100">
|
|
||||||
- <defs
|
|
||||||
- id="defs11583" />
|
|
||||||
- <sodipodi:namedview
|
|
||||||
- id="base"
|
|
||||||
- pagecolor="#ffffff"
|
|
||||||
- bordercolor="#666666"
|
|
||||||
- borderopacity="1.0"
|
|
||||||
- gridtolerance="10000"
|
|
||||||
- guidetolerance="10"
|
|
||||||
- objecttolerance="50"
|
|
||||||
- inkscape:pageopacity="0.0"
|
|
||||||
- inkscape:pageshadow="2"
|
|
||||||
- inkscape:zoom="0.754"
|
|
||||||
- inkscape:cx="500"
|
|
||||||
- inkscape:cy="250"
|
|
||||||
- inkscape:document-units="px"
|
|
||||||
- inkscape:current-layer="layer1"
|
|
||||||
- width="200px"
|
|
||||||
- height="100px"
|
|
||||||
- showgrid="true"
|
|
||||||
- inkscape:grid-points="true"
|
|
||||||
- inkscape:grid-bbox="true"
|
|
||||||
- inkscape:object-nodes="false"
|
|
||||||
- inkscape:object-paths="false"
|
|
||||||
- inkscape:object-points="false"
|
|
||||||
- inkscape:window-width="853"
|
|
||||||
- inkscape:window-height="573"
|
|
||||||
- inkscape:window-x="11"
|
|
||||||
- inkscape:window-y="22" />
|
|
||||||
- <metadata
|
|
||||||
- id="metadata11586">
|
|
||||||
- <rdf:RDF>
|
|
||||||
- <cc:Work
|
|
||||||
- rdf:about="">
|
|
||||||
- <dc:format>image/svg+xml</dc:format>
|
|
||||||
- <dc:type
|
|
||||||
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
- </cc:Work>
|
|
||||||
- </rdf:RDF>
|
|
||||||
- </metadata>
|
|
||||||
- <g
|
|
||||||
- inkscape:label="Layer 1"
|
|
||||||
- inkscape:groupmode="layer"
|
|
||||||
- id="layer1">
|
|
||||||
- <rect
|
|
||||||
- style="opacity:1;fill:#171796;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.403;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
- id="rect11593"
|
|
||||||
- width="200"
|
|
||||||
- height="100"
|
|
||||||
- x="0"
|
|
||||||
- y="0" />
|
|
||||||
- <path
|
|
||||||
- style="fill:#f7d117;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- d="M 53,0 L 153,0 L 153,100 L 53,0 z "
|
|
||||||
- id="path11595" />
|
|
||||||
- <path
|
|
||||||
- id="path11682"
|
|
||||||
- d="M 81.53125,51.125 L 85,51.125 L 88.46875,51.125 L 90.58396,57.685662 L 85,53.625 L 79.41604,57.685661 L 81.53125,51.125 z "
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- transform="translate(-50,-51.125)"
|
|
||||||
- sodipodi:nodetypes="ccccccc" />
|
|
||||||
- <path
|
|
||||||
- id="path11689"
|
|
||||||
- d="M 81.53125,51.125 L 75.964963,47.064338 L 82.875,47.0625 L 85,40.5 L 87.125,47.0625 L 94.035037,47.064339 L 88.46875,51.125 L 85,51.125 L 81.53125,51.125 z "
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- transform="translate(50,48.875)"
|
|
||||||
- sodipodi:nodetypes="ccccccccc" />
|
|
||||||
- <path
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- id="path11746"
|
|
||||||
- transform="translate(-37.5,-38.625)" />
|
|
||||||
- <path
|
|
||||||
- id="path11754"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- transform="translate(-25,-26.125)" />
|
|
||||||
- <path
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- id="path11762"
|
|
||||||
- transform="translate(-12.5,-13.625)" />
|
|
||||||
- <path
|
|
||||||
- id="path11770"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- transform="translate(0,-1.125)" />
|
|
||||||
- <path
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- id="path11778"
|
|
||||||
- transform="translate(12.5,11.375)" />
|
|
||||||
- <path
|
|
||||||
- id="path11786"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- transform="translate(25,23.875)" />
|
|
||||||
- <path
|
|
||||||
- style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
- d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
|
|
||||||
- id="path11794"
|
|
||||||
- transform="translate(37.5,36.375)" />
|
|
||||||
- </g>
|
|
||||||
-</svg>
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
diff -Naur xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3//panel-plugin/xkb-settings-dialog.c
|
|
||||||
--- xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-settings-dialog.c 2010-10-04 21:14:05.000000000 +0300
|
|
||||||
+++ xfce4-xkb-plugin-0.5.3.3//panel-plugin/xkb-settings-dialog.c 2010-10-04 21:13:49.000000000 +0300
|
|
||||||
@@ -31,8 +31,11 @@
|
|
||||||
#include <glib.h>
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
|
|
||||||
+#undef XFCE_DISABLE_DEPRECATED
|
|
||||||
+
|
|
||||||
#include <libxfce4panel/xfce-panel-plugin.h>
|
|
||||||
#include <libxfcegui4/libxfcegui4.h>
|
|
||||||
+#include <libxfcegui4/xfce_framebox.h>
|
|
||||||
|
|
||||||
#include "xfce4-xkb-plugin.h"
|
|
||||||
#include "xfce4-xkb-plugin-private.h"
|
|
||||||
@@ -678,7 +681,7 @@
|
|
||||||
xfce_xkb_about (XfcePanelPlugin *plugin)
|
|
||||||
{
|
|
||||||
GtkWidget *about;
|
|
||||||
- const gchar* authors[2] = {
|
|
||||||
+ const gchar* authors[] = {
|
|
||||||
"Alexander Iliev <sasoiliev@mamul.org>",
|
|
||||||
"Gauvain Pocentek <gauvainpocentek@gmail.com>",
|
|
||||||
NULL
|
|
||||||
@@ -825,15 +828,17 @@
|
|
||||||
xkb_settings_update_from_ui (t_xkb *xkb)
|
|
||||||
{
|
|
||||||
gchar *layouts, *variants, *kbdmodel, *toggle_option,
|
|
||||||
- *compose_key_position, *tmp;
|
|
||||||
+ *compose_key_position;
|
|
||||||
t_xkb_kbd_config *kbd_config = xkb->settings->kbd_config;
|
|
||||||
gboolean is_default;
|
|
||||||
gint i = 0;
|
|
||||||
|
|
||||||
model = GTK_TREE_MODEL (xkb->combo_store);
|
|
||||||
- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
|
|
||||||
- gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
|
|
||||||
- kbd_config->model = kbdmodel;
|
|
||||||
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter))
|
|
||||||
+ {
|
|
||||||
+ gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
|
|
||||||
+ kbd_config->model = kbdmodel;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
model = GTK_TREE_MODEL (xkb->toggle_options_store);
|
|
||||||
if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
|
|
||||||
--- xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-config.c 2009-03-06 07:16:03.000000000 -0600
|
|
||||||
+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-05-23 16:34:51.141676108 -0500
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
config->application_map = g_hash_table_new (g_direct_hash, NULL);
|
|
||||||
|
|
||||||
registry = xkl_config_registry_get_instance (config->engine);
|
|
||||||
- xkl_config_registry_load (registry);
|
|
||||||
+ xkl_config_registry_load (registry, FALSE);
|
|
||||||
|
|
||||||
config_item = xkl_config_item_new ();
|
|
||||||
|
|
||||||
@@ -214,7 +214,7 @@
|
|
||||||
|
|
||||||
gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
|
|
||||||
|
|
||||||
- xkl_engine_stop_listen (config->engine);
|
|
||||||
+ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
gint
|
|
||||||
@@ -547,7 +547,7 @@
|
|
||||||
if (!config) return NULL;
|
|
||||||
|
|
||||||
registry = xkl_config_registry_get_instance (config->engine);
|
|
||||||
- xkl_config_registry_load (registry);
|
|
||||||
+ xkl_config_registry_load (registry, FALSE);
|
|
||||||
|
|
||||||
return registry;
|
|
||||||
}
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Slackware build script for xfce4-xkb-plugin
|
# Slackware build script for xfce4-xkb-plugin
|
||||||
|
|
||||||
# Copyright 2006-2011 Robby Workman, Northport, Alabama, USA
|
# Copyright 2006-2012 Robby Workman, Northport, Alabama, USA
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use of this script, with or without modification, is
|
# Redistribution and use of this script, with or without modification, is
|
||||||
|
|
@ -23,8 +23,8 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
PRGNAM=xfce4-xkb-plugin
|
PRGNAM=xfce4-xkb-plugin
|
||||||
VERSION=0.5.3.3
|
VERSION=${VERSION:-0.5.4.3}
|
||||||
BUILD=${BUILD:-3}
|
BUILD=${BUILD:-1}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
|
@ -60,7 +60,7 @@ rm -rf $PKG
|
||||||
mkdir -p $TMP $PKG $OUTPUT
|
mkdir -p $TMP $PKG $OUTPUT
|
||||||
cd $TMP
|
cd $TMP
|
||||||
rm -rf $PRGNAM-$VERSION
|
rm -rf $PRGNAM-$VERSION
|
||||||
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
|
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
|
||||||
cd $PRGNAM-$VERSION
|
cd $PRGNAM-$VERSION
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
find . \
|
find . \
|
||||||
|
|
@ -69,20 +69,6 @@ find . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||||
-exec chmod 644 {} \;
|
-exec chmod 644 {} \;
|
||||||
|
|
||||||
# Fixup the plugin for newer libxklavier api
|
|
||||||
# Thanks to Christoph Wickert of the Fedora project :-)
|
|
||||||
# http://lists.fedoraproject.org/pipermail/scm-commits/2010-January/384437.html
|
|
||||||
patch -p1 < $CWD/xfce4-xkb-plugin-libxklavier_api_chance.diff
|
|
||||||
|
|
||||||
# Fixup for some gtk-related crashes
|
|
||||||
# Thanks to Andreas Radke (AndyRTR) or the Arch Linux project :)
|
|
||||||
# https://bugs.archlinux.org/task/21067?project=1&string=xfce4-xkb-plugin
|
|
||||||
patch -p1 < $CWD/xfce4-xkb-plugin-gtk.patch
|
|
||||||
|
|
||||||
# Fix display of Bosnia/Herzegovina flag
|
|
||||||
# Thanks to Armin Besirovic <armin@linux.org.ba> for the report
|
|
||||||
patch -p1 < $CWD/rename_bs_to_ba_dot_svg.diff
|
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
PRGNAM="xfce4-xkb-plugin"
|
PRGNAM="xfce4-xkb-plugin"
|
||||||
VERSION="0.5.3.3"
|
VERSION="0.5.4.3"
|
||||||
HOMEPAGE="http://goodies.xfce.org/"
|
HOMEPAGE="http://goodies.xfce.org/"
|
||||||
DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.5/xfce4-xkb-plugin-0.5.3.3.tar.gz"
|
DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.5/xfce4-xkb-plugin-0.5.4.3.tar.bz2"
|
||||||
MD5SUM="b233cc9de1cbace075eaf6e2c9a8e685"
|
MD5SUM="b31144bd50875ec73f0b3101456c97fd"
|
||||||
DOWNLOAD_x86_64=""
|
DOWNLOAD_x86_64=""
|
||||||
MD5SUM_x86_64=""
|
MD5SUM_x86_64=""
|
||||||
REQUIRES=""
|
REQUIRES=""
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue