Public Git Hosting - wmaker-crm.git/rss log

debian: Don't include files created under debian/ from previous builds in the tarball.

Wed, 8 Feb 2012 08:51:57 +0000

debian: Don't include files created under debian/ from previous builds in the tarball.

[D B H] debian/nightly_build.sh

Fix getstyle, again

Fri, 3 Feb 2012 01:15:05 +0000

Fix getstyle, again

As reported by Paul Seelig, it used to be the case that

getstyle -t ~/GNUstep/Library/WindowMaker/Themes/somefile

would save the current theme, and all old menus (WMRootMenu) were
relying on this.

The problem was that the following piece (from commit 6bf79945)

	if (style_file && !make_pack)
		print_help(0, 1);

would allow a style_file to be specified and saved to only with the
option -p (which implies make_pack), therefore saving a theme with
-t like the root menu used to do no longer worked.

Now things work fine:

[mafra@Pilar:~]$ ls GNUstep/
Applications/  Apps/  Defaults/  Library/
[mafra@Pilar:~]$ getstyle -t ~/GNUstep/theme
[mafra@Pilar:~]$ ls GNUstep/
Applications/  Apps/  Defaults/  Library/  theme

But also note that trying to save a theme outside of GNUstep/
is not allowed and it prints no error message - perhaps it should...

[D B H] util/getstyle.c

Revert "getstyle: Remove dead code"

Thu, 2 Feb 2012 23:47:54 +0000

Revert "getstyle: Remove dead code"

This reverts commit e06b3005e833d4c34f9b5671daa0cc44f4f9ea52.

[D B H] util/getstyle.c

debian: Symbols update for libWutil2

Wed, 1 Feb 2012 18:01:27 +0000

debian: Symbols update for libWutil2

In commit e1453087f57... the function copy_file() was renamed to
wcopy_file(), then the symbols file needs to be updated.

The changelog includes a new debian bug closed.

[D B H] debian/changelog
[D B H] debian/libwutil2.symbols

Remove forgotten src/text.h

Tue, 31 Jan 2012 19:30:17 +0000

Remove forgotten src/text.h

It should have been removed together with src/text.c in
commit 215a57077c998 ("wtext killing spree").

Thanks to John Robinson for pointing it out.

[D B H] src/menu.c
[D B H] src/text.h

WINGs: Rename copy_file() to wcopy_file()

Tue, 31 Jan 2012 10:26:59 +0000

WINGs: Rename copy_file() to wcopy_file()

...in order to avoid clashes that happen during compilation of
wmakerconf.

This is a new function in WINGs, so renaming it at this point is
not a big deal.

Thanks to Rodolfo García for the heads up.

[D B H] WINGs/WINGs/WUtil.h
[D B H] WINGs/findfile.c
[D B H] WINGs/wcolorpanel.c
[D B H] util/getstyle.c

debian: New debian version 0.95.1-1

Sun, 29 Jan 2012 16:07:10 +0000

debian: New debian version 0.95.1-1

