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  0b5de80e20ec81ce00f6d7ede5f894ea13929163 (commit)
      from  7e42fedcbb25cdee72e937c99f6595f610e16c36 (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/0b5de80e20ec81ce00f6d7ede5f894ea13929163

commit 0b5de80e20ec81ce00f6d7ede5f894ea13929163
Author: Rodolfo García Peñas (kix) <[email protected]>
Date:   Sun Aug 23 17:33:38 2015 +0200

    create_appicon_from_dock checks if no_appicon flag is set
    
    As Josip Deanovic reported:
    
    -------8<-------
    In previous versions e.g. 0.80.2 up until 0.95.3 when an application
    attributes are set with "NoAppIcon = Yes;" ("No application icon" option
    in attributes window), it was possible to launch multiple instances of
    the application from wmdock using double-click.
    
    After doing a git bisect per your suggestion I have found and reported
    this:
    
    bc0700e016c67791d3e3eab855543d849f4ce786 is the first bad commit
    commit bc0700e016c67791d3e3eab855543d849f4ce786
    Author: Rodolfo García Peñas (kix) <[email protected]>
    Date:   Mon Jun 18 11:15:19 2012 +0200
    
        Create WAppIcon always
    
        When the application is created, the WAppIcon now is created always,
        but it is only painted if the flag is not set.
    
        The icon initialization to NULL can be done now at
    app_icon_create_from_docks
        because it is always called.
    
    :040000 040000 7c58877ad5af211acaddac5288848c2ade7b04cb
    33d52affb385d22fbf04ebad3c628b714008785d M      src
    -------8<-------
    
    This patch reverts this change (not the patch). Now the function
    create_appicon_from_dock checks if the flag no_appicon is set,
    and then, do not execute the code related to the appicon.
    
    Signed-off-by: Rodolfo García Peñas (kix) <[email protected]>

diff --git a/src/appicon.c b/src/appicon.c
index 302066d..08331c7 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -1180,7 +1180,7 @@ static void create_appicon_from_dock(WWindow *wwin, 
WApplication *wapp, Window m
        }
 
        /* If created, then set some flags */
-       if (wapp->app_icon) {
+       if (wapp->app_icon && !WFLAGP(wapp->main_window_desc, no_appicon)) {
                WWindow *mainw = wapp->main_window_desc;
 
                wapp->app_icon->running = 1;

-----------------------------------------------------------------------

Summary of changes:
 src/appicon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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].

Reply via email to