← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kdepimlibs/trusty

« back to all changes in this revision

Viewing changes to gpgme++/util.h

  • Committer: Package Import Robot
  • Author(s): Rohan Garg, Rohan Garg, Philip Muškovac
  • Date: 2013-11-23 17:36:44 UTC
  • mfrom: (1.1.102)
  • Revision ID: package-import@ubuntu.com-20131123173644-p5ow94192ezsny8g
Tags: 4:4.11.80-0ubuntu1
[ Rohan Garg ]
* New upstream beta release
  - Bump akonadi requirement to 1.10.45
  - Update install files
  - Update symbols

[ Philip Muškovac ]
* kdepimlibs-dev/-dbg breaks/replaces kdepim-runtime/-dbg (<< 4:4.11.80)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gpgme++/util.h
115
115
  }
116
116
#ifndef NDEBUG
117
117
  if ( mode & ~( GPGME_KEYLIST_MODE_LOCAL |
118
 
                 GPGME_KEYLIST_MODE_EXTERN |
 
118
                 GPGME_KEYLIST_MODE_EXTERN |
119
119
#ifdef HAVE_GPGME_KEYLIST_MODE_SIG_NOTATIONS
120
 
                 GPGME_KEYLIST_MODE_SIG_NOTATIONS |
 
120
                 GPGME_KEYLIST_MODE_SIG_NOTATIONS |
121
121
#endif
122
122
#ifdef HAVE_GPGME_KEYLIST_MODE_EPHEMERAL
123
 
                 GPGME_KEYLIST_MODE_EPHEMERAL |
 
123
                 GPGME_KEYLIST_MODE_EPHEMERAL |
124
124
#endif
125
 
                 GPGME_KEYLIST_MODE_VALIDATE |
126
 
                 GPGME_KEYLIST_MODE_SIGS ) ) {
 
125
                 GPGME_KEYLIST_MODE_VALIDATE |
 
126
                 GPGME_KEYLIST_MODE_SIGS ) ) {
127
127
      //std::cerr << "GpgME: WARNING: gpgme_get_keylist_mode() returned an unknown flag!" << std::endl;
128
128
    }
129
129
#endif // NDEBUG
153
153
    unsigned int result = oldflags;
154
154
    if ( newflags & GpgME::Notation::HumanReadable ) {
155
155
#ifdef HAVE_GPGME_SIG_NOTATION_HUMAN_READABLE
156
 
        result |= GPGME_SIG_NOTATION_HUMAN_READABLE;
 
156
        result |= GPGME_SIG_NOTATION_HUMAN_READABLE;
157
157
#elif !defined(NDEBUG)
158
 
        //std::cerr << "GpgME::Context: ignoring HumanReadable signature notation flag (gpgme too old)" << std::endl;
 
158
        //std::cerr << "GpgME::Context: ignoring HumanReadable signature notation flag (gpgme too old)" << std::endl;
159
159
#endif
160
160
    }
161
161
    if ( newflags & GpgME::Notation::Critical ) {
162
162
#ifdef HAVE_GPGME_SIG_NOTATION_CRITICAL
163
 
        result |= GPGME_SIG_NOTATION_CRITICAL;
 
163
        result |= GPGME_SIG_NOTATION_CRITICAL;
164
164
#elif !defined(NDEBUG)
165
 
        //std::cerr << "GpgME::Context: ignoring Critical signature notation flag (gpgme too old)" << std::endl;
 
165
        //std::cerr << "GpgME::Context: ignoring Critical signature notation flag (gpgme too old)" << std::endl;
166
166
#endif
167
167
    }
168
168
    return static_cast<gpgme_sig_notation_flags_t>( result );