Your message dated Sun, 22 Feb 2009 19:02:08 +0000
with message-id <e1lbjaa-0000mw...@ries.debian.org>
and subject line Bug#434124: fixed in xfce4-xkb-plugin 0.5.3.2-1
has caused the Debian Bug report #434124,
regarding xfce4-xkb-plugin: Cannot differentiate layouts with the same
XkbLayout name
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
434124: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=434124
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xfce4-xkb-plugin
Version: 0.4.3-1
Severity: wishlist
Tags: patch
I'm a user of the Dvorak keyboard layout, so I have an xkb entry with
XkbLayout=us, XkbVariant=dvorak. And I want other non-Dvorak users to
be able to type on my keyboard, so I have an extra entry with
XkbLayout=us, XkbVariant=(empty). But since XkbLayout is the same, the
labels shown in xfce4-xkb-plugin is exactly the same. I'd like to have
it at least showing a suffix like "(2)" and "(3)" in such cases so that
they are distinguishable. The attached patch does just that.
Please also forward to upstream.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.21-2-686 (SMP w/1 CPU core)
Locale: LANG=zh_TW.big5, LC_CTYPE=zh_TW.big5 (charmap=BIG5)
Shell: /bin/sh linked to /bin/bash
Versions of packages xfce4-xkb-plugin depends on:
ii libatk1.0-0 1.18.0-2 The ATK accessibility toolkit
ii libc6 2.6-2 GNU C Library: Shared libraries
ii libcairo2 1.4.10-1 The Cairo 2D vector graphics libra
ii libfontconfig1 2.4.2-1.2 generic font configuration library
ii libglib2.0-0 2.12.13-1 The GLib library of C routines
ii libgtk2.0-0 2.10.13-1 The GTK+ graphical user interface
ii libpango1.0-0 1.16.4-3 Layout and rendering of internatio
ii libx11-6 2:1.0.3-7 X11 client-side library
ii libxcursor1 1:1.1.8-2 X cursor management library
ii libxext6 1:1.0.3-2 X11 miscellaneous extension librar
ii libxfce4util4 4.4.1-1 Utility functions library for Xfce
ii libxfcegui4-4 4.4.1-1 Basic GUI C functions for Xfce4
ii libxfixes3 1:4.0.3-2 X11 miscellaneous 'fixes' extensio
ii libxi6 2:1.1.1-1 X11 Input extension library
ii libxinerama1 1:1.0.2-1 X11 Xinerama extension library
ii libxrandr2 2:1.2.1-1 X11 RandR extension library
ii libxrender1 1:0.9.2-1 X Rendering Extension client libra
ii xfce4-panel 4.4.1-1 The Xfce4 desktop environment pane
xfce4-xkb-plugin recommends no packages.
-- no debconf information
diff -ru xfce4-xkb-plugin-0.4.3.orig/panel-plugin/xkb.c xfce4-xkb-plugin-0.4.3/panel-plugin/xkb.c
--- xfce4-xkb-plugin-0.4.3.orig/panel-plugin/xkb.c 2007-01-17 18:02:57.000000000 +0000
+++ xfce4-xkb-plugin-0.4.3/panel-plugin/xkb.c 2007-07-21 17:58:12.000000000 +0100
@@ -103,7 +103,11 @@
get_current_group_name(void)
{
const char *tmp = get_symbol_name_by_res_no(current_group_xkb_no);
- return g_utf8_strdown (tmp, -1);
+ char *tmp2 = g_utf8_strdown (tmp, -1);
+ char *start = strchr(tmp2, '(');
+ if (start)
+ *start = '\0';
+ return tmp2;
}
void
@@ -116,6 +120,33 @@
current_group_res_no = group_xkb_to_res(current_group_xkb_no);
}
+static void
+differentiate_symbol_names(void)
+{
+ GHashTable* symbol_cnt;
+ int i, cnt;
+ gchar *temp_str;
+
+ symbol_cnt = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+ for (i = 0; i < group_count; ++i) {
+ cnt = GPOINTER_TO_INT
+ (g_hash_table_lookup(symbol_cnt, symbol_names[i]));
+ g_hash_table_insert(symbol_cnt, g_strdup(symbol_names[i]),
+ GINT_TO_POINTER(cnt + 1));
+ }
+ for (i = group_count - 1; i >= 0; --i) {
+ cnt = GPOINTER_TO_INT(g_hash_table_lookup(symbol_cnt, symbol_names[i]));
+ g_hash_table_insert(symbol_cnt, g_strdup(symbol_names[i]),
+ GINT_TO_POINTER(cnt - 1));
+ if (cnt > 1) {
+ temp_str = g_strdup_printf("%s(%i)", symbol_names[i], cnt);
+ g_free(symbol_names[i]);
+ symbol_names[i] = temp_str;
+ }
+ }
+ g_hash_table_destroy(symbol_cnt);
+}
+
int
do_init_xkb()
{
@@ -270,6 +301,7 @@
break;
}
}
+ differentiate_symbol_names();
XkbGetState(dsp, device_id, &xkb_state);
current_group_xkb_no = xkb_state.group;
--- End Message ---
--- Begin Message ---
Source: xfce4-xkb-plugin
Source-Version: 0.5.3.2-1
We believe that the bug you reported is fixed in the latest version of
xfce4-xkb-plugin, which is due to be installed in the Debian FTP archive:
xfce4-xkb-plugin_0.5.3.2-1.diff.gz
to pool/main/x/xfce4-xkb-plugin/xfce4-xkb-plugin_0.5.3.2-1.diff.gz
xfce4-xkb-plugin_0.5.3.2-1.dsc
to pool/main/x/xfce4-xkb-plugin/xfce4-xkb-plugin_0.5.3.2-1.dsc
xfce4-xkb-plugin_0.5.3.2-1_amd64.deb
to pool/main/x/xfce4-xkb-plugin/xfce4-xkb-plugin_0.5.3.2-1_amd64.deb
xfce4-xkb-plugin_0.5.3.2.orig.tar.gz
to pool/main/x/xfce4-xkb-plugin/xfce4-xkb-plugin_0.5.3.2.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 434...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Yves-Alexis Perez <cor...@debian.org> (supplier of updated xfce4-xkb-plugin
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 22 Feb 2009 19:45:42 +0100
Source: xfce4-xkb-plugin
Binary: xfce4-xkb-plugin
Architecture: source amd64
Version: 0.5.3.2-1
Distribution: unstable
Urgency: low
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
Changed-By: Yves-Alexis Perez <cor...@debian.org>
Description:
xfce4-xkb-plugin - xkb layout switch plugin for the Xfce4 panel
Closes: 434124 445335 496183
Changes:
xfce4-xkb-plugin (0.5.3.2-1) unstable; urgency=low
.
[ Simon Huggins ]
* debian/control: Move fake Homepage field to a real one now dpkg
supports it.
* Add Vcs-* headers to debian/control
.
[ Yves-Alexis Perez ]
* New upstream release.
- fix mispell in README file. closes: #445335
- now displays variant. closes: #496183, #434124
* debian/control:
- add myself to Uploaders:, remove Rudy Godoy and Martin Loschwitz.
- update standards version to 3.8.0.
- add build-dep on libxklavier12-dev, librsvg2-dev, libwnck-dev,
intltool.
- add dep on ${misc:Depends}.
* debian/copyright: update dates and copyright owners.
Checksums-Sha1:
0120bd2aff1034d8d831b6a2b6c58bc2044a45a7 1508 xfce4-xkb-plugin_0.5.3.2-1.dsc
3277affa0e5ece0b580428bbb8d7c6787d94c4a7 762139
xfce4-xkb-plugin_0.5.3.2.orig.tar.gz
e1e1e69277dc0d9fcca84631bd8ce7ae995ad077 2323
xfce4-xkb-plugin_0.5.3.2-1.diff.gz
404e30b30080773cd03390fb8ceade5fe73c9387 460168
xfce4-xkb-plugin_0.5.3.2-1_amd64.deb
Checksums-Sha256:
5fd5c91bf410e4c2688a4958f3ba2f0305c801b9d1e7c6cd03634e055a5f227a 1508
xfce4-xkb-plugin_0.5.3.2-1.dsc
893b720ceca12c8e94851c874b842ef08c3fbb50a539ab599d2f888901847cd6 762139
xfce4-xkb-plugin_0.5.3.2.orig.tar.gz
0b8c838c98c26862bba9ab9b7bbb8531f537a888109c8fe06814ff577635d783 2323
xfce4-xkb-plugin_0.5.3.2-1.diff.gz
2a0f8f3fe32c9d2ac142a3ce1ae98609a03af1f498614318d139b083f060b367 460168
xfce4-xkb-plugin_0.5.3.2-1_amd64.deb
Files:
3b1ac6e2a85fb1081e4758119a11933c 1508 x11 optional
xfce4-xkb-plugin_0.5.3.2-1.dsc
235038face497d92b1b8f540ec2d270c 762139 x11 optional
xfce4-xkb-plugin_0.5.3.2.orig.tar.gz
aab54bec9172fefdc52bf966914a206c 2323 x11 optional
xfce4-xkb-plugin_0.5.3.2-1.diff.gz
334ba9eecf815b84606752025af6f921 460168 x11 optional
xfce4-xkb-plugin_0.5.3.2-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkmhngkACgkQTUTAIMXAW66JpACfW+FGHWkDTPkrPdeg4+mQlsSY
4Y4AnjjYkBVpXwggowF2ul3HrPfc+xeV
=oBDF
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Pkg-xfce-devel mailing list
Pkg-xfce-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-xfce-devel
