mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-30 11:42:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

* glibcompat.c: Move Q_ back ...

Browse Source 
* util.c: ... here.  Q_ is not defined by just including glib.h.
The glib implementation doesn't strip prefix from translations,
so it's not suitable for us.  Finally, it makes man2hlp depend
on libintl.
Reported by Leonard den Ottolander <leonard@den.ottolander.nl>
This commit is contained in:
Pavel Roskin 2005-11-03 02:18:38 +00:00
parent a0aa9fd9d4
commit 7b3b03f9db
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2005-11-02 Pavel Roskin <proski@gnu.org>
* glibcompat.c: Move Q_ back ...
* util.c: ... here. Q_ is not defined by just including glib.h.
The glib implementation doesn't strip prefix from translations,
so it's not suitable for us. Finally, it makes man2hlp depend
on libintl.
Reported by Leonard den Ottolander <leonard@den.ottolander.nl>
2005-11-02 Egmont Koblinger <egmont@uhulinux.hu>
* main.c (directory_history_add): Fix invalid directory preselection on

11
src/glibcompat.c
View File

@ -111,14 +111,3 @@ g_strlcpy (gchar *dest,
#endif /* GLIB_MAJOR_VERSION < 2 */
#ifndef Q_
const char *
Q_ (const char *s)
{
const char *result, *sep;
result = _(s);
sep = strchr(result, '|');
return (sep != NULL) ? sep + 1 : result;
}
#endif /* ! Q_ */

4
src/glibcompat.h
View File

@ -35,8 +35,4 @@ g_slist_delete_link (GSList *list, GSList *link)
#endif /* GLIB_MAJOR_VERSION < 2 */
#ifndef Q_
const char *Q_ (const char *s);
#endif
#endif

11
src/util.c
View File

@ -1507,3 +1507,14 @@ ascii_alpha_to_cntrl (int ch)
}
return ch;
}
const char *
Q_ (const char *s)
{
const char *result, *sep;
result = _(s);
sep = strchr(result, '|');
return (sep != NULL) ? sep + 1 : result;
}

3
src/util.h
View File

@ -261,4 +261,7 @@ void save_file_position (const char *filename, long line, long column);
* else returns the argument. */
extern int ascii_alpha_to_cntrl (int ch);
#undef Q_
const char *Q_ (const char *s);
#endif