← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/widgets/gnm-dao.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:
src/widgets/gnm-dao.c
28
28
 
29
29
#include <goffice/gtk/goffice-gtk.h>
30
30
#include <gsf/gsf-impl-utils.h>
31
 
#include <gtk/gtkcombobox.h>
32
 
#include <gtk/gtktable.h>
33
 
#include <gtk/gtkhbox.h>
34
 
#include <gtk/gtktogglebutton.h>
35
31
#include <glib/gi18n-lib.h>
36
32
 
37
33
struct  _GnmDao {
298
294
                switch (grp_val) {
299
295
                case 0:
300
296
                default:
301
 
                        *dao = dao_init (*dao, NewSheetOutput);
 
297
                        *dao = dao_init_new_sheet (*dao);
302
298
                        break;
303
299
                case 1:
304
300
                        *dao = dao_init (*dao, NewWorkbookOutput);