This upload includes the debian changes of 0.95.0 and 0.95.1
  - Debian stuff (themes, menus,...) is moved to different folder.
  - Many changes in debian/rules file
    - New files to avoid lines in debian/rules (new menu files)
  - This is a little extract form the debian/changelog file:

  * New upstream version 0.95.1
  * The WINGs's file proplist-compat.h is removed in upstream.
    - Removed the line in debian/libwings-dev.install
  * Updated debian/libwutil2.symbols with new symbol.
  * libpng12-dev dependencies changed to libpng-dev. [Closes: #648123]
  * wterm package suggestion removed.
  * Menu shows "Run..." option. [Closes: #165075]
    Thanks to Andreas Tscharner for their patch.
  * Menu shows the background files [Closes: #655122]
    * Added patch 54_Debian_wmmacros.diff.
      Based on changelog: Marcelo E. Magallon Tue, 17 Nov 1998
  * Xterm and WMPrefs are now Debian specific.
    * Added patch 53_Debian_WMState.diff.
      Based on changelog: Marcelo E. Magallon Sun, 26 Nov 2000
  * Fix wmaker-common dependencies. [Closes: #654668]
    * Manpages moved from wmaker-common to wmaker (Lintian problem).
  * Removed old stuff in wmaker.post* and wmaker-common.post* about
    update-alternatives.
  * Fix to the FTBFS. [Closes: #654524]
  * New debian/watch file
  * New upstream version 0.95.0, now from git. [Closes: #401900]
    [Closes: #514438, #607550, #218110, #583734, #105351, #549157]
    [Closes: #283610, #311563, #310285, #329783, #280819, #284048]
    [Closes: #292391, #361241, #364290, #148370, #287459, #122076]
    [Closes: #175503, #79598, #78088, #68381, #38184, #41434, #41434]
    [Closes: #94960, #39543, #63265, #69499, #94446, #77488, #329783]
    Thanks to Andreas Tscharner for their bug revision.
    * This new version is based in wmaker-crm a wmaker fork, because
      wmaker (original) is not updated.
  * New debian/rules file. [Closes: #590244]
    * Many many changes
    * /usr/lib/WindowMaker/WindowMaker is now /usr/lib/WindowMaker/wmaker
      * wmaker script launch now /usr/lib/WindowMaker/wmaker
  * New maintainer. [Closes: #632875]
  * New package wmaker-common (arch independent files).
  * Removed the asclock diversions from the wmaker install scripts
    wmaker.postrm and wmaker.preinst because asclock binary is not
    included in wmaker package (see asclock package).
  * New package wmaker-common with the arch independent files.
  * debian/patches are now DEP-3.
  * debian/copyright is now DEP-5.
  * Bumped Standars-Version 3.9.2.
  * Manpages moved to upstream.
  * Solved problems with .la files (lintian clean).
  * libwmaker0-dev isn't included, because was removed in upstream.

[D B H] debian/TODO
[D B H] debian/changelog
[D B H] debian/clean
[D B H] debian/control
[D B H] debian/copyright
[D B H] debian/debian.tiff.uu
[D B H] debian/debianfiles/Theme/Debian
[D B H] debian/debianfiles/Theme/Debian.theme.txt
[D B H] debian/debianfiles/Theme/debian.tiff
[D B H] debian/debianfiles/conf/WMRootMenu
[D B H] debian/debianfiles/conf/WMWindowAttributes
[D B H] debian/debianfiles/conf/WindowMaker
[D B H] debian/debianfiles/menu/menu.posthook
[D B H] debian/debianfiles/menu/menu.prehook
[D B H] debian/debianfiles/menu/wmappearance
[D B H] debian/debianfiles/upgrade-windowmaker-defaults
[D B H] debian/debianfiles/wmaker
[D B H] debian/debianfiles/wmaker-common.desktop
[D B H] debian/libwings-dev.changelog-upstream
[D B H] debian/libwings-dev.docs
[D B H] debian/libwings-dev.install
[D B H] debian/libwings2.changelog-upstream
[D B H] debian/libwings2.symbols
[D B H] debian/libwmaker0-dev.install
[D B H] debian/libwraster3-dev.changelog-upstream
[D B H] debian/libwraster3.changelog-upstream
[D B H] debian/libwraster3.docs
[D B H] debian/libwraster3.postinst
[D B H] debian/libwraster3.symbols
[D B H] debian/libwutil2.changelog-upstream
[D B H] debian/libwutil2.symbols
[D B H] debian/patches/52_libwmaker0dev.diff
[D B H] debian/patches/53_Debian_WMState.diff
[D B H] debian/patches/54_Debian_wmmacros.diff
[D B H] debian/patches/series
[D B H] debian/rules
[D B H] debian/source/include-binaries
[D B H] debian/source/options
[D B H] debian/watch
[D B H] debian/wmaker-common.changelog-upstream
[D B H] debian/wmaker-common.docs
[D B H] debian/wmaker-common.install
[D B H] debian/wmaker-common.lintian-overrides
[D B H] debian/wmaker-common.manpages
[D B H] debian/wmaker-common.postinst
[D B H] debian/wmaker-common.postrm
[D B H] debian/wmaker-dbg.changelog-upstream
[D B H] debian/wmaker.changelog-upstream
[D B H] debian/wmaker.install
[D B H] debian/wmaker.links
[D B H] debian/wmaker.lintian-overrides
[D B H] debian/wmaker.manpages
[D B H] debian/wmaker.menu
[D B H] debian/wmaker.postinst
[D B H] debian/wmaker.postrm

Window Maker 0.95.1

Sun, 29 Jan 2012 11:12:04 +0000

Window Maker 0.95.1

[D B H] configure.ac

Make ProgName a local variable

Wed, 25 Jan 2012 08:04:41 +0000

Make ProgName a local variable

ProgName in WindowMaker.h is not needed because this variable is used only
in main.c

[D B H] src/WindowMaker.h

Remove unused variables

Wed, 25 Jan 2012 08:15:44 +0000

Remove unused variables

[D B H] src/main.c
[D B H] src/wdefaults.c

event.c: Make two functions static

Sat, 28 Jan 2012 14:48:13 +0000

event.c: Make two functions static

Saves 120 bytes:

[mafra@Pilar:wmaker.git]$ size src/event.o*
   text    data     bss     dec     hex filename
  12568       0    1068   13636    3544 src/event.o.new
  12688       0    1068   13756    35bc src/event.o.old

[D B H] src/event.c

Info panel: Shorten memory line and simplify code a bit

Sun, 22 Jan 2012 18:04:47 +0000

Info panel: Shorten memory line and simplify code a bit

With the fonts I use here, the memory information line in the "Info panel"
did not fit inside the window. So make that line a bit shorter by displaying

	Total memory allocated: 2600 kB (in use: 2182 kB)

instead of

	Total allocated memory: 2600 kB. Total memory in use: 2182 kB.

Furthermore, the surrounding code was a bit convoluted to display either

"Additional support for: WMSPEC"

or

"Additional support for: WMSPEC and MW"

As WMSPEC is always present and it doesn't seem we are adding more stuff
to support, one can do the same with a shorter code which reads a little
bit better.

[D B H] src/dialog.c

Inotify: Reload keyboard shortcut definitions when configuration changes

Sun, 22 Jan 2012 16:11:04 +0000

Inotify: Reload keyboard shortcut definitions when configuration changes

Despite having the inotify mechanism compiled in my WM, everytime I
changed a keyboard shortcut definition in the WMRootMenu via WPrefs
I was required to open the WMRootMenu (eg with the F12 key) for the
change to take effect...annoying.

So explicitly reload the key bindings when a modification inside
~/GNUstep/Defaults/ is detected. As the inotify mechanism calls the
function wDefaultsCheckDomains() when that happens, let's add a call
to rebind_key_grabs() in there.

Now it works fine and changes are automatically in effect once WPrefs
writes the menu.

PS: rebindKeygrabs() renamed to rebind_key_grabs()...

[D B H] src/defaults.c
[D B H] src/rootmenu.c
[D B H] src/rootmenu.h

Inotify: Use wwarning() instead of fprintf()

Sun, 22 Jan 2012 10:16:20 +0000

Inotify: Use wwarning() instead of fprintf()

[D B H] src/event.c

WPrefs: Remove extra include of src/wconfig.h

Sat, 21 Jan 2012 12:49:12 +0000

WPrefs: Remove extra include of src/wconfig.h

The file ../src/wconfig.h is included twice, remove one entry.

[D B H] WPrefs.app/WPrefs.h

WPrefs: Remove duplicated function captureShortcut()

Tue, 17 Jan 2012 20:43:58 +0000

WPrefs: Remove duplicated function captureShortcut()

The function captureShortcut() is implemented in both files KeyboardShortcuts.c
and Menu.c, with just a minor difference regarding the conversion to upper case.

To unify them, define a new function which includes a new boolean paramenter to
dictate whether the upper case conversion should be done or not.

[D B H] WPrefs.app/KeyboardShortcuts.c
[D B H] WPrefs.app/Menu.c

WINGs: Remove proplist-compat.h

Tue, 17 Jan 2012 18:32:44 +0000

WINGs: Remove proplist-compat.h

It is not needed to compile Window Maker and it is not used by other
applications (tested in Debian). Therefore the file should be removed.

[D B H] WINGs/WINGs/Makefile.am
[D B H] WINGs/WINGs/proplist-compat.h

WPrefs: Remove trimstr() and use wtrimspace() from WINGs

Thu, 19 Jan 2012 01:12:58 +0000

WPrefs: Remove trimstr() and use wtrimspace() from WINGs

There's no need to have a private function while there's one in WINGs.

Besides that, it does not remove trailing whitespaces appropriately as I
just tested by adding trailing space in the shortcut captured by WPrefs.
It is not trimmed before saving it:

[mafra@Pilar:Defaults]$ grep CloseKey WindowMaker
  CloseKey = "Mod1+C    ";

Using wtrimspace() fixes that and even saves 208 bytes of code:

[mafra@Pilar:WPrefs.app]$ size KeyboardShortcuts.o.*
   text    data     bss     dec     hex filename
   7703       0       0    7703    1e17 KeyboardShortcuts.o.new
   7911       0       0    7911    1ee7 KeyboardShortcuts.o.old

Signed-off-by: Carlos R. Mafra

[D B H] WPrefs.app/KeyboardShortcuts.c

Get rid of cropline(), use wtrimspace() instead

Tue, 17 Jan 2012 15:34:15 +0000

Get rid of cropline(), use wtrimspace() instead

There is code duplication with the cropline() function, so get rid
of it and use WINGs wtrimspace() instead.

Signed-off-by: Carlos R. Mafra

[D B H] src/rootmenu.c
[D B H] src/workspace.c

Remove endian swap for icon image data.

Tue, 17 Jan 2012 00:00:16 +0000

Remove endian swap for icon image data.

On my PowerPC Debian Squeeze System, the icons are colored
incorrectly. This patch removes the swapping of the data on Big Endian
systems, thus causing the icons to be colored correctly.

The data appears to already be in the native endian format.

[D B H] src/wmspec.c