[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.5-59-g6d65daf

[crmafra]

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  6d65daf1be2d93dabf32dd3c8aa9ce3b7d6cd481 (commit)
       via  97ecb7b613a2374a671c2ee01b2b21549aad710e (commit)
      from  f53797f9ef491069b7b2cbbabbd9a59eb12aabaa (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/6d65daf1be2d93dabf32dd3c8aa9ce3b7d6cd481

commit 6d65daf1be2d93dabf32dd3c8aa9ce3b7d6cd481
Author: Rodolfo García Peñas (kix) <k...@kix.es>
Date:   Mon Oct 7 00:12:11 2013 +0200

    Removed unused keymove_tick variable
    
    The variable keymove_tick is set, but is never used after, so can
    be removed.
    
    kix@osaka:~/src/wmaker/git/wmaker-crm/src$ grep keymove_tick *[ch]
    moveres.c:                      scr->keymove_tick = 0;
    screen.h:    int keymove_tick;
    kix@osaka:~/src/wmaker/git/wmaker-crm/src$
    
    Signed-off-by: Rodolfo García Peñas (kix) <k...@kix.es>

diff --git a/src/moveres.c b/src/moveres.c
index b7aedb9..89fce68 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1469,11 +1469,7 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
                                };
 
                if (done) {
-                       scr->keymove_tick = 0;
-                       /*
-                          WMDeleteTimerWithClientData(&looper);
-                        */
-                       if (!opaqueMoveResize) {/*ctrlmode=> resize    */
+                       if (!opaqueMoveResize) {        /* ctrlmode => resize */
                                if (wwin->flags.shaded || 
scr->selected_windows) {
                                        if (scr->selected_windows)
                                                drawFrames(wwin, 
scr->selected_windows, off_x, off_y);
@@ -1482,7 +1478,7 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
                                } else {
                                        drawTransparentFrame(wwin, src_x + 
off_x, src_y + off_y, ww, wh);
                                }
-                       };
+                       }
 
                        if (ctrlmode) {
                                showGeometry(wwin, src_x + off_x, src_y + 
off_y, src_x + off_x + ww,
diff --git a/src/screen.h b/src/screen.h
index fc933f1..cc7538a 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -219,7 +219,6 @@ typedef struct _WScreen {
     int drawer_count;                  /* Nb of drawers that */
     struct WDock *attracting_drawer;   /* The drawer that auto-attracts icons, 
or NULL */
 
-    int keymove_tick;
     struct RContext *rcontext;        /* wrlib context */
 
     WMScreen *wmscreen;                       /* for widget library */

http://repo.or.cz/w/wmaker-crm.git/commit/97ecb7b613a2374a671c2ee01b2b21549aad710e

commit 97ecb7b613a2374a671c2ee01b2b21549aad710e
Author: Rodolfo García Peñas (kix) <k...@kix.es>
Date:   Thu Oct 10 00:50:15 2013 +0200

    Compiler food.
    
    This patch set the variable aicon to NULL, to avoid compiler warnings.
    
    This patch also adds some code style.

diff --git a/src/dock.c b/src/dock.c
index 1e0405c..a6b4d99 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -4342,7 +4342,7 @@ static void drawerDestroy(WDock *drawer)
 {
        WScreen *scr;
        int i;
-       WAppIcon *aicon;
+       WAppIcon *aicon = NULL;
        WMArray *icons;
 
        if (drawer == NULL)
@@ -4353,21 +4353,21 @@ static void drawerDestroy(WDock *drawer)
        /* Note regarding menus: we can't delete any dock/clip/drawer menu, 
because
         * that would (attempt to) wfree some memory in gettext library (see 
menu
         * entries that have several "versions", such like "Hide" and 
"Unhide"). */
-
        wDefaultPurgeInfo(scr, drawer->icon_array[0]->wm_instance,
                        drawer->icon_array[0]->wm_class);
+
        if (drawer->icon_count == 2) {
-               // Drawer contains a single appicon: dock it where the drawer 
was
+               /* Drawer contains a single appicon: dock it where the drawer 
was */
                for (i = 1; i < drawer->max_icons; i++) {
                        if ((aicon = drawer->icon_array[i]))
                                break;
                }
+
                wDockMoveIconBetweenDocks(drawer, scr->dock, aicon,
                                        0, (drawer->y_pos - scr->dock->y_pos) / 
ICON_SIZE);
                XMoveWindow(dpy, aicon->icon->core->window, drawer->x_pos, 
drawer->y_pos);
                XMapWindow(dpy, aicon->icon->core->window);
-       }
-       else if (drawer->icon_count > 2) {
+       } else if (drawer->icon_count > 2) {
                icons = WMCreateArray(drawer->icon_count - 1);
                for (i = 1; i < drawer->max_icons; i++) {
                        if (!(aicon = drawer->icon_array[i]))

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

Summary of changes:
 src/dock.c    |   10 +++++-----
 src/moveres.c |    8 ++------
 src/screen.h  |    1 -
 3 files changed, 7 insertions(+), 12 deletions(-)


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.