This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via d6a021ddf6521aa9514c8bd84977fe98dec49378 (commit)
via a32bfddafb21b94e69c7dbad898600643e7d581c (commit)
via f87997542a1e93d30a62dfc3dcd50a17ce457d22 (commit)
via 14d06ba1e168141e81e6303d72564913beea795b (commit)
from 95c68d2b108b51dfbb3b83c6af079560528d7f0a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/d6a021ddf6521aa9514c8bd84977fe98dec49378
commit d6a021ddf6521aa9514c8bd84977fe98dec49378
Author: Tobias Stoeckmann <[email protected]>
Date: Thu May 3 17:54:13 2012 +0200
Avoid memory leak on error path in constructMenu.
diff --git a/src/rootmenu.c b/src/rootmenu.c
index c168279..f9b51ab 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -588,6 +588,8 @@ static void constructMenu(WMenu * menu, WMenuEntry * entry)
separateCommand((char *)entry->clientdata, &path, &cmd);
if (path == NULL || *path == NULL || **path == 0) {
wwarning(_("invalid OPEN_MENU specification: %s"), (char
*)entry->clientdata);
+ if (cmd)
+ wfree(cmd);
return;
}
http://repo.or.cz/w/wmaker-crm.git/commit/a32bfddafb21b94e69c7dbad898600643e7d581c
commit a32bfddafb21b94e69c7dbad898600643e7d581c
Author: Tobias Stoeckmann <[email protected]>
Date: Thu May 3 17:48:56 2012 +0200
Fixed memory leak in wHideAll.
diff --git a/src/actions.c b/src/actions.c
index e0339c4..e730570 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1227,13 +1227,13 @@ void wHideAll(WScreen *scr)
menu = scr->switch_menu;
- windows = malloc(sizeof(WWindow *));
+ windows = wmalloc(sizeof(WWindow *));
if (menu != NULL) {
for (i = 0; i < menu->entry_no; i++) {
windows[wcount] = (WWindow *)
menu->entries[i]->clientdata;
wcount++;
- windows = realloc(windows, sizeof(WWindow *) *
(wcount+1));
+ windows = wrealloc(windows, sizeof(WWindow *) * (wcount
+ 1));
}
} else {
wwin = scr->focused_window;
@@ -1241,7 +1241,7 @@ void wHideAll(WScreen *scr)
while (wwin) {
windows[wcount] = wwin;
wcount++;
- windows = realloc(windows, sizeof(WWindow *) *
(wcount+1));
+ windows = wrealloc(windows, sizeof(WWindow *) * (wcount
+ 1));
wwin = wwin->prev;
}
@@ -1258,6 +1258,8 @@ void wHideAll(WScreen *scr)
wIconifyWindow(wwin);
}
}
+
+ wfree(windows);
}
void wHideOtherApplications(WWindow *awin)
http://repo.or.cz/w/wmaker-crm.git/commit/f87997542a1e93d30a62dfc3dcd50a17ce457d22
commit f87997542a1e93d30a62dfc3dcd50a17ce457d22
Author: Tobias Stoeckmann <[email protected]>
Date: Thu May 3 17:45:28 2012 +0200
Use proper (w)free functions for (w)malloced data.
diff --git a/src/appmenu.c b/src/appmenu.c
index 7c6e6a3..6aac338 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -154,7 +154,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (!entry) {
wMenuDestroy(menu, True);
wwarning("appmenu: out of memory creating menu
for window %lx", win);
- wfree(data);
+ free(data);
return NULL;
}
if (rtext[0] != 0)
diff --git a/src/event.c b/src/event.c
index 50c5a56..2eb0248 100644
--- a/src/event.c
+++ b/src/event.c
@@ -178,7 +178,7 @@ WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *
callback, void *cdata)
handler->client_data = cdata;
if (!deathHandlers)
- deathHandlers = WMCreateArrayWithDestructor(8, wfree);
+ deathHandlers = WMCreateArrayWithDestructor(8, free);
WMAddToArray(deathHandlers, handler);
@@ -192,7 +192,7 @@ static void wdelete_death_handler(WMagicNumber id)
if (!handler || !deathHandlers)
return;
- /* array destructor will call wfree(handler) */
+ /* array destructor will call free(handler) */
WMRemoveFromArray(deathHandlers, handler);
}
diff --git a/src/rootmenu.c b/src/rootmenu.c
index cca29ae..c168279 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -783,7 +783,7 @@ static WMenuEntry *addMenuEntry(WMenu * menu, char *title,
char *shortcut, char
dummy = wMenuCreate(scr, title, False);
dummy->on_destroy = removeShortcutsForMenu;
entry = wMenuAddCallback(menu, title, constructMenu,
path);
- entry->free_cdata = free;
+ entry->free_cdata = wfree;
wMenuEntrySetCascade(menu, entry, dummy);
}
} else if (strcmp(command, "EXEC") == 0) {
@@ -791,7 +791,7 @@ static WMenuEntry *addMenuEntry(WMenu * menu, char *title,
char *shortcut, char
wwarning(_("%s:missing parameter for menu command
"%s""), file_name, command);
else {
entry = wMenuAddCallback(menu, title, execCommand,
wstrconcat("exec ", params));
- entry->free_cdata = free;
+ entry->free_cdata = wfree;
shortcutOk = True;
}
} else if (strcmp(command, "SHEXEC") == 0) {
@@ -799,7 +799,7 @@ static WMenuEntry *addMenuEntry(WMenu * menu, char *title,
char *shortcut, char
wwarning(_("%s:missing parameter for menu command
"%s""), file_name, command);
else {
entry = wMenuAddCallback(menu, title, execCommand,
wstrdup(params));
- entry->free_cdata = free;
+ entry->free_cdata = wfree;
shortcutOk = True;
}
} else if (strcmp(command, "EXIT") == 0) {
@@ -844,7 +844,7 @@ static WMenuEntry *addMenuEntry(WMenu * menu, char *title,
char *shortcut, char
shortcutOk = True;
} else if (strcmp(command, "RESTART") == 0) {
entry = wMenuAddCallback(menu, title, restartCommand, params ?
wstrdup(params) : NULL);
- entry->free_cdata = free;
+ entry->free_cdata = wfree;
shortcutOk = True;
} else if (strcmp(command, "SAVE_SESSION") == 0) {
entry = wMenuAddCallback(menu, title, saveSessionCommand, NULL);
@@ -1344,7 +1344,7 @@ static WMenu *readMenuDirectory(WScreen * scr, char
*title, char **path, char *c
}
}
}
- wfree(buffer);
+ free(buffer);
}
closedir(dir);
http://repo.or.cz/w/wmaker-crm.git/commit/14d06ba1e168141e81e6303d72564913beea795b
commit 14d06ba1e168141e81e6303d72564913beea795b
Author: Tobias Stoeckmann <[email protected]>
Date: Thu May 3 18:01:23 2012 +0200
Fixed some typos.
diff --git a/FAQ b/FAQ
index 37a30c5..4cca2aa 100644
--- a/FAQ
+++ b/FAQ
@@ -857,7 +857,7 @@ badly coded for not setting the instance.class hints.
program for that matter?)
----------------------------------
Right Click on the title bar and choose "Attributes". Click on Panel 2 and
-click the the "Disable titlebar" and "Disable resizebar" options. Click
+click the "Disable titlebar" and "Disable resizebar" options. Click
"Save", "Apply" and then close the Attributes panel.
By Default, to get back to the attributes menu once you've removed the
diff --git a/debian/changelog b/debian/changelog
index 56031d3..248ca31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1507,7 +1507,7 @@ wmaker (0.20.2-2) frozen unstable; urgency=low
* debian/rules: dockit is gone but manpage is still installed
* debian/wmaker.postinst.tmpl: removed the code to add Window Maker to
/etc/X11/window-managers and replaced with register-window-manager
- (the interface provided by the the xbase package). This fixes #28841
+ (the interface provided by the xbase package). This fixes #28841
partially (that's two bugs in one, this is the not-so-important part)
* debian/wmaker.postrm: ditto for removal from /etc/X11/window-managers
* On my system bug #26682 doesn't show up with this build and the new
diff --git a/email-clients.txt b/email-clients.txt
index 860c29a..e9f5dac 100644
--- a/email-clients.txt
+++ b/email-clients.txt
@@ -104,7 +104,7 @@ Then from the "Message" menu item, select insert file and
choose your patch.
As an added bonus you can customise the message creation toolbar menu
and put the "insert file" icon there.
-Make the the composer window wide enough so that no lines wrap. As of
+Make the composer window wide enough so that no lines wrap. As of
KMail 1.13.5 (KDE 4.5.4), KMail will apply word wrapping when sending
the email if the lines wrap in the composer window. Having word wrapping
disabled in the Options menu isn't enough. Thus, if your patch has very
diff --git a/src/client.c b/src/client.c
index 16a4f11..93245e0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -74,7 +74,7 @@ void wClientRestore(WWindow * wwin)
int gx, gy;
wClientGetGravityOffsets(wwin, &gx, &gy);
- /* set the positio of the frame on screen */
+ /* set the position of the frame on screen */
wwin->frame_x -= gx * FRAME_BORDER_WIDTH;
wwin->frame_y -= gy * FRAME_BORDER_WIDTH;
/* if gravity is to the south, account for the border sizes */
diff --git a/src/dock.c b/src/dock.c
index 88ea6eb..83ea2b8 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -2166,7 +2166,7 @@ void wDockDetach(WDock *dock, WAppIcon *icon)
dock->icon_count--;
/* if the dock is not attached to an application or
- * the the application did not set the approriate hints yet,
+ * the application did not set the approriate hints yet,
* destroy the icon */
if (!icon->running || !wApplicationOf(icon->main_window))
wAppIconDestroy(icon);
-----------------------------------------------------------------------
Summary of changes:
FAQ | 2 +-
debian/changelog | 2 +-
email-clients.txt | 2 +-
src/actions.c | 8 +++++---
src/appmenu.c | 2 +-
src/client.c | 2 +-
src/dock.c | 2 +-
src/event.c | 4 ++--
src/rootmenu.c | 12 +++++++-----
9 files changed, 20 insertions(+), 16 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
