← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evolution/oneiric-proposed

« back to all changes in this revision

Viewing changes to calendar/gui/dialogs/task-page.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/gui/dialogs/task-page.c
203
203
        gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0);
204
204
        e_buffer_tagger_update_tags (GTK_TEXT_VIEW (priv->description));
205
205
 
206
 
        /* Start, due times */
207
 
        e_date_edit_set_time (E_DATE_EDIT (priv->start_date), 0);
208
 
        e_date_edit_set_time (E_DATE_EDIT (priv->due_date), 0);
 
206
        /* Start, due times - both set to None */
 
207
        e_date_edit_set_time (E_DATE_EDIT (priv->start_date), -1);
 
208
        e_date_edit_set_time (E_DATE_EDIT (priv->due_date), -1);
209
209
 
210
210
        /* Classification */
211
211
        comp_editor_set_classification (editor, E_CAL_COMPONENT_CLASS_PUBLIC);
328
328
                gtk_widget_hide (priv->attendee_box);
329
329
                gtk_widget_hide (priv->organizer);
330
330
                gtk_widget_hide (priv->invite);
331
 
                gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->org_cal_label), _("_Group:"));
 
331
                gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->org_cal_label), _("_List:"));
332
332
                gtk_label_set_mnemonic_widget (GTK_LABEL (priv->org_cal_label), priv->source_selector);
333
333
        } else {
334
334
                gtk_widget_show (priv->invite);
533
533
                e_date_edit_set_date (E_DATE_EDIT (priv->due_date),
534
534
                                      due_tt->year, due_tt->month,
535
535
                                      due_tt->day);
536
 
                if (due_tt->is_date) {
537
 
                        e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
538
 
                                                     -1, -1);
539
 
                } else {
540
 
                        e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
541
 
                                                     due_tt->hour,
542
 
                                                     due_tt->minute);
543
 
                }
 
536
                e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date), -1, -1);
544
537
        } else {
545
538
                e_date_edit_set_time (E_DATE_EDIT (priv->due_date), -1);
546
539
 
588
581
                e_date_edit_set_date (E_DATE_EDIT (priv->start_date),
589
582
                                      start_tt->year, start_tt->month,
590
583
                                      start_tt->day);
591
 
                if (start_tt->is_date) {
592
 
                        e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date),
593
 
                                                     -1, -1);
594
 
                        zone = default_zone;
595
 
                } else {
596
 
                        e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date),
597
 
                                                     start_tt->hour,
598
 
                                                     start_tt->minute);
599
 
                }
 
584
                e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date), -1, -1);
600
585
        } else {
601
586
                e_date_edit_set_time (E_DATE_EDIT (priv->start_date), -1);
602
 
 
603
 
                /* If no time is set, we use the default timezone, so the
604
 
                   user usually doesn't have to set this when they set the
605
 
                   date. */
606
 
                zone = default_zone;
607
587
        }
608
588
 
609
589
        e_cal_component_free_datetime (&d);
749
729
        ECalClient *client;
750
730
        struct icaltimetype start_tt, due_tt;
751
731
        gchar *cat, *str;
752
 
        gboolean start_date_set, due_date_set, time_set;
 
732
        gboolean start_date_set, due_date_set;
753
733
        GtkTextBuffer *text_buffer;
754
734
        GtkTextIter text_iter_start, text_iter_end;
755
 
        icaltimezone *start_zone = NULL;
756
 
        icaltimezone *due_zone = NULL;
757
735
 
758
736
        tpage = TASK_PAGE (page);
759
737
        priv = tpage->priv;
811
789
        date.tzid = NULL;
812
790
 
813
791
        /* Due Date. */
814
 
        if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->due_date)) ||
815
 
            !e_date_edit_time_is_valid (E_DATE_EDIT (priv->due_date))) {
 
792
        if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->due_date))) {
816
793
                comp_editor_page_display_validation_error (page, _("Due date is wrong"), priv->due_date);
817
794
                return FALSE;
818
795
        }
821
798
                                         &due_tt.year,
822
799
                                         &due_tt.month,
823
800
                                         &due_tt.day);
824
 
        time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
825
 
                                                &due_tt.hour,
826
 
                                                &due_tt.minute);
827
801
        if (due_date_set) {
828
 
                if (time_set) {
829
 
                        due_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
830
 
                        date.tzid = icaltimezone_get_tzid (due_zone);
831
 
                } else {
832
 
                        due_tt.is_date = TRUE;
833
 
                        date.tzid = NULL;
834
 
                }
 
802
                due_tt.is_date = TRUE;
 
803
                date.tzid = NULL;
835
804
                e_cal_component_set_due (comp, &date);
836
805
        } else {
837
806
                e_cal_component_set_due (comp, NULL);
838
807
        }
839
808
 
840
809
        /* Start Date. */
841
 
        if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->start_date)) ||
842
 
            !e_date_edit_time_is_valid (E_DATE_EDIT (priv->start_date))) {
 
810
        if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->start_date))) {
843
811
                comp_editor_page_display_validation_error (page, _("Start date is wrong"), priv->start_date);
844
812
                return FALSE;
845
813
        }
850
818
                                         &start_tt.year,
851
819
                                         &start_tt.month,
852
820
                                         &start_tt.day);
853
 
        time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
