Merge lp:~bregma/geis/lp-883470 into lp:geis

[Stephen M. Webb]

GEIS bck end selection falls back from DBus client to XCB only when the default back end selection is used (not when the DBus client back end is explicitly selected).

[Jussi Pakkanen (jpakkane)]

There was a discussion on the mailing list that you should not use booleans in functions, but rather state enums.

If we are sticking with the boolean, I would call it backend_use_fallback (or use_backend_fallback) to make its intent more clear.

review: Needs Fixing

[Stephen M. Webb (bregma)]

This internal state variable is never used as a parameter or passed as an argument, so the rule about not using booleans in functions does not apply here.

I certainly have no problem with changing the variable name. Updated the merge request with a new revision to that effect.

[lp:~bregma/geis/lp-883470]

175. By Stephen M. Webb on 2011-10-31

Renamed new variable after code review request.

[Jussi Pakkanen (jpakkane)]

Looks fine.

review: Approve

[Chase Douglas (chasedouglas)]

Looks good here too.

review: Approve

=== modified file 'libutouch-geis/geis.c'
--- libutouch-geis/geis.c	2011-10-21 22:41:57 +0000
+++ libutouch-geis/geis.c	2011-10-31 22:33:23 +0000
@@ -70,6 +70,7 @@
   GeisBackendMultiplexor  backend_multiplexor;
   GeisBackend             backend;
   GeisBoolean             backend_pending;
+  GeisBoolean             backend_use_fallback;
   GeisDBusServer          server; /* @TODO: replace me */
   GeisEventQueue          input_event_queue;
   int                     input_event_signal_pipe[2];
@@ -234,7 +235,7 @@
           break;
 
         case GEIS_EVENT_ERROR:
-          if (geis->backend_pending)
+          if (geis->backend_pending && geis->backend_use_fallback)
           {
             if (geis->backend)
               geis_backend_delete(geis->backend);
@@ -565,6 +566,7 @@
     geis_warning("back end not specified, defaulting to DBus");
     geis->backend = geis_backend_by_name(geis, GEIS_INIT_UTOUCH_DBUS_BACKEND);
     geis->backend_pending = GEIS_TRUE;
+    geis->backend_use_fallback = GEIS_TRUE;
   }
   if (!geis->backend)
   {