← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/mumble/GlobalShortcut_unix.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig, Patrick Matthäi, Thorvald Natvig
  • Date: 2011-02-19 22:58:58 UTC
  • mfrom: (9.1.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110219225858-0xlftrf4z1z4jt9e
Tags: 1.2.3-1
[ Patrick Matthäi ]
* Do not build with non existant libpulse-dev on hurd-i386.

[ Thorvald Natvig ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mumble/GlobalShortcut_unix.cpp
315
315
                        return QLatin1String("0x")+QString::number(key,16);
316
316
                } else {
317
317
                        const char *str=XKeysymToString(ks);
318
 
                        if (strlen(str) == 0) {
 
318
                        if (*str == '\0') {
319
319
                                return QLatin1String("KS0x")+QString::number(ks, 16);
320
320
                        } else {
321
321
                                return QLatin1String(str);