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 15993e7a48cb8979977e6f1c13aa7c498fded6f9 (commit)
via e1453087f57b2b2e60fad691fe3df7899b325bbf (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 (15993e7a48cb8979977e6f1c13aa7c498fded6f9)
N -- N -- N (e1453087f57b2b2e60fad691fe3df7899b325bbf)
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/e1453087f57b2b2e60fad691fe3df7899b325bbf
commit e1453087f57b2b2e60fad691fe3df7899b325bbf
Author: Carlos R. Mafra <crma...@gmail.com>
Date: Tue Jan 31 10:26:59 2012 +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.
diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h
index 4872df5..4ba6662 100644
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
@@ -201,7 +201,7 @@ char* wfindfileinarray(WMPropList* array, char *file);
char* wexpandpath(char *path);
-int copy_file(char *toPath, char *srcFile, char *destFile);
+int wcopy_file(char *toPath, char *srcFile, char *destFile);
/* don't free the returned string */
char* wgethomedir(void);
diff --git a/WINGs/findfile.c b/WINGs/findfile.c
index 70493a5..eb50609 100644
--- a/WINGs/findfile.c
+++ b/WINGs/findfile.c
@@ -408,7 +408,7 @@ char *wfindfileinarray(WMPropList * array, char *file)
return NULL;
}
-int copy_file(char *dir, char *src_file, char *dest_file)
+int wcopy_file(char *dir, char *src_file, char *dest_file)
{
FILE *src, *dst;
size_t nread, nwritten;
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 03e8223..0586766 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -2924,7 +2924,7 @@ static void customPaletteMenuNewFromFile(W_ColorPanel *
panel)
/* Copy image to $(gnustepdir)/Library/Colors/ &
* Add filename to history menu */
- if (copy_file(panel->configurationPath, filepath, filename) ==
0) {
+ if (wcopy_file(panel->configurationPath, filepath, filename) ==
0) {
/* filepath is a "local" path now the file has been
copied */
wfree(filepath);
diff --git a/util/getstyle.c b/util/getstyle.c
index a988946..e7afbe4 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -171,7 +171,7 @@ void findCopyFile(char *dir, char *file)
if (ThemePath)
(void)wrmdirhier(ThemePath);
}
- copy_file(dir, fullPath, fullPath);
+ wcopy_file(dir, fullPath, fullPath);
free(fullPath);
}
@@ -227,7 +227,7 @@ void makeThemePack(WMPropList * style, char *themeName)
p = strrchr(WMGetFromPLString(file), '/');
if (p) {
- copy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
+ wcopy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
newPath = wstrdup(p + 1);
WMDeleteFromPLArray(value, 1);
@@ -246,7 +246,7 @@ void makeThemePack(WMPropList * style, char *themeName)
p = strrchr(WMGetFromPLString(file), '/');
if (p) {
- copy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
+ wcopy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
newPath = wstrdup(p + 1);
WMDeleteFromPLArray(value, 1);
@@ -260,7 +260,7 @@ void makeThemePack(WMPropList * style, char *themeName)
p = strrchr(WMGetFromPLString(file), '/');
if (p) {
- copy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
+ wcopy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
newPath = wstrdup(p + 1);
WMDeleteFromPLArray(value, 2);
-----------------------------------------------------------------------
Summary of changes:
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
