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
discards d5de452547b9c3890142e60253757dd0b14e3fde (commit)
via 73eaddfa3a02734c0a7c7d23724b745b0920ef33 (commit)
via a2c297e6a71bfe323589f798bb4a65921b41068b (commit)
via 31b5ee1a5f1e176073443b35a83daab7823e97b3 (commit)
via 3bc48f089325a9cf014aea6d38c3f17d9d0bb193 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (d5de452547b9c3890142e60253757dd0b14e3fde)
N -- N -- N (73eaddfa3a02734c0a7c7d23724b745b0920ef33)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/73eaddfa3a02734c0a7c7d23724b745b0920ef33
commit 73eaddfa3a02734c0a7c7d23724b745b0920ef33
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed Jan 25 09:04:41 2012 +0100
Make ProgName a local variable
ProgName in WindowMaker.h is not needed because this variable is used only
in main.c
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 9e2c5f4..5168910 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -445,7 +445,6 @@ typedef struct WPreferences {
/****** Global Variables ******/
extern Display *dpy;
-extern char *ProgName;
extern unsigned int ValidModMask;
extern char WProgramState;
extern char WProgramSigState;
http://repo.or.cz/w/wmaker-crm.git/commit/a2c297e6a71bfe323589f798bb4a65921b41068b
commit a2c297e6a71bfe323589f798bb4a65921b41068b
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed Jan 25 09:15:44 2012 +0100
Remove unused variables
diff --git a/src/main.c b/src/main.c
index c17dcef..9fc9976 100644
--- a/src/main.c
+++ b/src/main.c
@@ -79,9 +79,6 @@ int wScreenCount = 0;
WPreferences wPreferences;
-WMPropList *wDomainName;
-WMPropList *wAttributeDomainName;
-
WShortKey wKeyBindings[WKBD_LAST];
/* defaults domains */
diff --git a/src/wdefaults.c b/src/wdefaults.c
index eba2573..8df9dc8 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -44,7 +44,6 @@
/* Global stuff */
extern WPreferences wPreferences;
-extern WMPropList *wAttributeDomainName;
extern WDDomain *WDWindowAttributes;
/* Local stuff */
@@ -124,10 +123,6 @@ static void init_wdefaults(WScreen * scr)
AnyWindow = WMCreatePLString("*");
No = WMCreatePLString("No");
- /*
- if (!scr->wattribs) {
- scr->wattribs = PLGetDomain(wAttributeDomainName);
- } */
}
static WMPropList *get_value(WMPropList * dict_win, WMPropList * dict_class,
WMPropList * dict_name,
http://repo.or.cz/w/wmaker-crm.git/commit/31b5ee1a5f1e176073443b35a83daab7823e97b3
commit 31b5ee1a5f1e176073443b35a83daab7823e97b3
Author: Carlos R. Mafra <[email protected]>
Date: Sat Jan 28 14:48:13 2012 +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
diff --git a/src/event.c b/src/event.c
index 1a7b4cb..561b1f2 100644
--- a/src/event.c
+++ b/src/event.c
@@ -130,6 +130,9 @@ static void handleKeyPress(XEvent *event);
static void handleFocusIn(XEvent *event);
static void handleMotionNotify(XEvent *event);
static void handleVisibilityNotify(XEvent *event);
+static void handle_inotify_events(int fd, int wd);
+static void wdelete_death_handler(WMagicNumber id);
+
#ifdef SHAPE
static void handleShapeNotify(XEvent *event);
@@ -182,7 +185,7 @@ WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *
callback, void *cdata)
return handler;
}
-void wDeleteDeathHandler(WMagicNumber id)
+static void wdelete_death_handler(WMagicNumber id)
{
DeathHandler *handler = (DeathHandler *) id;
@@ -312,7 +315,7 @@ void DispatchEvent(XEvent * event)
#ifdef HAVE_INOTIFY
/*
*----------------------------------------------------------------------
- * inotifyHandleEvents-
+ * handle_inotify_events-
* Check for inotify events
*
* Returns:
@@ -325,7 +328,7 @@ void DispatchEvent(XEvent * event)
*/
/* allow 5 simultaneous events, with path + filenames up to 64 chars */
#define BUFF_SIZE ((sizeof(struct inotify_event) + 64)*5)
-void inotifyHandleEvents(int fd, int wd)
+static void handle_inotify_events(int fd, int wd)
{
extern void wDefaultsCheckDomains(void *);
ssize_t eventQLength, i = 0;
@@ -421,7 +424,7 @@ void EventLoop(void)
continue;
}
if (FD_ISSET(inotifyFD, &rfds))
- inotifyHandleEvents(inotifyFD, inotifyWD);
+ handle_inotify_events(inotifyFD, inotifyWD);
}
#endif
}
@@ -514,7 +517,7 @@ static void handleDeadProcess(void *foo)
if (tmp->pid == deadProcesses[deadProcessPtr].pid) {
(*tmp->callback) (tmp->pid,
deadProcesses[deadProcessPtr].exit_status, tmp->client_data);
- wDeleteDeathHandler(tmp);
+ wdelete_death_handler(tmp);
}
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/3bc48f089325a9cf014aea6d38c3f17d9d0bb193
commit 3bc48f089325a9cf014aea6d38c3f17d9d0bb193
Author: Carlos R. Mafra <[email protected]>
Date: Sun Jan 22 18:04:47 2012 +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.
diff --git a/src/dialog.c b/src/dialog.c
index 904eac3..acfb777 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1230,7 +1230,7 @@ void wShowInfoPanel(WScreen * scr)
{
struct mallinfo ma = mallinfo();
snprintf(buffer, sizeof(buffer),
- _("Total allocated memory: %i kB. Total memory in use:
%i kB.n"),
+ _("Total memory allocated: %i kB (in use: %i kB).n"),
(ma.arena + ma.hblkhd) / 1024, (ma.uordblks +
ma.hblkhd) / 1024);
strbuf = wstrappend(strbuf, buffer);
@@ -1244,30 +1244,11 @@ void wShowInfoPanel(WScreen * scr)
strbuf = wstrappend(strbuf, " ");
}
- strbuf = wstrappend(strbuf, _("nAdditional support for: "));
- {
- char *list[9];
- char buf[80];
- int j = 0;
-
- list[j++] = "WMSPEC";
+ strbuf = wstrappend(strbuf, _("nAdditional support for: WMSPEC"));
#ifdef MWM_HINTS
- list[j++] = "MWM";
+ strbuf = wstrappend(strbuf, " and MWM");
#endif
- buf[0] = 0;
- for (i = 0; i < j; i++) {
- if (i > 0) {
- if (i == j - 1)
- strcat(buf, _(" and "));
- else
- strcat(buf, ", ");
- }
- strcat(buf, list[i]);
- }
- strbuf = wstrappend(strbuf, buf);
- }
-
#ifdef XINERAMA
strbuf = wstrappend(strbuf, _("n"));
#ifdef SOLARIS_XINERAMA
-----------------------------------------------------------------------
Summary of changes:
src/WindowMaker.h | 1 -
src/event.c | 13 ++++++++-----
src/main.c | 3 ---
src/wdefaults.c | 5 -----
4 files changed, 8 insertions(+), 14 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].
