1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
|
Description: Upstream changes introduced in version 1.1.1+dfsg2-1
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
fluxbox (1.1.1+dfsg2-1) UNRELEASED; urgency=low
.
[Denis Briand]
* Create extra directory to put all debian's styles and backgrounds.
* New default background, thanks to Thomas Guillot <gtom@gtom.eu>.
* Update copyright file with the CC-by-SA 3 license for
the background picture.
* Update copyright file with the 3-clause BSD license for
debian_squeeze_dark style file.
.
[Paul Tagliamonte]
* Added patch for fbsetbg scale behavior. (Closes: #583704).
Thanks to Jeremiah Mahler for his patch!
* The following themes have been merged from upstream under
a new license: arch, bloe, bora_black, bora_blue, bora_green
carp, green_tea, ostrich, zimek_bisque, zimek_darkblue,
zimek_green. They were moved from CC-BY-SA 2.5 to CC-BY-SA 3.0
.
The person named in the Author field signed this changelog entry.
Author: Paul Tagliamonte <paultag@ubuntu.com>
Bug-Debian: http://bugs.debian.org/583704
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- fluxbox-1.1.1+dfsg2.orig/src/ClientPattern.cc
+++ fluxbox-1.1.1+dfsg2/src/ClientPattern.cc
@@ -378,17 +378,16 @@ string ClientPattern::getProperty(WinPro
return (fbwin && fbwin->isIconHidden()) ? "yes" : "no";
break;
case WORKSPACE: {
- if (!fbwin)
- return "";
+ unsigned int wsnum = (fbwin ? fbwin->workspaceNumber() : client.screen().currentWorkspaceID());
char tmpstr[128];
- sprintf(tmpstr, "%d", fbwin->workspaceNumber());
+ sprintf(tmpstr, "%d", wsnum);
return std::string(tmpstr);
break;
}
case WORKSPACENAME: {
- if (!fbwin)
- return "";
- const Workspace *w = client.screen().getWorkspace(fbwin->workspaceNumber());
+ const Workspace *w = (fbwin ?
+ client.screen().getWorkspace(fbwin->workspaceNumber()) :
+ client.screen().currentWorkspace());
return w ? w->name() : "";
break;
}
|