Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014

Conflicts:
	X11/xtrans/Xtrans.c
	xorg-server/dix/dispatch.c
	xorg-server/os/xdmcp.c

1 files changed, 2 insertions, 4 deletions

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index dbaaee907..a6dce911a 100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -264,12 +264,11 @@ SmartScheduleClient(int *clientReady, int nready)
     for (i = 0; i < nready; i++) {

         client = clientReady[i];

         pClient = clients[client];

-        /* Praise clients which are idle */

-        if ((now - pClient->smart_check_tick) >= idle) {

+        /* Praise clients which haven't run in a while */

+        if ((now - pClient->smart_stop_tick) >= idle) {

             if (pClient->smart_priority < 0)

                 pClient->smart_priority++;

         }

-        pClient->smart_check_tick = now;

 

         /* check priority to select best client */

         robin =

@@ -3467,7 +3466,6 @@ InitClient(ClientPtr client, int i, void *ospriv)
     QueryMinMaxKeyCodes(&client->minKC, &client->maxKC);

     client->smart_start_tick = SmartScheduleTime;

     client->smart_stop_tick = SmartScheduleTime;

-    client->smart_check_tick = SmartScheduleTime;

     client->clientIds = NULL;

 }