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 fc8eab6cb1b1962d7da91e12751a875fcebfe7b5 (commit)
discards 50252eb597088a99e8de2b7a8e99678ad78ee947 (commit)
discards 092f41dff1b9f03186c5dd54c709fc48c0c616e9 (commit)
discards ca124f3a9ed666d80e2a62c3230ac1f517351103 (commit)
discards 39d810385156c824792cb0e29e1e90251674e2be (commit)
discards 3fd75bf1aebd1a57cfe9c582bc05443ebf859cea (commit)
discards f485d1f83fc49757cf687d81dfe352ce6d199412 (commit)
discards 4fc4e84b9ac55868c09045c7c19d8aacfe3dfd66 (commit)
discards a3576243a99c8173309af0cfebd027a0e9f77cfe (commit)
via 244b63e6b5bd039980aa0ea2ac8cbd6ca27b9fdf (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 (fc8eab6cb1b1962d7da91e12751a875fcebfe7b5)
N -- N -- N (244b63e6b5bd039980aa0ea2ac8cbd6ca27b9fdf)
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/244b63e6b5bd039980aa0ea2ac8cbd6ca27b9fdf
commit 244b63e6b5bd039980aa0ea2ac8cbd6ca27b9fdf
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Apr 14 11:29:14 2012 +0200
WindowMaker: New get_texture_image function
The new function get_texture_image includes the common code of
wTextureMakePixmap() and wTextureMakeTGradient()
diff --git a/src/texture.c b/src/texture.c
index a18ed22..dca7b98 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -36,6 +36,7 @@
extern WPreferences wPreferences;
static void bevelImage(RImage * image, int relief);
+static RImage * get_texture_image(WScreen *scr, char *pixmap_file);
WTexSolid *wTextureMakeSolid(WScreen * scr, XColor * color)
{
@@ -265,20 +266,10 @@ WTexPixmap *wTextureMakePixmap(WScreen * scr, int style,
char *pixmap_file, XCol
WTexPixmap *texture;
XGCValues gcv;
RImage *image;
- char *file;
- file = FindImage(wPreferences.pixmap_path, pixmap_file);
- if (!file) {
- wwarning(_("image file "%s" used as texture could not be
found."), pixmap_file);
+ image = get_texture_image(scr, pixmap_file);
+ if (!image)
return NULL;
- }
- image = RLoadImage(scr->rcontext, file, 0);
- if (!image) {
- wwarning(_("could not load texture pixmap "%s":%s"), file,
RMessageForError(RErrorCode));
- wfree(file);
- return NULL;
- }
- wfree(file);
texture = wmalloc(sizeof(WTexture));
memset(texture, 0, sizeof(WTexture));
@@ -303,20 +294,10 @@ WTexTGradient *wTextureMakeTGradient(WScreen * scr, int
style, RColor * from, RC
WTexTGradient *texture;
XGCValues gcv;
RImage *image;
- char *file;
- file = FindImage(wPreferences.pixmap_path, pixmap_file);
- if (!file) {
- wwarning(_("image file "%s" used as texture could not be
found."), pixmap_file);
- return NULL;
- }
- image = RLoadImage(scr->rcontext, file, 0);
- if (!image) {
- wwarning(_("could not load texture pixmap "%s":%s"), file,
RMessageForError(RErrorCode));
- wfree(file);
+ image = get_texture_image(scr, pixmap_file);
+ if (!image)
return NULL;
- }
- wfree(file);
texture = wmalloc(sizeof(WTexture));
memset(texture, 0, sizeof(WTexture));
@@ -341,6 +322,27 @@ WTexTGradient *wTextureMakeTGradient(WScreen * scr, int
style, RColor * from, RC
return texture;
}
+static RImage * get_texture_image(WScreen *scr, char *pixmap_file)
+{
+ char *file;
+ RImage *image;
+
+ file = FindImage(wPreferences.pixmap_path, pixmap_file);
+ if (!file) {
+ wwarning(_("image file "%s" used as texture could not be
found."), pixmap_file);
+ return NULL;
+ }
+ image = RLoadImage(scr->rcontext, file, 0);
+ if (!image) {
+ wwarning(_("could not load texture pixmap "%s":%s"), file,
RMessageForError(RErrorCode));
+ wfree(file);
+ return NULL;
+ }
+ wfree(file);
+
+ return image;
+}
+
RImage *wTextureRenderImage(WTexture * texture, int width, int height, int
relief)
{
RImage *image = NULL;
-----------------------------------------------------------------------
Summary of changes:
src/application.c | 23 ++++++++++--
src/funcs.h | 2 +-
src/icon.c | 52 +++++++++++++--------------
src/misc.c | 98 ++++++++++++++++++++++++++---------------------------
src/rootmenu.c | 5 ++-
src/session.c | 19 +++++++---
src/usermenu.c | 11 +++---
src/wdefaults.c | 18 ++++++---
src/window.c | 2 +-
src/winspector.c | 8 +++--
10 files changed, 133 insertions(+), 105 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].