854
 
                                                &start_tt.hour,
855
 
                                                &start_tt.minute);
856
821
        if (start_date_set) {
857
 
                if (time_set) {
858
 
                        start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
859
 
                        date.tzid = icaltimezone_get_tzid (start_zone);
860
 
                } else {
861
 
                        start_tt.is_date = TRUE;
862
 
                        date.tzid = NULL;
863
 
                }
 
822
                start_tt.is_date = TRUE;
 
823
                date.tzid = NULL;
864
824
                e_cal_component_set_dtstart (comp, &date);
865
825
        } else {
866
826
                e_cal_component_set_dtstart (comp, NULL);
1547
1507
{
1548
1508
        TaskPagePrivate *priv = tpage->priv;
1549
1509
        CompEditorPageDates dates;
1550
 
        gboolean date_set, time_set;
 
1510
        gboolean date_set;
1551
1511
        ECalComponentDateTime start_dt, due_dt;
1552
1512
        struct icaltimetype start_tt = icaltime_null_time ();
1553
1513
        struct icaltimetype due_tt = icaltime_null_time ();
1559
1519
                                         &start_tt.year,
1560
1520
                                         &start_tt.month,
1561
1521
                                         &start_tt.day);
1562
 
        time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
1563
 
                                                &start_tt.hour,
1564
 
                                                &start_tt.minute);
1565
1522
        if (date_set) {
1566
 
                if (time_set) {
1567
 
                        icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
1568
 
                        start_dt.tzid = icaltimezone_get_tzid (zone);
1569
 
                } else {
1570
 
                        start_tt.is_date = TRUE;
1571
 
                        start_dt.tzid = NULL;
1572
 
                }
 
1523
                start_tt.is_date = TRUE;
 
1524
                start_dt.tzid = NULL;
1573
1525
        } else {
1574
1526
                start_tt = icaltime_null_time ();
1575
1527
                start_dt.tzid = NULL;
1579
1531
                                         &due_tt.year,
1580
1532
                                         &due_tt.month,
1581
1533
                                         &due_tt.day);
1582
 
        time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
1583
 
                                                &due_tt.hour,
1584
 
                                                &due_tt.minute);
1585
1534
        if (date_set) {
1586
 
                if (time_set) {
1587
 
                        icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
1588
 
                        due_dt.tzid = icaltimezone_get_tzid (zone);
1589
 
                } else {
1590
 
                        due_tt.is_date = TRUE;
1591
 
                        due_dt.tzid = NULL;
1592
 
                }
 
1535
                due_tt.is_date = TRUE;
 
1536
                due_dt.tzid = NULL;
1593
1537
        } else {
1594
1538
                due_tt = icaltime_null_time ();
1595
1539
                due_dt.tzid = NULL;
1687
1631
        struct icaltimetype start_tt = icaltime_null_time ();
1688
1632
        struct icaltimetype end_tt = icaltime_null_time ();
1689
1633
        gboolean date_set;
1690
 
        gboolean set_start_date = FALSE, set_end_date = FALSE, adjust_by_hour;
 
1634
        gboolean set_start_date = FALSE, set_end_date = FALSE;
1691
1635
        icaltimezone *zone;
1692
1636
 
1693
1637
        priv = tpage->priv;
1709
1653
        if (!date_set)
1710
1654
                return;
1711
1655
 
1712
 
        /* For DATE-TIME events, we have to convert to the same
1713
 
           timezone before comparing. */
1714
 
        e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
1715
 
                                     &start_tt.hour,
1716
 
                                     &start_tt.minute);
1717
 
        e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
1718
 
                                     &end_tt.hour,
1719
 
                                     &end_tt.minute);
1720
 
 
1721
1656
        zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
1722
 
        adjust_by_hour = e_date_edit_have_time (E_DATE_EDIT (priv->due_date)) &&
1723
 
                         e_date_edit_have_time (E_DATE_EDIT (priv->start_date));
1724
1657
 
1725
1658
        if (check_start_before_end (&start_tt, zone,
1726
1659
                                    &end_tt, zone,
1727
1660
                                    adjust_end_time,
1728
 
                                    adjust_by_hour)) {
 
1661
                                    FALSE)) {
1729
1662
                if (adjust_end_time)
1730
1663
                        set_end_date = TRUE;
1731
1664
                else
1735
1668
        if (set_start_date) {
1736
1669
                g_signal_handlers_block_matched (priv->start_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage);
1737
1670
                e_date_edit_set_date (E_DATE_EDIT (priv->start_date), start_tt.year, start_tt.month, start_tt.day);
1738
 
                if (adjust_by_hour)
1739
 
                        e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date), start_tt.hour, start_tt.minute);
1740
1671
                g_signal_handlers_unblock_matched (priv->start_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage);
1741
1672
        }
1742
1673
 
1743
1674
        if (set_end_date) {
1744
1675
                g_signal_handlers_block_matched (priv->due_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage);
1745
1676
                e_date_edit_set_date (E_DATE_EDIT (priv->due_date), end_tt.year, end_tt.month, end_tt.day);
1746
 
                if (adjust_by_hour)
1747
 
                        e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date), end_tt.hour, end_tt.minute);
1748
1677
                g_signal_handlers_unblock_matched (priv->due_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage);
1749
1678
        }
1750
1679