Description Peter Åstrand 2015-03-18 09:28:47 CET

We are doing some tweaks to TigerVNC in ThinLinc compared to the upstream version. This includes both re-brandning as well as some removed and added functionality. This has been tracked using our vendor drop system. In some cases, the "removed" upstream code has been commented out, such as in this case:

   case ID_INFO:
     if (fltk_escape(cc->connectionInfo(), buffer, sizeof(buffer)) < sizeof(buffer)) {
 //      fl_message_title(_("VNC connection info"));
+
       fl_message_title(_("ThinLinc connection info"));
       fl_message("%s", buffer);
     }

This causes problems with the translations, since we are (now) including the preceding comment in the PO file.  

I'm suggesting that we use #ifdef conditionals instead, like this:


  case ID_INFO:
    if (fltk_escape(cc->connectionInfo(), buffer, sizeof(buffer)) < sizeof(buffer)) {
#ifdef THINLINC_UPSTREAM
      fl_message_title(_("VNC connection info"));
#else
      fl_message_title(_("ThinLinc connection info"));
#endif // THINLINC_UPSTREAM
      fl_message("%s", buffer);
    }