← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnumeric/quantal

« back to all changes in this revision

Viewing changes to plugins/dif/dif.c

  • Committer: Bazaar Package Importer
  • Author(s): Gauvain Pocentek
  • Date: 2009-06-07 11:10:47 UTC
  • mfrom: (1.1.19 upstream) (2.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090607111047-l3rtbzfjxvmi1kx0
Tags: 1.9.8-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Promoted gnumeric-doc to Recommends in gnumeric package for help to be
    installed automatically
  - gnumeric-gtk is a transitional package
  - gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1
  - call initltool-update in po*
  - remove psiconv support (psiconv is in universe):
    o debian/control: remove B-D on libpsiconv-dev
    o debian/rules: don't pass --with-psiconv to ./configure

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/dif/dif.c
65
65
 
66
66
        ctxt->line_no        = 1;
67
67
        ctxt->line           = NULL;
68
 
        ctxt->sheet          = workbook_sheet_add (wb, -1);
 
68
        ctxt->sheet          = workbook_sheet_add (wb, -1, GNM_DEFAULT_COLS, GNM_DEFAULT_ROWS);
69
69
        ctxt->converter      = g_iconv_open ("UTF-8", "ISO-8859-1");
70
70
 
71
71
        io_progress_message (io_context, _("Reading file..."));
235
235
                                msg = g_strdup_printf (
236
236
                                      _("Unknown data value \"%s\" at line %d. Ignoring."),
237
237
                                      ctxt->line, ctxt->line_no);
238
 
                                g_warning (msg);
 
238
                                g_warning ("%s", msg);
239
239
                                g_free (msg);
240
240
                        }
241
241
                } else {
242
242
                        msg = g_strdup_printf (
243
243
                              _("Unknown value type %d at line %d. Ignoring."),
244
244
                              val_type, ctxt->line_no);
245
 
                        g_warning (msg);
 
245
                        g_warning ("%s", msg);
246
246
                        g_free (msg);
247
247
                        (void) dif_get_line (ctxt);
248
248
                }