gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-25 16:02:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix some double newlines

Browse Source 
Just a couple that woud now print double (or several more) newlines.

Signed-off-by: Tamas TEVESZ <ice@extreme.hu>
This commit is contained in:
Tamas TEVESZ
2010-09-28 02:09:51 +02:00
committed by Carlos R. Mafra
parent 8594c39a0b
commit 94a0c7b42f
11 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dock.c
View File

@@ -865,7 +865,7 @@ static void launchDockedApplication(WAppIcon * btn, Bool withSelection)
dockIconPaint(btn);
}
} else {
wwarning(_("could not launch application %s\n"), btn->command);
wwarning(_("could not launch application %s"), btn->command);
btn->launching = 0;
if (!btn->relaunching) {
btn->running = 0;

3
src/main.c
View File

@@ -494,8 +494,7 @@ static void inotifyWatchConfig()
*/
inotifyWD = inotify_add_watch(inotifyFD, watchPath, IN_ALL_EVENTS);
if (inotifyWD < 0) {
wwarning(_("could not add an inotify watch on path\n."
"%s\n"
wwarning(_("could not add an inotify watch on path %s."
"Changes to the defaults database will require"
" a restart to take effect."), watchPath);
close(inotifyFD);

12
src/startup.c
View File

@@ -175,7 +175,7 @@ static int catchXError(Display * dpy, XErrorEvent * error)
return 0;
}
FormatXError(dpy, error, buffer, MAXLINE);
wwarning(_("internal X error: %s\n"), buffer);
wwarning(_("internal X error: %s"), buffer);
return -1;
}
@@ -228,13 +228,13 @@ static RETSIGTYPE handleExitSig(int sig)
sigprocmask(SIG_BLOCK, &sigs, NULL);
if (sig == SIGUSR1) {
wwarning("got signal %i - restarting\n", sig);
wwarning("got signal %i - restarting", sig);
SIG_WCHANGE_STATE(WSTATE_NEED_RESTART);
} else if (sig == SIGUSR2) {
wwarning("got signal %i - rereading defaults\n", sig);
wwarning("got signal %i - rereading defaults", sig);
SIG_WCHANGE_STATE(WSTATE_NEED_REREAD);
} else if (sig == SIGTERM || sig == SIGINT || sig == SIGHUP) {
wwarning("got signal %i - exiting...\n", sig);
wwarning("got signal %i - exiting...", sig);
SIG_WCHANGE_STATE(WSTATE_NEED_EXIT);
}
@@ -255,7 +255,7 @@ static void dummyHandler(int sig)
*/
static RETSIGTYPE handleSig(int sig)
{
wfatal("got signal %i\n", sig);
wfatal("got signal %i", sig);
/* Setting the signal behaviour back to default and then reraising the
* signal is a cleaner way to make program exit and core dump than calling
@@ -676,7 +676,7 @@ void StartUp(Bool defaultScreenOnly)
/* check sanity of some values */
if (wPreferences.icon_size < 16) {
wwarning(_("icon size is configured to %i, but it's too small. Using 16, instead\n"),
wwarning(_("icon size is configured to %i, but it's too small. Using 16 instead"),
wPreferences.icon_size);
wPreferences.icon_size = 16;
}

2
src/superfluous.c
View File

@@ -385,7 +385,7 @@ static int bounceDirection(WAppIcon *aicon)
break;
default:
wwarning(_("Impossible direction: %d\n"), dir);
wwarning(_("Impossible direction: %d"), dir);
dir = 3;
break;
}

4
src/window.c
View File

@@ -2726,7 +2726,7 @@ static void resizebarMouseDown(WCoreWindow *sender, void *data, XEvent *event)
#ifndef NUMLOCK_HACK
if ((event->xbutton.state & ValidModMask)
!= (event->xbutton.state & ~LockMask)) {
wwarning(_("the NumLock, ScrollLock or similar key seems to be turned on.\n"
wwarning(_("The NumLock, ScrollLock or similar key seems to be turned on. "
"Turn it off or some mouse actions and keyboard shortcuts will not work."));
}
#endif
@@ -2884,7 +2884,7 @@ static void titlebarMouseDown(WCoreWindow *sender, void *data, XEvent *event)
#ifndef NUMLOCK_HACK
if ((event->xbutton.state & ValidModMask)
!= (event->xbutton.state & ~LockMask)) {
wwarning(_("the NumLock, ScrollLock or similar key seems to be turned on.\n"
wwarning(_("The NumLock, ScrollLock or similar key seems to be turned on. "
"Turn it off or some mouse actions and keyboard shortcuts will not work."));
}
#endif

63
src/xmodifier.c
View File

@@ -121,42 +121,42 @@ static void x_reset_modifier_mapping(Display * display)
int mode_bit = 0;
XModifierKeymap *x_modifier_keymap = XGetModifierMapping(display);
#define modwarn(name,old,other) \
wwarning ("%s (0x%x) generates %s, which is generated by %s.\n\n", \
name, code, index_to_name (old), other), \
#define modwarn(name,old,other) \
wwarning ("%s (0x%x) generates %s, which is generated by %s.", \
name, code, index_to_name (old), other), \
warned_about_overlapping_modifiers = 1
#define modbarf(name,other) \
wwarning ("%s (0x%x) generates %s, which is nonsensical.\n\n", \
name, code, other), \
#define modbarf(name,other) \
wwarning ("%s (0x%x) generates %s, which is nonsensical.", \
name, code, other), \
warned_about_predefined_modifiers = 1
#define check_modifier(name,mask) \
if ((1<<modifier_index) != mask) \
wwarning ("%s (0x%x) generates %s, which is nonsensical.\n\n", \
name, code, index_to_name (modifier_index)), \
#define check_modifier(name,mask) \
if ((1<<modifier_index) != mask) \
wwarning ("%s (0x%x) generates %s, which is nonsensical.", \
name, code, index_to_name (modifier_index)), \
warned_about_predefined_modifiers = 1
#define store_modifier(name,old) \
if (old && old != modifier_index) \
wwarning ("%s (0x%x) generates both %s and %s, which is nonsensical.\n\n",\
name, code, index_to_name (old), \
index_to_name (modifier_index)), \
warned_about_duplicate_modifiers = 1; \
if (modifier_index == ShiftMapIndex) modbarf (name,"ModShift"); \
else if (modifier_index == LockMapIndex) modbarf (name,"ModLock"); \
else if (modifier_index == ControlMapIndex) modbarf (name,"ModControl"); \
else if (sym == XK_Mode_switch) \
mode_bit = modifier_index; /* Mode_switch is special, see below... */ \
else if (modifier_index == meta_bit && old != meta_bit) \
modwarn (name, meta_bit, "Meta"); \
else if (modifier_index == super_bit && old != super_bit) \
modwarn (name, super_bit, "Super"); \
else if (modifier_index == hyper_bit && old != hyper_bit) \
modwarn (name, hyper_bit, "Hyper"); \
else if (modifier_index == alt_bit && old != alt_bit) \
modwarn (name, alt_bit, "Alt"); \
else \
#define store_modifier(name,old) \
if (old && old != modifier_index) \
wwarning ("%s (0x%x) generates both %s and %s, which is nonsensical.", \
name, code, index_to_name (old), \
index_to_name (modifier_index)), \
warned_about_duplicate_modifiers = 1; \
if (modifier_index == ShiftMapIndex) modbarf (name,"ModShift"); \
else if (modifier_index == LockMapIndex) modbarf (name,"ModLock"); \
else if (modifier_index == ControlMapIndex) modbarf (name,"ModControl"); \
else if (sym == XK_Mode_switch) \
mode_bit = modifier_index; /* Mode_switch is special, see below... */ \
else if (modifier_index == meta_bit && old != meta_bit) \
modwarn (name, meta_bit, "Meta"); \
else if (modifier_index == super_bit && old != super_bit) \
modwarn (name, super_bit, "Super"); \
else if (modifier_index == hyper_bit && old != hyper_bit) \
modwarn (name, hyper_bit, "Hyper"); \
else if (modifier_index == alt_bit && old != alt_bit) \
modwarn (name, alt_bit, "Alt"); \
else \
old = modifier_index;
mkpm = x_modifier_keymap->max_keypermod;
@@ -253,8 +253,7 @@ static void x_reset_modifier_mapping(Display * display)
else if (mode_bit == alt_bit)
warn = "Alt", alt_bit = 0;
if (warn) {
wwarning
("%s is being used for both Mode_switch and %s.\n\n",
wwarning("%s is being used for both Mode_switch and %s.",
index_to_name(mode_bit), warn), warned_about_overlapping_modifiers = 1;
}
}