← Back to branch summary

~ubuntu-branches/ubuntu/trusty/rgtk2/trusty

« back to all changes in this revision

Viewing changes to src/conversion.c

  • Committer: Bazaar Package Importer
  • Author(s): Dirk Eddelbuettel
  • Date: 2010-11-03 11:35:46 UTC
  • mfrom: (1.3.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20101103113546-a7fi7jdxdebp0tw1
Tags: 2.20.1-1
* New upstream release

* debian/control: Set (Build-)Depends: to current R version
* debian/control: Set Standards-Version: to current version 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/conversion.c
223
223
    gint eval = 0;
224
224
 
225
225
    if (IS_INTEGER(s_enum) || IS_NUMERIC(s_enum)) {
226
 
        evalue = g_enum_get_value(eclass, asCInteger(s_enum));
 
226
        eval = IS_NUMERIC(s_enum) ? (gint)asCNumeric(s_enum) :
 
227
          asCInteger(s_enum);
 
228
        evalue = g_enum_get_value(eclass, eval);
227
229
    } else if (IS_CHARACTER(s_enum)) {
228
230
        const gchar* ename = asCString(s_enum);
229
231
        evalue = g_enum_get_value_by_name(eclass, ename);