← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gui-file.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/gui-file.c
78
78
 
79
79
                if (!l->data)
80
80
                        descr = _("Automatically detected");
81
 
                else if (IS_GO_FILE_OPENER (l->data))
 
81
                else if (GO_IS_FILE_OPENER (l->data))
82
82
                        descr = go_file_opener_get_description (
83
83
                                                GO_FILE_OPENER (l->data));
84
84
                else
164
164
                return 0;
165
165
 
166
166
        for (l = openers; l != NULL; l = l->next, i++) {
167
 
                if (IS_GO_FILE_OPENER (l->data) &&
 
167
                if (GO_IS_FILE_OPENER (l->data) &&
168
168
                    strcmp (id, go_file_opener_get_id(l->data)) == 0)
169
169
                        return i;
170
170
        }
357
357
 
358
358
        if (go_file_saver_get_save_scope (fs) != FILE_SAVE_WORKBOOK &&
359
359
            gnm_app_prefs->file_ask_single_sheet_save) {
360
 
                GList *sheets;
 
360
                Workbook *wb = wb_view_get_workbook (wb_view);
361
361
                gchar *msg = _("Selected file format doesn't support "
362
362
                               "saving multiple sheets in one file.\n"
363
363
                               "If you want to save all sheets, save them "
364
364
                               "in separate files or select different file format.\n"
365
365
                               "Do you want to save only current sheet?");
366
 
 
367
 
                sheets = workbook_sheets (wb_view_get_workbook (wb_view));
368
 
                if (g_list_length (sheets) > 1) {
 
366
                if (workbook_sheet_count (wb) > 1) {
369
367
                        ret_val = go_gtk_query_yes_no (parent, TRUE, msg);
370
368
                }
371
 
                g_list_free (sheets);
372
369
        }
373
370
        return (ret_val);
374
371
}
528
525
        }
529
526
 
530
527
        if (wbcg2) {
531
 
                GtkWidget *nb = GTK_WIDGET (wbcg2->notebook);
 
528
                GtkWidget *nb = GTK_WIDGET (wbcg2->notebook_area);
532
529
                wb_view_preferred_size (wb_view,
533
530
                                        nb->allocation.width,
534
531
                                        nb->allocation.height);
565
562
                wbcg_find_for_workbook (wb, wbcg, NULL, NULL);
566
563
 
567
564
        if (wbcg2) {
568
 
                GtkWidget *nb = GTK_WIDGET (wbcg2->notebook);
 
565
                GtkWidget *nb = GTK_WIDGET (wbcg2->notebook_area);
569
566
                wb_view_preferred_size (wb_view,
570
567
                                        nb->allocation.width,
571
568
                                        nb->allocation.height);