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
via 5650b0b93d5d0dbc23e749b55a71562fd3dee94e (commit)
from 2be53e92e671244e13353613941fb638bd29e728 (commit)
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/5650b0b93d5d0dbc23e749b55a71562fd3dee94e
commit 5650b0b93d5d0dbc23e749b55a71562fd3dee94e
Author: Carlos R. Mafra <[email protected]>
Date: Wed Jun 20 21:13:54 2012 +0100
Do not waste time if no_appicon is set
This reverts commit "Create WAppIcon always".
There is no point in doing work (like trying to find the icon
in the dock) if no_appicon is set.
The above commit also introduced a regression. In some situations the
space which would be occupied by the appicon would not be made available
to other icons if the application had no_appicon set.
diff --git a/src/appicon.c b/src/appicon.c
index 6cc2bca..c77633d 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -956,9 +956,6 @@ void create_appicon_from_dock(WWindow *wwin, WApplication
*wapp, Window main_win
{
WScreen *scr = wwin->screen_ptr;
- /* Create the application icon */
- wapp->app_icon = NULL;
-
if (scr->last_dock)
wapp->app_icon = findDockIconFor(scr->last_dock, main_window);
diff --git a/src/application.c b/src/application.c
index f0122f0..c98a3e8 100644
--- a/src/application.c
+++ b/src/application.c
@@ -143,13 +143,21 @@ WApplication *wApplicationCreate(WWindow * wwin)
/* application descriptor */
XSaveContext(dpy, main_window, wAppWinContext, (XPointer) wapp);
- /* Create the application icon using the icon from docks
- * If not found in docks, create a new icon
- * using the function wAppIconCreate() */
- create_appicon_from_dock(wwin, wapp, main_window);
+ /* Create the application icon */
+ wapp->app_icon = NULL;
- /* Save the app_icon in a file */
- save_app_icon(wapp);
+ if (!WFLAGP(wapp->main_window_desc, no_appicon)) {
+ /* Create the application icon using the icon from docks
+ * If not found in docks, create a new icon
+ * using the function wAppIconCreate() */
+ create_appicon_from_dock(wwin, wapp, main_window);
+
+ /* Now, paint the icon */
+ paint_app_icon(wapp);
+
+ /* Save the app_icon in a file */
+ save_app_icon(wapp);
+ }
return wapp;
}
-----------------------------------------------------------------------
Summary of changes:
src/appicon.c | 3 ---
src/application.c | 20 ++++++++++++++------
2 files changed, 14 insertions(+), 9 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].
