evolution r36534 - in branches/kill-bonobo: . a11y a11y/addressbook a11y/e-table addressbook addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/contact-list-editor addressbook/gui/widgets addressbook/importers addressbook/tools calendar calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs calendar/importers composer e-util filter help help/C help/C/figures help/cs help/de/figures help/es help/es/figures help/fr help/fr/figures mail mail/default mail/default/cs mail/default/de mail/default/es mail/default/fi mail/default/fr mail/default/hu mail/default/it mail/default/ko mail/default/lt mail/default/nl mail/default/pl mail/default/sr mail/default/sr latin mail/default/sv mail/importers plugins/attachment-reminder plugins/audio-inline plugins/bbdb plugins/default-mailer plugins/email-custom-header plugins/exchange-operations plugins/google-account-setup plugins/groupwise-account-setup plugins/groupwise-features plugins/ipod-sync plugins/iti p-formatter plugins/mail-notification plugins/mark-calendar-offline plugins/publish-calendar plugins/python plugins/sa-junk-plugin plugins/save-attachments plugins/save-calendar plugins/startup-wizard plugins/templates plugins/tnef-attachments plugins/webdav-account-setup po shell widgets widgets/menus widgets/misc widgets/table widgets/text
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r36534 - in branches/kill-bonobo: . a11y a11y/addressbook a11y/e-table addressbook addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/contact-list-editor addressbook/gui/widgets addressbook/importers addressbook/tools calendar calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs calendar/importers composer e-util filter help help/C help/C/figures help/cs help/de/figures help/es help/es/figures help/fr help/fr/figures mail mail/default mail/default/cs mail/default/de mail/default/es mail/default/fi mail/default/fr mail/default/hu mail/default/it mail/default/ko mail/default/lt mail/default/nl mail/default/pl mail/default/sr mail/default/sr latin mail/default/sv mail/importers plugins/attachment-reminder plugins/audio-inline plugins/bbdb plugins/default-mailer plugins/email-custom-header plugins/exchange-operations plugins/google-account-setup plugins/groupwise-account-setup plugins/groupwise-features plugins/ipod-sync plugins/iti p-formatter plugins/mail-notification plugins/mark-calendar-offline plugins/publish-calendar plugins/python plugins/sa-junk-plugin plugins/save-attachments plugins/save-calendar plugins/startup-wizard plugins/templates plugins/tnef-attachments plugins/webdav-account-setup po shell widgets widgets/menus widgets/misc widgets/table widgets/text
- Date: Wed, 1 Oct 2008 20:56:04 +0000 (UTC)
Author: mbarnes
Date: Wed Oct 1 20:56:04 2008
New Revision: 36534
URL: http://svn.gnome.org/viewvc/evolution?rev=36534&view=rev
Log:
Merge revisions 36016:36533 from trunk.
Added:
branches/kill-bonobo/COPYING.LGPL2
- copied unchanged from r36533, /trunk/COPYING.LGPL2
branches/kill-bonobo/COPYING.LGPL3
- copied unchanged from r36533, /trunk/COPYING.LGPL3
branches/kill-bonobo/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
- copied unchanged from r36533, /trunk/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
branches/kill-bonobo/help/C/figures/evo_customheader.png
- copied unchanged from r36533, /trunk/help/C/figures/evo_customheader.png
branches/kill-bonobo/help/C/figures/evo_googlecontacts.png
- copied unchanged from r36533, /trunk/help/C/figures/evo_googlecontacts.png
branches/kill-bonobo/help/C/figures/evo_mailnotification.png
- copied unchanged from r36533, /trunk/help/C/figures/evo_mailnotification.png
branches/kill-bonobo/help/C/figures/network_pref.png
- copied unchanged from r36533, /trunk/help/C/figures/network_pref.png
branches/kill-bonobo/help/de/figures/Screenshot-Evolution-mailer-Preferences.png
- copied unchanged from r36533, /trunk/help/de/figures/Screenshot-Evolution-mailer-Preferences.png
branches/kill-bonobo/help/es/figures/evo_flag_follow_up_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_flag_follow_up_a.png
branches/kill-bonobo/help/es/figures/evo_mailnotification.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_mailnotification.png
branches/kill-bonobo/help/es/figures/evo_popreceive_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_popreceive_a.png
branches/kill-bonobo/help/es/figures/evo_receive_setup_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_receive_setup_a.png
branches/kill-bonobo/help/es/figures/evo_rule_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_rule_a.png
branches/kill-bonobo/help/es/figures/evo_select_add_folder.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_select_add_folder.png
branches/kill-bonobo/help/es/figures/evo_select_folder.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_select_folder.png
branches/kill-bonobo/help/es/figures/evo_send_setup_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_send_setup_a.png
branches/kill-bonobo/help/es/figures/evo_timezone_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_timezone_a.png
branches/kill-bonobo/help/es/figures/evo_usereceive_a.png
- copied unchanged from r36533, /trunk/help/es/figures/evo_usereceive_a.png
branches/kill-bonobo/help/es/figures/exchng-identity.png
- copied unchanged from r36533, /trunk/help/es/figures/exchng-identity.png
branches/kill-bonobo/help/es/figures/exchng-rec-mails.png
- copied unchanged from r36533, /trunk/help/es/figures/exchng-rec-mails.png
branches/kill-bonobo/help/es/figures/filter-new-fig.png
- copied unchanged from r36533, /trunk/help/es/figures/filter-new-fig.png
branches/kill-bonobo/help/es/figures/google_cal_view.png
- copied unchanged from r36533, /trunk/help/es/figures/google_cal_view.png
branches/kill-bonobo/help/es/figures/mailer_preferences.png
- copied unchanged from r36533, /trunk/help/es/figures/mailer_preferences.png
branches/kill-bonobo/help/es/figures/quick_add_a.png
- copied unchanged from r36533, /trunk/help/es/figures/quick_add_a.png
branches/kill-bonobo/help/es/figures/quick_reference.png
- copied unchanged from r36533, /trunk/help/es/figures/quick_reference.png
branches/kill-bonobo/help/fr/figures/evo_mailnotification.png
- copied unchanged from r36533, /trunk/help/fr/figures/evo_mailnotification.png
branches/kill-bonobo/mail/default/cs/
- copied from r36533, /trunk/mail/default/cs/
branches/kill-bonobo/mail/default/hu/
- copied from r36533, /trunk/mail/default/hu/
branches/kill-bonobo/mail/default/it/
- copied from r36533, /trunk/mail/default/it/
branches/kill-bonobo/mail/default/sr/
- copied from r36533, /trunk/mail/default/sr/
branches/kill-bonobo/mail/default/sr latin/
- copied from r36533, /trunk/mail/default/sr latin/
Removed:
branches/kill-bonobo/help/C/figures/Screenshot-Evolution -mailer-Preferences.png
branches/kill-bonobo/help/de/figures/Screenshot-Evolution -mailer-Preferences.png
branches/kill-bonobo/help/fr/figures/evo_cal_ prop_a.png
branches/kill-bonobo/widgets/table/e-cell-spin-button.c
branches/kill-bonobo/widgets/table/e-cell-spin-button.h
Modified:
branches/kill-bonobo/ChangeLog
branches/kill-bonobo/Makefile.am
branches/kill-bonobo/NEWS
branches/kill-bonobo/a11y/ChangeLog
branches/kill-bonobo/a11y/addressbook/ea-addressbook-view.c
branches/kill-bonobo/a11y/addressbook/ea-minicard-view.c
branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-text.c
branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-tree.c
branches/kill-bonobo/addressbook/ChangeLog
branches/kill-bonobo/addressbook/gui/component/addressbook-component.c
branches/kill-bonobo/addressbook/gui/component/addressbook-config.c
branches/kill-bonobo/addressbook/gui/component/addressbook-migrate.c
branches/kill-bonobo/addressbook/gui/component/addressbook.c
branches/kill-bonobo/addressbook/gui/component/apps_evolution_addressbook.schemas.in
branches/kill-bonobo/addressbook/gui/component/autocompletion-config.c
branches/kill-bonobo/addressbook/gui/component/ldap-config.glade
branches/kill-bonobo/addressbook/gui/contact-editor/contact-editor.glade
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c
branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c
branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.c
branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-model.c
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h
branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c
branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c
branches/kill-bonobo/addressbook/gui/widgets/eab-gui-util.c
branches/kill-bonobo/addressbook/gui/widgets/eab-vcard-control.c
branches/kill-bonobo/addressbook/importers/evolution-ldif-importer.c
branches/kill-bonobo/addressbook/importers/evolution-vcard-importer.c
branches/kill-bonobo/addressbook/tools/evolution-addressbook-export.c
branches/kill-bonobo/calendar/ChangeLog
branches/kill-bonobo/calendar/calendar.error.xml
branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c
branches/kill-bonobo/calendar/gui/alarm-notify/alarm.h
branches/kill-bonobo/calendar/gui/alarm-notify/config-data.c
branches/kill-bonobo/calendar/gui/alarm-notify/notify-main.c
branches/kill-bonobo/calendar/gui/cal-search-bar.c
branches/kill-bonobo/calendar/gui/calendar-component.c
branches/kill-bonobo/calendar/gui/calendar-config-keys.h
branches/kill-bonobo/calendar/gui/calendar-config.c
branches/kill-bonobo/calendar/gui/calendar-config.h
branches/kill-bonobo/calendar/gui/comp-editor-factory.c
branches/kill-bonobo/calendar/gui/comp-util.c
branches/kill-bonobo/calendar/gui/comp-util.h
branches/kill-bonobo/calendar/gui/dialogs/alarm-list-dialog.c
branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.c
branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.h
branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c
branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c
branches/kill-bonobo/calendar/gui/dialogs/copy-source-dialog.c
branches/kill-bonobo/calendar/gui/dialogs/delete-comp.c
branches/kill-bonobo/calendar/gui/dialogs/delete-error.c
branches/kill-bonobo/calendar/gui/dialogs/e-send-options-utils.c
branches/kill-bonobo/calendar/gui/dialogs/event-page.c
branches/kill-bonobo/calendar/gui/dialogs/memo-page.c
branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c
branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c
branches/kill-bonobo/calendar/gui/dialogs/task-page.c
branches/kill-bonobo/calendar/gui/e-alarm-list.c
branches/kill-bonobo/calendar/gui/e-cal-component-preview.c
branches/kill-bonobo/calendar/gui/e-cal-model-tasks.c
branches/kill-bonobo/calendar/gui/e-cal-model.c
branches/kill-bonobo/calendar/gui/e-cal-popup.c
branches/kill-bonobo/calendar/gui/e-calendar-table.c
branches/kill-bonobo/calendar/gui/e-calendar-view.c
branches/kill-bonobo/calendar/gui/e-day-view-main-item.c
branches/kill-bonobo/calendar/gui/e-day-view-top-item.c
branches/kill-bonobo/calendar/gui/e-day-view.c
branches/kill-bonobo/calendar/gui/e-itip-control.c
branches/kill-bonobo/calendar/gui/e-itip-control.h
branches/kill-bonobo/calendar/gui/e-meeting-store.c
branches/kill-bonobo/calendar/gui/e-meeting-store.h
branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c
branches/kill-bonobo/calendar/gui/e-meeting-time-sel.h
branches/kill-bonobo/calendar/gui/e-memo-table.c
branches/kill-bonobo/calendar/gui/e-memo-table.h
branches/kill-bonobo/calendar/gui/e-timezone-entry.c
branches/kill-bonobo/calendar/gui/e-week-view-event-item.c
branches/kill-bonobo/calendar/gui/e-week-view.c
branches/kill-bonobo/calendar/gui/e-week-view.h
branches/kill-bonobo/calendar/gui/goto.c
branches/kill-bonobo/calendar/gui/itip-utils.c
branches/kill-bonobo/calendar/gui/itip-utils.h
branches/kill-bonobo/calendar/gui/main.c
branches/kill-bonobo/calendar/gui/migration.c
branches/kill-bonobo/calendar/gui/print.c
branches/kill-bonobo/calendar/gui/tasks-component.c
branches/kill-bonobo/calendar/gui/tasks-control.c
branches/kill-bonobo/calendar/importers/icalendar-importer.c
branches/kill-bonobo/composer/ChangeLog
branches/kill-bonobo/composer/e-composer-actions.c
branches/kill-bonobo/composer/e-msg-composer.c
branches/kill-bonobo/composer/mail-composer.error.xml
branches/kill-bonobo/configure.in
branches/kill-bonobo/e-util/ChangeLog
branches/kill-bonobo/e-util/e-dialog-utils.c
branches/kill-bonobo/e-util/e-error.c
branches/kill-bonobo/e-util/e-event.c
branches/kill-bonobo/e-util/e-icon-factory.c
branches/kill-bonobo/e-util/e-logger.c
branches/kill-bonobo/e-util/e-plugin.c
branches/kill-bonobo/e-util/e-sorter-array.c
branches/kill-bonobo/e-util/e-util.c
branches/kill-bonobo/e-util/e-util.h
branches/kill-bonobo/e-util/e-xml-utils.c
branches/kill-bonobo/filter/ChangeLog
branches/kill-bonobo/filter/filter-datespec.c
branches/kill-bonobo/filter/filter-element.c
branches/kill-bonobo/filter/filter-int.c
branches/kill-bonobo/filter/filter-int.h
branches/kill-bonobo/filter/filter-option.c
branches/kill-bonobo/filter/filter-part.c
branches/kill-bonobo/filter/filter-rule.c
branches/kill-bonobo/filter/rule-editor.c
branches/kill-bonobo/help/C/evolution.xml
branches/kill-bonobo/help/C/figures/mailer_preferences.png
branches/kill-bonobo/help/ChangeLog
branches/kill-bonobo/help/Makefile.am
branches/kill-bonobo/help/cs/cs.po
branches/kill-bonobo/help/es/es.po
branches/kill-bonobo/help/fr/fr.po
branches/kill-bonobo/iconv-detect.c
branches/kill-bonobo/mail/ChangeLog
branches/kill-bonobo/mail/default/Makefile.am
branches/kill-bonobo/mail/default/de/Inbox
branches/kill-bonobo/mail/default/es/Inbox
branches/kill-bonobo/mail/default/fi/Inbox
branches/kill-bonobo/mail/default/fr/Inbox
branches/kill-bonobo/mail/default/ko/Inbox
branches/kill-bonobo/mail/default/lt/Inbox
branches/kill-bonobo/mail/default/nl/Inbox
branches/kill-bonobo/mail/default/pl/Inbox
branches/kill-bonobo/mail/default/sv/Inbox
branches/kill-bonobo/mail/em-account-editor.c
branches/kill-bonobo/mail/em-account-prefs.c
branches/kill-bonobo/mail/em-composer-utils.c
branches/kill-bonobo/mail/em-filter-i18n.h
branches/kill-bonobo/mail/em-folder-browser.c
branches/kill-bonobo/mail/em-folder-tree-model.c
branches/kill-bonobo/mail/em-folder-tree.c
branches/kill-bonobo/mail/em-folder-utils.c
branches/kill-bonobo/mail/em-folder-view.c
branches/kill-bonobo/mail/em-format-html-display.c
branches/kill-bonobo/mail/em-format-html.c
branches/kill-bonobo/mail/em-format.c
branches/kill-bonobo/mail/em-icon-stream.c
branches/kill-bonobo/mail/em-junk-hook.c
branches/kill-bonobo/mail/em-mailer-prefs.c
branches/kill-bonobo/mail/em-mailer-prefs.h
branches/kill-bonobo/mail/em-message-browser.c
branches/kill-bonobo/mail/em-migrate.c
branches/kill-bonobo/mail/em-network-prefs.c
branches/kill-bonobo/mail/em-network-prefs.h
branches/kill-bonobo/mail/em-popup.c
branches/kill-bonobo/mail/em-subscribe-editor.c
branches/kill-bonobo/mail/em-utils.c
branches/kill-bonobo/mail/evolution-mail.schemas.in
branches/kill-bonobo/mail/importers/evolution-mbox-importer.c
branches/kill-bonobo/mail/importers/mail-importer.c
branches/kill-bonobo/mail/importers/pine-importer.c
branches/kill-bonobo/mail/mail-component.c
branches/kill-bonobo/mail/mail-config.c
branches/kill-bonobo/mail/mail-config.glade
branches/kill-bonobo/mail/mail-folder-cache.c
branches/kill-bonobo/mail/mail-mt.c
branches/kill-bonobo/mail/mail-ops.c
branches/kill-bonobo/mail/mail-ops.h
branches/kill-bonobo/mail/mail-send-recv.c
branches/kill-bonobo/mail/mail-session.c
branches/kill-bonobo/mail/mail-vfolder.c
branches/kill-bonobo/mail/message-list.c
branches/kill-bonobo/mail/message-list.etspec
branches/kill-bonobo/mail/message-list.h
branches/kill-bonobo/plugins/attachment-reminder/ChangeLog
branches/kill-bonobo/plugins/attachment-reminder/attachment-reminder.c
branches/kill-bonobo/plugins/audio-inline/ChangeLog
branches/kill-bonobo/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
branches/kill-bonobo/plugins/bbdb/ChangeLog
branches/kill-bonobo/plugins/bbdb/bbdb.c
branches/kill-bonobo/plugins/default-mailer/ChangeLog
branches/kill-bonobo/plugins/default-mailer/default-mailer.c
branches/kill-bonobo/plugins/email-custom-header/ChangeLog
branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c
branches/kill-bonobo/plugins/email-custom-header/email-custom-header.h
branches/kill-bonobo/plugins/exchange-operations/ChangeLog
branches/kill-bonobo/plugins/exchange-operations/exchange-config-listener.c
branches/kill-bonobo/plugins/exchange-operations/exchange-delegates-user.c
branches/kill-bonobo/plugins/exchange-operations/exchange-user-dialog.c
branches/kill-bonobo/plugins/google-account-setup/ChangeLog
branches/kill-bonobo/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
branches/kill-bonobo/plugins/groupwise-account-setup/ChangeLog
branches/kill-bonobo/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
branches/kill-bonobo/plugins/groupwise-features/ChangeLog
branches/kill-bonobo/plugins/groupwise-features/install-shared.c
branches/kill-bonobo/plugins/groupwise-features/junk-settings.c
branches/kill-bonobo/plugins/groupwise-features/org-gnome-compose-send-options.xml
branches/kill-bonobo/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-errors.xml
branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
branches/kill-bonobo/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
branches/kill-bonobo/plugins/groupwise-features/proxy-listing.glade
branches/kill-bonobo/plugins/groupwise-features/proxy-login-dialog.glade
branches/kill-bonobo/plugins/groupwise-features/proxy-login.c
branches/kill-bonobo/plugins/groupwise-features/proxy.c
branches/kill-bonobo/plugins/groupwise-features/send-options.c
branches/kill-bonobo/plugins/groupwise-features/share-folder.c
branches/kill-bonobo/plugins/groupwise-features/status-track.c
branches/kill-bonobo/plugins/ipod-sync/ChangeLog
branches/kill-bonobo/plugins/ipod-sync/evolution-ipod-sync.c
branches/kill-bonobo/plugins/ipod-sync/ical-format.c
branches/kill-bonobo/plugins/ipod-sync/ipod-sync.c
branches/kill-bonobo/plugins/ipod-sync/sync.c
branches/kill-bonobo/plugins/itip-formatter/ChangeLog
branches/kill-bonobo/plugins/itip-formatter/itip-formatter.c
branches/kill-bonobo/plugins/itip-formatter/itip-view.c
branches/kill-bonobo/plugins/mail-notification/ChangeLog
branches/kill-bonobo/plugins/mail-notification/mail-notification.c
branches/kill-bonobo/plugins/mark-calendar-offline/ChangeLog
branches/kill-bonobo/plugins/mark-calendar-offline/mark-calendar-offline.c
branches/kill-bonobo/plugins/publish-calendar/ChangeLog
branches/kill-bonobo/plugins/publish-calendar/publish-calendar.c
branches/kill-bonobo/plugins/publish-calendar/publish-calendar.glade
branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c
branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.h
branches/kill-bonobo/plugins/python/ChangeLog
branches/kill-bonobo/plugins/python/org-gnome-evolution-python.eplug.xml
branches/kill-bonobo/plugins/python/python-plugin-loader.c
branches/kill-bonobo/plugins/python/python-plugin-loader.h
branches/kill-bonobo/plugins/sa-junk-plugin/ChangeLog
branches/kill-bonobo/plugins/sa-junk-plugin/em-junk-filter.c
branches/kill-bonobo/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
branches/kill-bonobo/plugins/save-attachments/ChangeLog
branches/kill-bonobo/plugins/save-attachments/save-attachments.c
branches/kill-bonobo/plugins/save-calendar/ChangeLog
branches/kill-bonobo/plugins/save-calendar/csv-format.c
branches/kill-bonobo/plugins/save-calendar/ical-format.c
branches/kill-bonobo/plugins/save-calendar/rdf-format.c
branches/kill-bonobo/plugins/save-calendar/save-calendar.c
branches/kill-bonobo/plugins/startup-wizard/ChangeLog
branches/kill-bonobo/plugins/startup-wizard/startup-wizard.c
branches/kill-bonobo/plugins/templates/ChangeLog
branches/kill-bonobo/plugins/templates/templates.c
branches/kill-bonobo/plugins/tnef-attachments/ChangeLog
branches/kill-bonobo/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
branches/kill-bonobo/plugins/webdav-account-setup/ChangeLog
branches/kill-bonobo/plugins/webdav-account-setup/webdav-contacts-source.c
branches/kill-bonobo/po/ChangeLog
branches/kill-bonobo/po/ar.po
branches/kill-bonobo/po/bg.po
branches/kill-bonobo/po/bn_IN.po
branches/kill-bonobo/po/ca.po
branches/kill-bonobo/po/cs.po
branches/kill-bonobo/po/da.po
branches/kill-bonobo/po/de.po
branches/kill-bonobo/po/el.po
branches/kill-bonobo/po/en_GB.po
branches/kill-bonobo/po/es.po
branches/kill-bonobo/po/et.po
branches/kill-bonobo/po/eu.po
branches/kill-bonobo/po/fi.po
branches/kill-bonobo/po/fr.po
branches/kill-bonobo/po/hi.po
branches/kill-bonobo/po/hu.po
branches/kill-bonobo/po/it.po
branches/kill-bonobo/po/kn.po
branches/kill-bonobo/po/lt.po
branches/kill-bonobo/po/ml.po
branches/kill-bonobo/po/mr.po
branches/kill-bonobo/po/nb.po
branches/kill-bonobo/po/nl.po
branches/kill-bonobo/po/pl.po
branches/kill-bonobo/po/pt.po
branches/kill-bonobo/po/pt_BR.po
branches/kill-bonobo/po/ru.po
branches/kill-bonobo/po/sl.po
branches/kill-bonobo/po/sq.po
branches/kill-bonobo/po/sr.po
branches/kill-bonobo/po/sr latin po
branches/kill-bonobo/po/sv.po
branches/kill-bonobo/po/ta.po
branches/kill-bonobo/po/tr.po
branches/kill-bonobo/po/zh_HK.po
branches/kill-bonobo/po/zh_TW.po
branches/kill-bonobo/shell/ChangeLog
branches/kill-bonobo/shell/e-config-upgrade.c
branches/kill-bonobo/shell/e-shell-importer.c
branches/kill-bonobo/shell/e-shell-nm.c
branches/kill-bonobo/shell/e-shell-view.c
branches/kill-bonobo/shell/e-shell-view.h
branches/kill-bonobo/shell/e-shell.c
branches/kill-bonobo/shell/main.c
branches/kill-bonobo/shell/shell.error.xml
branches/kill-bonobo/widgets/ChangeLog
branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.c
branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.h
branches/kill-bonobo/widgets/misc/ChangeLog
branches/kill-bonobo/widgets/misc/e-attachment-bar.c
branches/kill-bonobo/widgets/misc/e-attachment.c
branches/kill-bonobo/widgets/misc/e-calendar.c
branches/kill-bonobo/widgets/misc/e-canvas-background.c
branches/kill-bonobo/widgets/misc/e-canvas.c
branches/kill-bonobo/widgets/misc/e-cell-percent.c
branches/kill-bonobo/widgets/misc/e-colors.c
branches/kill-bonobo/widgets/misc/e-dateedit.c
branches/kill-bonobo/widgets/misc/e-expander.c
branches/kill-bonobo/widgets/misc/e-online-button.c
branches/kill-bonobo/widgets/misc/e-online-button.h
branches/kill-bonobo/widgets/misc/e-search-bar.c
branches/kill-bonobo/widgets/misc/e-unicode.h
branches/kill-bonobo/widgets/table/ChangeLog
branches/kill-bonobo/widgets/table/Makefile.am
branches/kill-bonobo/widgets/table/e-cell-float.c
branches/kill-bonobo/widgets/table/e-cell-float.h
branches/kill-bonobo/widgets/table/e-cell-text.c
branches/kill-bonobo/widgets/table/e-table-col.c
branches/kill-bonobo/widgets/table/e-table-field-chooser-item.c
branches/kill-bonobo/widgets/table/e-table-field-chooser.c
branches/kill-bonobo/widgets/table/e-table-scrolled.c
branches/kill-bonobo/widgets/table/e-table-sorting-utils.c
branches/kill-bonobo/widgets/table/e-table.c
branches/kill-bonobo/widgets/table/e-tree-model.c
branches/kill-bonobo/widgets/table/e-tree-selection-model.c
branches/kill-bonobo/widgets/table/e-tree.c
branches/kill-bonobo/widgets/text/e-text.h
Modified: branches/kill-bonobo/Makefile.am
==============================================================================
--- branches/kill-bonobo/Makefile.am (original)
+++ branches/kill-bonobo/Makefile.am Wed Oct 1 20:56:04 2008
@@ -11,6 +11,8 @@
AUTHORS \
$(changelogs) \
COPYING-DOCS \
+ COPYING.LGPL2 \
+ COPYING.LGPL3 \
README \
HACKING \
MAINTAINERS \
Modified: branches/kill-bonobo/NEWS
==============================================================================
--- branches/kill-bonobo/NEWS (original)
+++ branches/kill-bonobo/NEWS Wed Oct 1 20:56:04 2008
@@ -1,8 +1,70 @@
+Evolution 2.24.0 2008-09-22
+---------------------------
+
+New in 2.24.0:
+
+ * Message Templates
+ * WebDAV Contacts Plugin
+ * Google Contacts Plugin
+ * Custom header support while sending mails
+ * Single Model view for Calendar
+ * Sqlite Based message summary
+ * New Bonobo-less composer for Evolution
+ * Quota support to IMAP/POP accounts
+ * Gtk+ Recent manager integration in Composer
+
+Bug Fixes:
+ #504767: Expand also parent nodes, if necessary (Milan Crha)
+ #505016: Check for NULL to prevent crash when error occurred. (Milan Crha)
+ #514299: Connect to signals only once, when creating new status icon (Milan Crha)
+ #534039: Dropped unnecessary and offending code causing infinite loops when deleting search folder. (Milan Crha)
+ #539536: Add "Face" header to default headers and allow it to be hidden (Paul Bolle)
+ #551548: Enable selection of S/MIME for individual messages (Matthew Barnes)
+ #551628: Remove old events from the view when objects are modified. (Chenthill Palanisamy)
+ #551895: Fix a warning message (Paul Bolle)
+ #551915: Manage error on idle, to call gtk functions in the main thread (Milan Crha)
+ #552911: Do not use spaces in file names (Milan Crha)
+
+Updated Translations:
+ Wadim Dziedzic (pl)
+ Osama Khalid, Usama Akkad, Abou Manal (ar)
+ Gabor Kelemen (hu)
+ Kenneth Nielsen (da)
+ Luca Ferretti (it)
+ FabrÃcio Godoy, Vladimir Melo and Leonardo Ferreira Fontenelle (pt_BR)
+ Laurent Dhima (sq)
+ Igor NestoroviÄ(sr, sr latin)
+ Pierros Papadeas (el)
+ Åygimantas BeruÄka (lt)
+ Tirumurthi Vasudevan (ta)
+ Inaki LarraÃaga Murgoitio (eu)
+ Shankar Prasad (kn)
+ Chao-Hsiung Liao (zh_HK, zh_TW)
+ Jiri Eischmann (cs)
+ Jorge Gonzalez (es)
+ Ivar Smolin (et)
+ David Planella (ca)
+ Tino Meinen (nl)
+ Ilkka Tuohela (fi)
+ Sandeep Shedmake (mr)
+ Daniel Nylander (sv)
+ Baris Cicek (tr)
+ Hendrik Richter (de)
+ Philip Withnall (en_GB)
+ Duarte Loreto (pt)
+ Runa Bhattacharjee (bn_IN)
+ Luca Ferretti (it)
+ Rajesh Ranjan (hi)
+ Robert Sedak (hr)
+ David Planella (ca)
+ Yavor Doganov (bg)
+ Theppitak Karoonboonyanan (th)
+
Evolution 2.23.92 2008-09-08
----------------------------
New in 2.23.92:
- Evolution source code license changed to LGPLv2 or later (Sankar P)
+ Evolution source code license changed to LGPLv2 & LGPLV3 (Sankar P)
Bug Fixes:
#549968: Use the same mnemonic for "Recent Documents" as composer (Matthew Barnes)
Modified: branches/kill-bonobo/a11y/addressbook/ea-addressbook-view.c
==============================================================================
--- branches/kill-bonobo/a11y/addressbook/ea-addressbook-view.c (original)
+++ branches/kill-bonobo/a11y/addressbook/ea-addressbook-view.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * ea-addressbook-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Leon Zhang <leon zhang sun com> Sun Microsystem Inc., 2003
+ * Authors:
+ * Leon Zhang <leon zhang sun com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/a11y/addressbook/ea-minicard-view.c
==============================================================================
--- branches/kill-bonobo/a11y/addressbook/ea-minicard-view.c (original)
+++ branches/kill-bonobo/a11y/addressbook/ea-minicard-view.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * ea-minicard-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Leon Zhang < leon zhang sun com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Leon Zhang < leon zhang sun com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-text.c
==============================================================================
--- branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-text.c (original)
+++ branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-text.c Wed Oct 1 20:56:04 2008
@@ -1,9 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
* Authors:
- * Christopher James Lahey <clahey ximian com>
+ * Christopher James Lahey <clahey ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-tree.c
==============================================================================
--- branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-tree.c (original)
+++ branches/kill-bonobo/a11y/e-table/gal-a11y-e-cell-tree.c Wed Oct 1 20:56:04 2008
@@ -1,9 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
* Authors:
- * Tim Wo <tim wo sun com>, Sun Microsystem Inc. 2003.
+ * Tim Wo <tim wo sun com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-component.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-component.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-component.c Wed Oct 1 20:56:04 2008
@@ -1,28 +1,27 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Ettore Perazzoli <ettore ximian com>
+ * Authors:
+ * Ettore Perazzoli <ettore ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
/* EPFIXME: Add autocompletion setting. */
-
#include <config.h>
#include "addressbook-component.h"
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-config.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-config.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-config.c Wed Oct 1 20:56:04 2008
@@ -1,11 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
* Authors:
- * Chris Toshok <toshok ximian com>
- * Chris Lahey <clahey ximian com>
- * Michael Zucchi <notzed ximian com>
- * And no doubt others ...
- **/
+ * Chris Toshok <toshok ximian com>
+ * Chris Lahey <clahey ximian com>
+ * Michael Zucchi <notzed ximian com>
+ * And no doubt others ...
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
/*#define STANDALONE*/
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-migrate.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-migrate.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-migrate.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Chris Toshok (toshok ximian com)
+ * Authors:
+ * Chris Toshok <toshok ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Chris Lahey (clahey ximian com)
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/component/apps_evolution_addressbook.schemas.in
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/apps_evolution_addressbook.schemas.in (original)
+++ branches/kill-bonobo/addressbook/gui/component/apps_evolution_addressbook.schemas.in Wed Oct 1 20:56:04 2008
@@ -27,6 +27,18 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/evolution/addressbook/completion/show_address</key>
+ <applyto>/apps/evolution/addressbook/completion/show_address</applyto>
+ <owner>evolution-addressbook</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Show autocompleted name with an address</short>
+ <long>Whether force showing the mail address with the name of the autocompleted contact in the entry.</long>
+ </locale>
+ </schema>
+
<!-- Select names last used uri -->
<schema>
Modified: branches/kill-bonobo/addressbook/gui/component/autocompletion-config.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/autocompletion-config.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/autocompletion-config.c Wed Oct 1 20:56:04 2008
@@ -25,6 +25,7 @@
#include "autocompletion-config.h"
#include <e-shell.h>
+#include <libedataserverui/e-name-selector-entry.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <e-preferences-window.h>
Modified: branches/kill-bonobo/addressbook/gui/component/ldap-config.glade
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/ldap-config.glade (original)
+++ branches/kill-bonobo/addressbook/gui/component/ldap-config.glade Wed Oct 1 20:56:04 2008
@@ -475,7 +475,7 @@
<child>
<widget class="GtkEntry" id="server-name-entry">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">This is the full name of your ldap server. For example, "ldap.mycompany.com".</property>
+ <property name="tooltip" translatable="yes">This is the full name of your LDAP server. For example, "ldap.mycompany.com".</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="editable">True</property>
@@ -635,7 +635,7 @@
<child>
<widget class="GtkOptionMenu" id="auth-optionmenu">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">This is the method Evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your ldap server.</property>
+ <property name="tooltip" translatable="yes">This is the method Evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your LDAP server.</property>
<property name="can_focus">True</property>
<property name="history">0</property>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/contact-editor.glade
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/contact-editor.glade (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/contact-editor.glade Wed Oct 1 20:56:04 2008
@@ -1422,7 +1422,7 @@
<child>
<widget class="GtkMenuItem" id="menuitem389">
<property name="visible">True</property>
- <property name="label" translatable="yes">Novell Groupwise</property>
+ <property name="label" translatable="yes">Novell GroupWise</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
</widget>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c Wed Oct 1 20:56:04 2008
@@ -52,7 +52,7 @@
static const char *im_labels[] = {
N_("AOL Instant Messenger"),
- N_("Novell Groupwise"),
+ N_("Novell GroupWise"),
N_("Jabber"),
N_("Yahoo Messenger"),
N_("Gadu-Gadu Messenger"),
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-contact-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Developed by Jon Trowbridge <trow ximian com>
- */
-
/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jon Trowbridge <trow ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Toshok <toshok ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.c Wed Oct 1 20:56:04 2008
@@ -259,7 +259,7 @@
if (!e_contact_list_model_has_email (model, email))
return FALSE;
- return (e_error_run (NULL, tag, email) != GTK_RESPONSE_YES);
+ return (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES);
}
static void
Modified: branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-model.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-model.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-model.c Wed Oct 1 20:56:04 2008
@@ -152,7 +152,7 @@
g_return_if_fail (email != NULL);
if (e_contact_list_model_has_email (model, email))
- if (e_error_run (NULL, tag, email) != GTK_RESPONSE_YES)
+ if (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES)
return;
destination = e_destination_new ();
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c Wed Oct 1 20:56:04 2008
@@ -1,10 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Author:
- * Christopher James Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Christopher James Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * (C) 1999 Ximian, Inc.
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-addressbook-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey ximian com>
- * Chris Toshok <toshok ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ * Chris Toshok <toshok ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h Wed Oct 1 20:56:04 2008
@@ -19,6 +19,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
+
#ifndef E_ADDRESSBOOK_VIEW_H
#define E_ADDRESSBOOK_VIEW_H
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-minicard-label.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-minicard.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/gui/widgets/eab-gui-util.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/eab-gui-util.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/eab-gui-util.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-table-field-chooser.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Toshok <toshok ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -403,7 +404,7 @@
* {0}, {1} and {2}, respectively in the error message formed
*/
e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error",
- err_str_ext, filename, g_strerror (errno));
+ err_str_ext, filename, g_strerror (errno), NULL);
gtk_widget_destroy(GTK_WIDGET(info->filesel));
return;
}
@@ -890,6 +891,7 @@
composer = e_msg_composer_new ();
table = e_msg_composer_get_header_table (composer);
+ em_composer_utils_setup_default_callbacks (composer);
attachment = camel_mime_part_new ();
data = eab_contact_list_to_string (contacts);
Modified: branches/kill-bonobo/addressbook/gui/widgets/eab-vcard-control.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/eab-vcard-control.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/eab-vcard-control.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * eab-vcard-control.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
* Authors:
- * Chris Lahey <clahey ximian com>
- * Chris Toshok <toshok ximian com>
+ * Chris Lahey <clahey ximian com>
+ * Chris Toshok <toshok ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/addressbook/importers/evolution-ldif-importer.c
==============================================================================
--- branches/kill-bonobo/addressbook/importers/evolution-ldif-importer.c (original)
+++ branches/kill-bonobo/addressbook/importers/evolution-ldif-importer.c Wed Oct 1 20:56:04 2008
@@ -1,4 +1,19 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ */
/*
* LDIF importer. LDIF is the file format of an exported Netscape
Modified: branches/kill-bonobo/addressbook/importers/evolution-vcard-importer.c
==============================================================================
--- branches/kill-bonobo/addressbook/importers/evolution-vcard-importer.c (original)
+++ branches/kill-bonobo/addressbook/importers/evolution-vcard-importer.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution calendar importer component
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Authors: Chris Toshok <toshok ximian com>
- * JP Rosevear <jpr ximian com>
+ * Authors:
+ * Chris Toshok <toshok ximian com>
+ * JP Rosevear <jpr ximian com>
* Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/addressbook/tools/evolution-addressbook-export.c
==============================================================================
--- branches/kill-bonobo/addressbook/tools/evolution-addressbook-export.c (original)
+++ branches/kill-bonobo/addressbook/tools/evolution-addressbook-export.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * Author: Gilbert Fang <gilbert fang sun com>
+ *
+ * Authors:
+ * Gilbert Fang <gilbert fang sun com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/calendar/calendar.error.xml
==============================================================================
--- branches/kill-bonobo/calendar/calendar.error.xml (original)
+++ branches/kill-bonobo/calendar/calendar.error.xml Wed Oct 1 20:56:04 2008
@@ -93,7 +93,7 @@
</error>
<error id="prompt-save-appointment" type="warning" default="GTK_RESPONSE_YES">
- <title>Save Appointment</title>
+ <_title>Save Appointment</_title>
<_primary>Would you like to save your changes to this appointment?</_primary>
<_secondary>You have changed this appointment, but not yet saved it.</_secondary>
<button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -102,7 +102,7 @@
</error>
<error id="prompt-save-task" type="warning" default="GTK_RESPONSE_YES">
- <title>Save Task</title>
+ <_title>Save Task</_title>
<_primary>Would you like to save your changes to this task?</_primary>
<_secondary>You have changed this task, but not yet saved it.</_secondary>
<button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -111,7 +111,7 @@
</error>
<error id="prompt-save-memo" type="warning" default="GTK_RESPONSE_YES">
- <title>Save Memo</title>
+ <_title>Save Memo</_title>
<_primary>Would you like to save your changes to this memo?</_primary>
<_secondary>You have made changes to this memo, but not yet saved them.</_secondary>
<button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -255,7 +255,7 @@
</error>
<error id="server-version" type="warning">
- <title>Server Version</title>
+ <_title>Server Version</_title>
<_primary>Some features may not work properly with your current server.</_primary>
<_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version.</_secondary>
</error>
Modified: branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c (original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
+/*
+ * Alarm queueing engine
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -926,7 +930,7 @@
0, NULL, &ev);
if (BONOBO_EX (&ev)) {
- e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
+ e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
CORBA_exception_free (&ev);
return;
}
@@ -943,7 +947,7 @@
GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
if (BONOBO_EX (&ev))
- e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
+ e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
CORBA_exception_free (&ev);
Modified: branches/kill-bonobo/calendar/gui/alarm-notify/alarm.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/alarm.h (original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/alarm.h Wed Oct 1 20:56:04 2008
@@ -1,23 +1,26 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel ximian com>
- * Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Low-level alarm timer mechanism
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Miguel de Icaza <miguel ximian com>
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef ALARM_H
Modified: branches/kill-bonobo/calendar/gui/alarm-notify/config-data.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/config-data.c (original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/config-data.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Configuration values for the alarm notification daemon
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIOH
Modified: branches/kill-bonobo/calendar/gui/alarm-notify/notify-main.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/notify-main.c (original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/notify-main.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,26 @@
-/* Evolution calendar - Alarm notification service main file
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
- * Rodrigo Moya <rodrigo ximian com>
+/*
+ * Evolution calendar - Alarm notification service main file
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/cal-search-bar.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/cal-search-bar.c (original)
+++ branches/kill-bonobo/calendar/gui/cal-search-bar.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Search bar widget for calendar views
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/calendar-component.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-component.c (original)
+++ branches/kill-bonobo/calendar/gui/calendar-component.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Authors: Ettore Perazzoli <ettore ximian com>
- * Rodrigo Moya <rodrigo ximian com>
+ * Authors:
+ * Ettore Perazzoli <ettore ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -363,7 +363,7 @@
return;
if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
- "calendar:prompt-delete-calendar", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+ "calendar:prompt-delete-calendar", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
return;
/* first, ask the backend to remove the calendar */
Modified: branches/kill-bonobo/calendar/gui/calendar-config-keys.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config-keys.h (original)
+++ branches/kill-bonobo/calendar/gui/calendar-config-keys.h Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors :
- * JP Rosevear <jpr ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#ifndef _CALENDAR_CONFIG_KEYS_H_
Modified: branches/kill-bonobo/calendar/gui/calendar-config.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config.c (original)
+++ branches/kill-bonobo/calendar/gui/calendar-config.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors :
- * Damon Chaplin <damon ximian com>
- * Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/calendar-config.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config.h (original)
+++ branches/kill-bonobo/calendar/gui/calendar-config.h Wed Oct 1 20:56:04 2008
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Authors :
- * Damon Chaplin <damon ximian com>
- * Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/comp-editor-factory.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/comp-editor-factory.c (original)
+++ branches/kill-bonobo/calendar/gui/comp-editor-factory.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Component editor factory object
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/comp-util.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/comp-util.c (original)
+++ branches/kill-bonobo/calendar/gui/comp-util.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,25 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Utilities for manipulating ECalComponent objects
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/comp-util.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/comp-util.h (original)
+++ branches/kill-bonobo/calendar/gui/comp-util.h Wed Oct 1 20:56:04 2008
@@ -1,22 +1,25 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Utilities for manipulating ECalComponent objects
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef COMP_UTIL_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/alarm-list-dialog.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/alarm-list-dialog.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/alarm-list-dialog.c Wed Oct 1 20:56:04 2008
@@ -160,7 +160,7 @@
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list));
if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
- g_warning ("Could not get a selection to delete.");
+ g_warning ("Could not get a selection to edit.");
return;
}
Modified: branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Authors :
- * Damon Chaplin <damon ximian com>
- * Ettore Perazzoli <ettore ximian com>
- * David Trowbridge <trowbrds cs colorado edu>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Ettore Perazzoli <ettore ximian com>
+ * David Trowbridge <trowbrds cs colorado edu>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.h (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/cal-prefs-dialog.h Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * David Trowbridge <trowbrds cs colorado edu>
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * David Trowbridge <trowbrds cs colorado edu>
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr ximian com>
+/*
+ * Evolution calendar - Send calendar component dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c Wed Oct 1 20:56:04 2008
@@ -2877,7 +2877,7 @@
return;
}
- mime_type = e_util_guess_mime_type (file_name);
+ mime_type = e_util_guess_mime_type (file_name, TRUE);
if (mime_type) {
if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
wrapper = (CamelDataWrapper *) camel_mime_message_new ();
Modified: branches/kill-bonobo/calendar/gui/dialogs/copy-source-dialog.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/copy-source-dialog.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/copy-source-dialog.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Copy source dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Rodrigo Moya <rodrigo ximian com>
+/*
+ * Evolution calendar - Copy source dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/delete-comp.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/delete-comp.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/delete-comp.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico ximian com>
+/*
+ * Evolution calendar - Delete calendar component dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/delete-error.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/delete-error.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/delete-error.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr ximian com>
+/*
+ * Evolution calendar - Send calendar component dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/e-send-options-utils.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/e-send-options-utils.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/e-send-options-utils.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,27 @@
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon ximian com>
+/*
+ * Evolution calendar - Timezone selector dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
+
#include "e-send-options-utils.h"
#include "../calendar-config.h"
#include <glib.h>
Modified: branches/kill-bonobo/calendar/gui/dialogs/event-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/event-page.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/event-page.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,28 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
- * Miguel de Icaza <miguel ximian com>
- * Seth Alves <alves hungry com>
- * JP Rosevear <jpr ximian com>
+/*
+ * Evolution calendar - Main page of the event editor dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ * Miguel de Icaza <miguel ximian com>
+ * Seth Alves <alves hungry com>
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/memo-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/memo-page.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/memo-page.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,29 @@
-/* Evolution calendar - Main page of the memo editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
- * Miguel de Icaza <miguel ximian com>
- * Seth Alves <alves hungry com>
- * JP Rosevear <jpr ximian com>
- * Nathan Owens <pianocomp81 yahoo com>
+/*
+ * Evolution calendar - Main page of the memo editor dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ * Miguel de Icaza <miguel ximian com>
+ * Seth Alves <alves hungry com>
+ * JP Rosevear <jpr ximian com>
+ * Nathan Owens <pianocomp81 yahoo com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Recurring calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr ximian com>
+/*
+ * Evolution calendar - Recurring calendar component dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,29 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Recurrence page of the calendar component dialogs
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
- * Miguel de Icaza <miguel ximian com>
- * Seth Alves <alves hungry com>
- * JP Rosevear <jpr ximian com>
- * Hans Petter Jansson <hpj ximiman com>
+/*
+ * Evolution calendar - Recurrence page of the calendar component dialogs
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ * Miguel de Icaza <miguel ximian com>
+ * Seth Alves <alves hungry com>
+ * JP Rosevear <jpr ximian com>
+ * Hans Petter Jansson <hpj ximiman com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/dialogs/task-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/task-page.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/task-page.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,28 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico ximian com>
- * Miguel de Icaza <miguel ximian com>
- * Seth Alves <alves hungry com>
- * JP Rosevear <jpr ximian com>
+/*
+ * Evolution calendar - Main page of the task editor dialog
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena-Quintero <federico ximian com>
+ * Miguel de Icaza <miguel ximian com>
+ * Seth Alves <alves hungry com>
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-alarm-list.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-alarm-list.c (original)
+++ branches/kill-bonobo/calendar/gui/e-alarm-list.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EAlarmList - list of calendar alarms with GtkTreeModel interface.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * EAlarmList - list of calendar alarms with GtkTreeModel interface.
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * Authors: Hans Petter Jansson <hpj ximian com>
+ * Authors:
+ * Hans Petter Jansson <hpj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/calendar/gui/e-cal-component-preview.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-component-preview.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-component-preview.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Authors: Federico Mena Quintero <federico ximian com>
+ * Authors:
+ * Federico Mena Quintero <federico ximian com>
* Damon Chaplin <damon ximian com>
- * Rodrigo Moya <rodrigo ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-cal-model-tasks.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-model-tasks.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-model-tasks.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,25 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo ximian com>
+/*
+ * Evolution calendar - Data model for ETable
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-cal-model.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-model.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-model.c Wed Oct 1 20:56:04 2008
@@ -1499,7 +1499,7 @@
/* re-add only the recurrence objects */
for (l = objects; l != NULL; l = g_list_next (l)) {
- if (e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
+ if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
list = g_list_prepend (list, l->data);
else {
int pos;
@@ -1507,7 +1507,7 @@
ECalComponentId *id;
ECalComponent *comp = e_cal_component_new ();
ECal *client = e_cal_view_get_client (query);
-
+
if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data))) {
g_object_unref (comp);
continue;
@@ -1516,13 +1516,34 @@
e_table_model_pre_change (E_TABLE_MODEL (model));
id = e_cal_component_get_id (comp);
-
+
comp_data = search_by_id_and_client (priv, client, id);
- icalcomponent_free (comp_data->icalcomp);
-
+ if (comp_data->icalcomp)
+ icalcomponent_free (comp_data->icalcomp);
+ if (comp_data->dtstart) {
+ g_free (comp_data->dtstart);
+ comp_data->dtstart = NULL;
+ }
+ if (comp_data->dtend) {
+ g_free (comp_data->dtend);
+ comp_data->dtend = NULL;
+ }
+ if (comp_data->due) {
+ g_free (comp_data->due);
+ comp_data->due = NULL;
+ }
+ if (comp_data->completed) {
+ g_free (comp_data->completed);
+ comp_data->completed = NULL;
+ }
+ if (comp_data->color) {
+ g_free (comp_data->color);
+ comp_data->color = NULL;
+ }
+
comp_data->icalcomp = icalcomponent_new_clone (l->data);
e_cal_model_set_instance_times (comp_data, priv->zone);
-
+
pos = get_position_in_array (priv->objects, comp_data);
e_table_model_row_changed (E_TABLE_MODEL (model), pos);
Modified: branches/kill-bonobo/calendar/gui/e-cal-popup.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-popup.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-popup.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -396,17 +397,18 @@
for (cp = mime_type; *cp != '\0'; cp++)
*cp = g_ascii_tolower (*cp);
- /* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine
- on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between
- these two soon. */
- apps = g_app_info_get_all_for_type (mime_type);
+ cp = g_content_type_from_mime_type (mime_type);
+ apps = g_app_info_get_all_for_type (cp ? cp : mime_type);
+ g_free (cp);
if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
if (filename) {
gchar *name_type;
- name_type = e_util_guess_mime_type (filename);
- apps = g_app_info_get_all_for_type (name_type);
+ name_type = e_util_guess_mime_type (filename, FALSE);
+ cp = g_content_type_from_mime_type (name_type);
+ apps = g_app_info_get_all_for_type (cp ? cp : name_type);
+ g_free (cp);
g_free (name_type);
}
}
Modified: branches/kill-bonobo/calendar/gui/e-calendar-table.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-calendar-table.c (original)
+++ branches/kill-bonobo/calendar/gui/e-calendar-table.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Authors :
- * Damon Chaplin <damon ximian com>
- * Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/e-calendar-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-calendar-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-calendar-view.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-day-view-main-item.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-day-view-main-item.c (original)
+++ branches/kill-bonobo/calendar/gui/e-day-view-main-item.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/e-day-view-top-item.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-day-view-top-item.c (original)
+++ branches/kill-bonobo/calendar/gui/e-day-view-top-item.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/e-day-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-day-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-day-view.c Wed Oct 1 20:56:04 2008
@@ -554,12 +554,30 @@
{
ECalModelComponent *comp_data;
ECalModel *model;
+ gint day, event_num;
+ const char *uid = NULL;
+ char *rid = NULL;
e_day_view_stop_editing_event (day_view);
model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
comp_data = e_cal_model_get_component_at (model, row);
g_return_if_fail (comp_data != NULL);
+
+ uid = icalcomponent_get_uid (comp_data->icalcomp);
+ if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
+ icalproperty *prop;
+
+ prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
+ if (prop)
+ rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ }
+
+ if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
+ e_day_view_remove_event_cb (day_view, day, event_num, NULL);
+
+ g_free (rid);
+
process_component (day_view, comp_data);
gtk_widget_queue_draw (day_view->top_canvas);
@@ -640,7 +658,6 @@
const char *uid = NULL;
char *rid = NULL;
-
uid = icalcomponent_get_uid (comp_data->icalcomp);
if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
icalproperty *prop;
@@ -6303,6 +6320,9 @@
if (mod == CALOBJ_MOD_THIS) {
ECalComponentDateTime olddt, dt;
+ icaltimetype itt;
+
+ dt.value = &itt;
e_cal_component_get_dtstart (comp, &olddt);
if (olddt.value->zone) {
Modified: branches/kill-bonobo/calendar/gui/e-itip-control.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-itip-control.c (original)
+++ branches/kill-bonobo/calendar/gui/e-itip-control.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: JP Rosevear
+ * Authors:
+ * JP Rosevear <jpr novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-itip-control.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-itip-control.h (original)
+++ branches/kill-bonobo/calendar/gui/e-itip-control.h Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: JP Rosevear
+ * Authors:
+ * JP Rosevear <jpr novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifndef _E_ITIP_CONTROL_H_
Modified: branches/kill-bonobo/calendar/gui/e-meeting-store.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-store.c (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-store.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,24 @@
/*
- * e-meeting-store.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr ximian com>
- * Mike Kestner <mkestner ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr ximian com>
+ * Mike Kestner <mkestner ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-meeting-store.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-store.h (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-store.h Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
/*
- * e-meeting-store.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Mike Kestner
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Mike Kestner
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifndef _E_MEETING_STORE_H_
Modified: branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Authors :
- * Damon Chaplin <damon gtk org>
- * Rodrigo Moya <rodrigo novell com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon gtk org>
+ * Rodrigo Moya <rodrigo novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/e-meeting-time-sel.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-time-sel.h (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-time-sel.h Wed Oct 1 20:56:04 2008
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon gtk org>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon gtk org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
+
#ifndef _E_MEETING_TIME_SELECTOR_H_
#define _E_MEETING_TIME_SELECTOR_H_
Modified: branches/kill-bonobo/calendar/gui/e-memo-table.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-memo-table.c (original)
+++ branches/kill-bonobo/calendar/gui/e-memo-table.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Authors :
- * Damon Chaplin <damon ximian com>
- * Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ * Nathan Owens <pianocomp81 yahoo com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/e-memo-table.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-memo-table.h (original)
+++ branches/kill-bonobo/calendar/gui/e-memo-table.h Wed Oct 1 20:56:04 2008
@@ -1,4 +1,5 @@
/*
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -15,6 +16,7 @@
*
* Authors:
* Damon Chaplin <damon ximian com>
+ * Nathan Owens <pianocomp81 yahoo com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
Modified: branches/kill-bonobo/calendar/gui/e-timezone-entry.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-timezone-entry.c (original)
+++ branches/kill-bonobo/calendar/gui/e-timezone-entry.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/e-week-view-event-item.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-week-view-event-item.c (original)
+++ branches/kill-bonobo/calendar/gui/e-week-view-event-item.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/calendar/gui/e-week-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-week-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-week-view.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Authors :
- * Damon Chaplin <damon ximian com>
- * Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
@@ -336,10 +334,28 @@
{
ECalModelComponent *comp_data;
ECalModel *model;
+ gint event_num;
+ const char *uid;
+ char *rid = NULL;
model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
comp_data = e_cal_model_get_component_at (model, row);
g_return_if_fail (comp_data != NULL);
+
+ uid = icalcomponent_get_uid (comp_data->icalcomp);
+ if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
+ icalproperty *prop;
+
+ prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
+ if (prop)
+ rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ }
+
+ if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
+ e_week_view_remove_event_cb (week_view, event_num, NULL);
+
+ g_free (rid);
+
process_component (week_view, comp_data);
gtk_widget_queue_draw (week_view->main_canvas);
Modified: branches/kill-bonobo/calendar/gui/e-week-view.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-week-view.h (original)
+++ branches/kill-bonobo/calendar/gui/e-week-view.h Wed Oct 1 20:56:04 2008
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
+
#ifndef _E_WEEK_VIEW_H_
#define _E_WEEK_VIEW_H_
Modified: branches/kill-bonobo/calendar/gui/goto.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/goto.c (original)
+++ branches/kill-bonobo/calendar/gui/goto.c Wed Oct 1 20:56:04 2008
@@ -1,11 +1,27 @@
-/* Go to date dialog for Evolution
+/*
+ * Go to date dialog for Evolution
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Federico Mena <federico ximian com>
+ * JP Rosevear <jpr ximian com>
*
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 1998 Red Hat, Inc.
*
- * Authors: Federico Mena <federico ximian com>
- * JP Rosevear <jpr ximian com>
*/
#include <config.h>
Modified: branches/kill-bonobo/calendar/gui/itip-utils.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/itip-utils.c (original)
+++ branches/kill-bonobo/calendar/gui/itip-utils.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors:
- * JP Rosevear <jpr ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/itip-utils.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/itip-utils.h (original)
+++ branches/kill-bonobo/calendar/gui/itip-utils.h Wed Oct 1 20:56:04 2008
@@ -1,3 +1,21 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
#ifndef ITIP_UTILS_HEADER
#define ITIP_UTILS_HEADER
Modified: branches/kill-bonobo/calendar/gui/main.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/main.c (original)
+++ branches/kill-bonobo/calendar/gui/main.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Ettore Perazzoli
+ * Authors:
+ * Ettore Perazzoli <ettore ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/migration.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/migration.c (original)
+++ branches/kill-bonobo/calendar/gui/migration.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Rodrigo Moya <rodrigo ximian com>
+ * Authors:
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/calendar/gui/print.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/print.c (original)
+++ branches/kill-bonobo/calendar/gui/print.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Print support
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Michael Zucchi <notzed ximian com>
- * Federico Mena-Quintero <federico ximian com>
- * Damon Chaplin <damon ximian com>
+/*
+ * Evolution calendar - Print support
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ * Federico Mena-Quintero <federico ximian com>
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/gui/tasks-component.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/tasks-component.c (original)
+++ branches/kill-bonobo/calendar/gui/tasks-component.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-component.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Rodrigo Moya <rodrigo ximian com>
+ * Authors:
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -267,7 +267,7 @@
return;
if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
- "calendar:prompt-delete-task-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+ "calendar:prompt-delete-task-list", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
return;
/* first, ask the backend to remove the task list */
Modified: branches/kill-bonobo/calendar/gui/tasks-control.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/tasks-control.c (original)
+++ branches/kill-bonobo/calendar/gui/tasks-control.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Authors: Damon Chaplin <damon ximian com>
- * Ettore Perazzoli
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Ettore Perazzoli <ettore ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/calendar/importers/icalendar-importer.c
==============================================================================
--- branches/kill-bonobo/calendar/importers/icalendar-importer.c (original)
+++ branches/kill-bonobo/calendar/importers/icalendar-importer.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution calendar importer component
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Rodrigo Moya <rodrigo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/composer/e-composer-actions.c
==============================================================================
--- branches/kill-bonobo/composer/e-composer-actions.c (original)
+++ branches/kill-bonobo/composer/e-composer-actions.c Wed Oct 1 20:56:04 2008
@@ -246,7 +246,7 @@
e_error_run (
GTK_WINDOW (composer),
E_ERROR_NO_SAVE_FILE, filename,
- g_strerror (errno_saved));
+ g_strerror (errno_saved), NULL);
return;
}
} else
@@ -256,7 +256,7 @@
e_error_run (
GTK_WINDOW (composer),
E_ERROR_NO_SAVE_FILE,
- filename, error->message);
+ filename, error->message, NULL);
g_error_free (error);
return;
}
Modified: branches/kill-bonobo/composer/e-msg-composer.c
==============================================================================
--- branches/kill-bonobo/composer/e-msg-composer.c (original)
+++ branches/kill-bonobo/composer/e-msg-composer.c Wed Oct 1 20:56:04 2008
@@ -1,28 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
* Authors:
- * Ettore Perazzoli (ettore ximian com)
- * Jeffrey Stedfast (fejj ximian com)
- * Miguel de Icaza (miguel ximian com)
- * Radek Doulik (rodo ximian com)
+ * Ettore Perazzoli (ettore ximian com)
+ * Jeffrey Stedfast (fejj ximian com)
+ * Miguel de Icaza (miguel ximian com)
+ * Radek Doulik (rodo ximian com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -3969,7 +3966,7 @@
return;
if (!g_ascii_strcasecmp (url->protocol, "file")) {
- type = e_util_guess_mime_type (uri + strlen ("file://"));
+ type = e_util_guess_mime_type (uri + strlen ("file://"), TRUE);
if (!type)
return;
@@ -4201,7 +4198,7 @@
camel_data_wrapper_construct_from_stream (wrapper, stream);
camel_object_unref (CAMEL_OBJECT (stream));
- mime_type = e_util_guess_mime_type (dec_file_name);
+ mime_type = e_util_guess_mime_type (dec_file_name, TRUE);
if (mime_type == NULL)
mime_type = g_strdup ("application/octet-stream");
camel_data_wrapper_set_mime_type (wrapper, mime_type);
Modified: branches/kill-bonobo/composer/mail-composer.error.xml
==============================================================================
--- branches/kill-bonobo/composer/mail-composer.error.xml (original)
+++ branches/kill-bonobo/composer/mail-composer.error.xml Wed Oct 1 20:56:04 2008
@@ -79,6 +79,6 @@
<error id="send-options-support" type="error" modal="true">
<_primary>Send options not available.</_primary>
- <_secondary>Send options available only for Novell Groupwise and Microsoft Exchange accounts.</_secondary>
+ <_secondary>Send options available only for Novell GroupWise and Microsoft Exchange accounts.</_secondary>
</error>
</error-list>
Modified: branches/kill-bonobo/configure.in
==============================================================================
--- branches/kill-bonobo/configure.in (original)
+++ branches/kill-bonobo/configure.in Wed Oct 1 20:56:04 2008
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(evolution, 2.23.92, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.25.1, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
AC_CONFIG_SRCDIR(README)
# Some requirements have versioned package names
@@ -11,7 +11,7 @@
GTKHTML_PACKAGE=3.14
# Required Packages
-m4_define([glib_minimum_version], [2.16.0])
+m4_define([glib_minimum_version], [2.18.0])
m4_define([gtk_minimum_version], [2.12.0])
m4_define([eds_minimum_version], [2.23.91])
m4_define([gnome_icon_theme_minimum_version], [2.19.91])
@@ -60,7 +60,7 @@
dnl
dnl This should always be the major/minor of the stable version or stable version to be
dnl *************************************************************************************************
-BASE_VERSION=2.24
+BASE_VERSION=2.26
AC_SUBST(BASE_VERSION)
AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
@@ -2019,10 +2019,12 @@
mail/Makefile
mail/default/Makefile
mail/default/C/Makefile
+mail/default/cs/Makefile
mail/default/de/Makefile
mail/default/es/Makefile
mail/default/fi/Makefile
mail/default/fr/Makefile
+mail/default/it/Makefile
mail/default/lt/Makefile
mail/default/mk/Makefile
mail/default/zh_CN/Makefile
@@ -2031,7 +2033,10 @@
mail/default/nl/Makefile
mail/default/pl/Makefile
mail/default/pt/Makefile
+mail/default/sr/Makefile
+mail/default/sr latin/Makefile
mail/default/sv/Makefile
+mail/default/hu/Makefile
mail/importers/Makefile
plugins/Makefile
plugins/mark-all-read/Makefile
Modified: branches/kill-bonobo/e-util/e-dialog-utils.c
==============================================================================
--- branches/kill-bonobo/e-util/e-dialog-utils.c (original)
+++ branches/kill-bonobo/e-util/e-dialog-utils.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dialog-utils.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
* Authors:
- * Michael Meeks <michael ximian com>
- * Ettore Perazzoli <ettore ximian com>
+ * Michael Meeks <michael ximian com>
+ * Ettore Perazzoli <ettore ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/e-util/e-error.c
==============================================================================
--- branches/kill-bonobo/e-util/e-error.c (original)
+++ branches/kill-bonobo/e-util/e-error.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/e-util/e-event.c
==============================================================================
--- branches/kill-bonobo/e-util/e-event.c (original)
+++ branches/kill-bonobo/e-util/e-event.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/e-util/e-icon-factory.c
==============================================================================
--- branches/kill-bonobo/e-util/e-icon-factory.c (original)
+++ branches/kill-bonobo/e-util/e-icon-factory.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/e-util/e-logger.c
==============================================================================
--- branches/kill-bonobo/e-util/e-logger.c (original)
+++ branches/kill-bonobo/e-util/e-logger.c Wed Oct 1 20:56:04 2008
@@ -60,7 +60,8 @@
static gboolean
logger_flush (ELogger *logger)
{
- fflush (logger->priv->fp);
+ if (logger->priv->fp)
+ fflush (logger->priv->fp);
logger->priv->timer = 0;
return FALSE;
@@ -91,6 +92,9 @@
logger->priv->fp = g_fopen (logger->priv->logfile, "w");
logger->priv->timer = 0;
+ if (!logger->priv->fp)
+ g_warning ("%s: Failed to open log file '%s' for writing.", G_STRFUNC, logger->priv->logfile ? logger->priv->logfile : "[null]");
+
g_free (temp);
}
@@ -136,7 +140,8 @@
if (logger->priv->timer)
g_source_remove (logger->priv->timer);
logger_flush (logger);
- fclose (logger->priv->fp);
+ if (logger->priv->fp)
+ fclose (logger->priv->fp);
g_free (logger->priv->name);
g_free (logger->priv->logfile);
@@ -230,6 +235,9 @@
g_return_if_fail (primary != NULL);
g_return_if_fail (secondary != NULL);
+ if (!logger->priv->fp)
+ return;
+
fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, primary);
fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, secondary);
logger_set_dirty (logger);
@@ -247,11 +255,12 @@
g_return_if_fail (func != NULL);
/* Flush everything before we get the logs */
- fflush (logger->priv->fp);
+ if (logger->priv->fp)
+ fflush (logger->priv->fp);
fp = g_fopen (logger->priv->logfile, "r");
if (!fp) {
- fprintf (stderr, "Cannot open log file '%s' for reading! No flush yet?\n", logger->priv->logfile ? logger->priv->logfile : "[null]");
+ g_warning ("%s: Cannot open log file '%s' for reading! No flush yet?\n", G_STRFUNC, logger->priv->logfile ? logger->priv->logfile : "[null]");
return;
}
Modified: branches/kill-bonobo/e-util/e-plugin.c
==============================================================================
--- branches/kill-bonobo/e-util/e-plugin.c (original)
+++ branches/kill-bonobo/e-util/e-plugin.c Wed Oct 1 20:56:04 2008
@@ -1,19 +1,19 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
#include <config.h>
Modified: branches/kill-bonobo/e-util/e-sorter-array.c
==============================================================================
--- branches/kill-bonobo/e-util/e-sorter-array.c (original)
+++ branches/kill-bonobo/e-util/e-sorter-array.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-sorter-array.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/e-util/e-util.c
==============================================================================
--- branches/kill-bonobo/e-util/e-util.c (original)
+++ branches/kill-bonobo/e-util/e-util.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-util.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
@@ -1229,37 +1228,51 @@
/**
* e_util_guess_mime_type:
* @filename: it's a local file name, or URI.
+ * @localfile: set to TRUE if can check the local file content, FALSE to check only based on the filename itself.
* Returns: NULL or newly allocated string with a mime_type of the given file. Free with g_free.
*
- * Guesses mime_type for the given file_name.
+ * Guesses mime_type for the given filename.
**/
char *
-e_util_guess_mime_type (const char *filename)
+e_util_guess_mime_type (const char *filename, gboolean localfile)
{
- GFile *file;
- GFileInfo *fi;
- char *mime_type;
+ char *mime_type = NULL;
g_return_val_if_fail (filename != NULL, NULL);
- if (strstr (filename, "://"))
- file = g_file_new_for_uri (filename);
- else
- file = g_file_new_for_path (filename);
+ if (localfile) {
+ GFile *file;
- if (!file)
- return NULL;
+ if (strstr (filename, "://"))
+ file = g_file_new_for_uri (filename);
+ else
+ file = g_file_new_for_path (filename);
- fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
- if (!fi) {
- g_object_unref (file);
- return NULL;
- }
+ if (file) {
+ GFileInfo *fi;
+
+ fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
+ if (fi) {
+ mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
+
+ g_object_unref (fi);
+ }
- mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
+ g_object_unref (file);
+ }
+ }
- g_object_unref (fi);
- g_object_unref (file);
+ if (!mime_type) {
+ /* file doesn't exists locally, thus guess based on the filename */
+ gboolean uncertain = FALSE;
+ gchar *content_type;
+
+ content_type = g_content_type_guess (filename, NULL, 0, &uncertain);
+ if (content_type) {
+ mime_type = g_content_type_get_mime_type (content_type);
+ g_free (content_type);
+ }
+ }
return mime_type;
}
Modified: branches/kill-bonobo/e-util/e-util.h
==============================================================================
--- branches/kill-bonobo/e-util/e-util.h (original)
+++ branches/kill-bonobo/e-util/e-util.h Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-util.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifndef _E_UTIL_H_
@@ -121,7 +120,7 @@
void e_file_lock_destroy (void);
gboolean e_file_lock_exists (void);
-gchar * e_util_guess_mime_type (const gchar *filename);
+gchar * e_util_guess_mime_type (const gchar *filename, gboolean localfile);
gchar * e_util_filename_to_uri (const gchar *filename);
gchar * e_util_uri_to_filename (const gchar *uri);
Modified: branches/kill-bonobo/e-util/e-xml-utils.c
==============================================================================
--- branches/kill-bonobo/e-util/e-xml-utils.c (original)
+++ branches/kill-bonobo/e-util/e-xml-utils.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-xml-utils.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/filter/filter-datespec.c
==============================================================================
--- branches/kill-bonobo/filter/filter-datespec.c (original)
+++ branches/kill-bonobo/filter/filter-datespec.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Not Zed <notzed lostzed mmc com au>
- * Jeffrey Stedfast <fejj ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Not Zed <notzed lostzed mmc com au>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/filter/filter-element.c
==============================================================================
--- branches/kill-bonobo/filter/filter-element.c (original)
+++ branches/kill-bonobo/filter/filter-element.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Not Zed <notzed lostzed mmc com au>
- * Jeffrey Stedfast <fejj ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Not Zed <notzed lostzed mmc com au>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/kill-bonobo/filter/filter-int.c
==============================================================================
--- branches/kill-bonobo/filter/filter-int.c (original)
+++ branches/kill-bonobo/filter/filter-int.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/kill-bonobo/filter/filter-int.h
==============================================================================
--- branches/kill-bonobo/filter/filter-int.h (original)
+++ branches/kill-bonobo/filter/filter-int.h Wed Oct 1 20:56:04 2008
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
-
#ifndef _FILTER_INT_H
#define _FILTER_INT_H
Modified: branches/kill-bonobo/filter/filter-option.c
==============================================================================
--- branches/kill-bonobo/filter/filter-option.c (original)
+++ branches/kill-bonobo/filter/filter-option.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Not Zed <notzed lostzed mmc com au>
- * Jeffrey Stedfast <fejj ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Not Zed <notzed lostzed mmc com au>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/kill-bonobo/filter/filter-part.c
==============================================================================
--- branches/kill-bonobo/filter/filter-part.c (original)
+++ branches/kill-bonobo/filter/filter-part.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Not Zed <notzed lostzed mmc com au>
- * Jeffrey Stedfast <fejj ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Not Zed <notzed lostzed mmc com au>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/kill-bonobo/filter/filter-rule.c
==============================================================================
--- branches/kill-bonobo/filter/filter-rule.c (original)
+++ branches/kill-bonobo/filter/filter-rule.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Not Zed <notzed lostzed mmc com au>
- * Jeffrey Stedfast <fejj ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Not Zed <notzed lostzed mmc com au>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/filter/rule-editor.c
==============================================================================
--- branches/kill-bonobo/filter/rule-editor.c (original)
+++ branches/kill-bonobo/filter/rule-editor.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Not Zed <notzed lostzed mmc com au>
- * Jeffrey Stedfast <fejj ximian com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Not Zed <notzed lostzed mmc com au>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/kill-bonobo/help/C/evolution.xml
==============================================================================
--- branches/kill-bonobo/help/C/evolution.xml (original)
+++ branches/kill-bonobo/help/C/evolution.xml Wed Oct 1 20:56:04 2008
@@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
<!ENTITY appname "Evolution" >
- <!ENTITY appversion "2.22" >
+ <!ENTITY appversion "2.24" >
<!ENTITY z-3rdParty "*" >
<!ENTITY z-SM "(SM)" >
<!ENTITY z-CM "(CM)" >
@@ -1114,6 +1114,9 @@
<para><link linkend="usage-mail-getnsend-send">Composing New Email Messages</link></para>
</listitem>
<listitem>
+ <para><link linkend="b1dlaazl">Templates</link></para>
+ </listitem>
+ <listitem>
<para><link linkend="rsvp-stuff">Sending Invitations by Mail</link></para>
</listitem>
<listitem>
@@ -1173,9 +1176,70 @@
<section id="b17qh4uo">
<title>New Mail Notification</title>
- <para>Evolution notifies you of new email. When you receive a new mail in your inbox, a blinking icon appears on the Switcher.</para>
+ <para>Evolution can notify you of new messages. When you receive a new message in your inbox, a blinking icon appears on the Switcher.</para>
+ <para>You can also view a blinking icon<inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> in the notification area that disappears when you open the new message. Mouse over the icon to view the notification message.</para>
<mediaobject id="b1a5asi6"><imageobject><imagedata format="PNG" fileref="figures/evo_newmail.png"/></imageobject></mediaobject>
- <para>You can also see a blinking icon <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> in the notification area that disappears when you open the new email. You can keep the mouse over the <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> icon to view the notification message.</para>
+ <para>To enable this feature, select Edit > Plugins, then select the Mail Notification check box. You can configure the plugin by specifing the following in the Plugin Manager.</para>
+ <mediaobject id="b1dl90p1"><imageobject><imagedata format="PNG" fileref="figures/evo_mailnotification.png"/></imageobject></mediaobject>
+ <formalpara id="b1dl8zqx">
+ <title>Notify new messages for Inbox only:</title>
+ <para>Select this option to restrict the mail notification to Inbox. With this option enabled, you are notified of each new message arrival in the Inbox.</para>
+ </formalpara>
+ <formalpara id="b1dl93cp">
+ <title>Generate D-Bus message:</title>
+ <para>D-Bus is a fast, lightweight message bus system that allows applications to communicate with each other. Select this option to generate a D-Bus message on the session bus whenever a new message arrives.</para>
+ </formalpara>
+ <formalpara id="b1dl94v1">
+ <title>Show icon in the notification area:</title>
+ <para>Select this option to display a new mail icon in the notification area when a new message arrives. You have two options to select from:</para>
+ </formalpara>
+ <itemizedlist>
+ <listitem>
+ <formalpara id="b1dl95ux">
+ <title>Blinking icon in the notification area:</title>
+ <para>Select this option to make the new mail icon blink in the notification area on arrival of a new message.</para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara id="b1dl998a">
+ <title>Popup message together with the icon:</title>
+ <para>Select this option to make the new message pop up along with the new mail icon.</para>
+ </formalpara>
+ </listitem>
+ </itemizedlist>
+ <formalpara id="b1dl986k">
+ <title>Play sound when new messages arrive:</title>
+ <para>You have two options to select from:</para>
+ </formalpara>
+ <itemizedlist>
+ <listitem>
+ <formalpara id="b1dl9b9h">
+ <title>Beep:</title>
+ <para>Select this option to play a beep sound on the arrival of a new message.</para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara id="b1dl9bbt">
+ <title>Play sound file:</title>
+ <para>Select this option to play a sound file of your choice on the arrival of a new message.</para>
+ </formalpara>
+ </listitem>
+ </itemizedlist>
+ <para>To specify the sound file you want to play: </para>
+ <orderedlist>
+ <listitem id="b1dl9dx3">
+ <para>Click None to open the Select Sound File browser window.</para>
+ </listitem>
+ <listitem id="b1dl9p3d">
+ <para>Browse to find the sound file of your choice.</para>
+ </listitem>
+ <listitem id="b1dl9qm3">
+ <para>Click Open to select the sound file.</para>
+ </listitem>
+ <listitem id="b1dl9qrp">
+ <para>Click Play to confirm the selection.</para>
+ </listitem>
+ </orderedlist>
</section>
<section id="b131ni8g">
@@ -1434,6 +1498,30 @@
</section>
</section>
+ <section id="b1a5azam">
+ <title>Custom Header</title>
+ <para>To enable the Custom Header plugin:</para>
+ <para>Select Edit > Plugins.</para>
+ <para>Then select Custom Header. You can configure custom headers to set sensitivity and caveats to the outgoing messages.</para>
+ <mediaobject id="b1dl7ytg"><imageobject><imagedata format="PNG" fileref="figures/evo_customheader.png"/></imageobject></mediaobject>
+ <para>In the Plugin Manager, select the Configuration tab to customize your header fields. You can add, edit, or remove the header fields. For every header field you add, you can specify the keys and values. The key is used as the title of the Custom Header. You can enter multiple values for the keys. You must use a semicolon to separate every value you enter.</para>
+ <orderedlist>
+ <listitem id="b1a5c4iy">
+ <para>Select New > Mail Message or Shift+Ctrl+M to open a Compose Message window.</para>
+ </listitem>
+ <listitem id="b1a5c6rw">
+ <para>Select Insert > Custom Header to open the Email Custom Header window.</para>
+ <mediaobject id="b1a5c7i8"><imageobject><imagedata format="PNG" fileref="figures/evo_custom_header.png"/></imageobject></mediaobject>
+ <para>In the Email Custom Header window, you can view all the header fields and values you add.</para>
+ </listitem>
+ <listitem id="b1a5c7re">
+ <para>Set the values for the header fields by using the respective drop-down list.</para>
+ </listitem>
+ <listitem id="b1a5c8q9">
+ <para>Click OK.</para>
+ </listitem>
+ </orderedlist>
+ </section>
<section id="usage-mail-getnsend-send-delay">
<title>Sending Composed Messages Later</title>
<para>Evolution normally sends mail as soon as you click Send. However, can save a message to be sent later:</para>
@@ -1972,6 +2060,107 @@
</section>
</section>
+ <section id="b1dlaazl">
+ <title>Templates</title>
+ <para>A message template is a standard message that you can use at any time to send mail with the same pattern. Evolution allows you to create and edit message templates.</para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="b1dlbad4">Creating a Message Template from an Existing Message</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="b1dlbckm">Saving a New Message as a Template</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="b1dlbec6">Using a Message Template as a Reply</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="b1dlbgwb">Configuring Message Templates</link></para>
+ </listitem>
+ </itemizedlist>
+ <para>To enable the Message Template Plugin:</para>
+ <orderedlist>
+ <listitem id="b1dlb9w8">
+ <para>Select Edit > Plugins, then select Templates.</para>
+ </listitem>
+ </orderedlist>
+
+ <section id="b1dlbad4">
+ <title>Creating a Message Template from an Existing Message</title>
+ <orderedlist>
+ <listitem id="b1dlbakg">
+ <para>Select the message.</para>
+ </listitem>
+ <listitem id="b1dlbbvc">
+ <para>Right-click > Move to folder / Copy to folder.</para>
+ </listitem>
+ <listitem id="b1dlbc28">
+ <para>Select the Template local folder.</para>
+ </listitem>
+ </orderedlist>
+ <para>You can also edit an existing message and save it as a template.</para>
+ <orderedlist>
+ <listitem id="b1dlbczb">
+ <para>Open the message and click Reply.</para>
+ </listitem>
+ <listitem id="b1dlbd4s">
+ <para>Edit the message body or the addresses according to your requirements.</para>
+ </listitem>
+ <listitem id="b1dlbdbq">
+ <para>Select File > Save as Template.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+
+ <section id="b1dlbckm">
+ <title>Saving a New Message as a Template</title>
+ <orderedlist>
+ <listitem id="b1dlbe1w">
+ <para>Click New and enter the information in the New Message window, according to your requirements.</para>
+ </listitem>
+ <listitem id="b1dlbe2y">
+ <para>Select File > Save as Template.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+
+ <section id="b1dlbec6">
+ <title>Using a Message Template as a Reply</title>
+ <orderedlist>
+ <listitem id="b1dlbf4b">
+ <para>Right-click the message you are replying to, then click Templates.</para>
+ <para>This option lists all the message templates in the Template folder.</para>
+ </listitem>
+ <listitem id="b1dlbf5a">
+ <para>Select Open the message template of your choice and make changes if required.</para>
+ </listitem>
+ <listitem id="b1dlbgaq">
+ <para>Click Send.</para>
+ <para>When you select a message template for replying, the subject of the reply is preserved.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+
+ <section id="b1dlbgwb">
+ <title>Configuring Message Templates</title>
+ <para>In the Plugin Manager, select the Configuration tab to customize your message templates. You can add, edit or remove the key-value pairs. You can specify any number of key-value pairs.</para>
+ <para>In any template, the occurrence of every $key is replaced by the value it has in the configuration. For example, if you set the key to Manager and the value to Harry, any occurrence of $Manager is replaced by Harry in the message.</para>
+ <para>Assume that you have 1000 message templates with your current manager's name has a reference in them. When the current manager is replaced by a new one, it's not easy for you to manually replace the manager's name in all the 1000 messages. If the messages have a $Manager key value, you can reset the value in the Configuration tab of this plugin.</para>
+ <para>By default, the entire environment variables are used as a key-value pair. An occurrence of $env_variable is replaced by the value it carries. For example, an occurrence of $PATH in your template is replaced by its value when the template is used.</para>
+ <para>The replacement process uses the following order of precedence:</para>
+ <itemizedlist>
+ <listitem>
+ <para>$key is replaced by the value set for it in the Configuration tab of the Templates plugin.</para>
+ </listitem>
+ <listitem>
+ <para>If the key is not found, it is then replaced with the value of its environment variable.</para>
+ </listitem>
+ <listitem>
+ <para>If key is neither a configuration option nor an environment variable, no changes are made.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ </section>
+
<section id="rsvp-stuff">
<title>Sending Invitations by Mail</title>
<para>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</para>
@@ -2390,7 +2579,7 @@
<para>To sort messages, perform the following procedure:</para>
<orderedlist>
<listitem id="b131itxb">
- <para>Right click message header bar.</para>
+ <para>Right-click message header bar.</para>
</listitem>
<listitem id="b131iu51">
<para>Click Sort by to get a list of options.</para>
@@ -3252,8 +3441,65 @@
</orderedlist>
</section>
</section>
+
+ <section id="b1dl9th7">
+ <title>Google Contacts</title>
+ <para>Evolution allows you to access your Google Address Book. You can view the Google contacts offline and create, modify and delete the contacts online.</para>
+ <para>To configure your Google Address Book in Evolution contacts:</para>
+ <orderedlist>
+ <listitem id="b1dl9x1r">
+ <para>Select File > New > Address book to open the New Address Book window.</para>
+ <mediaobject id="b1dl9yef"><imageobject><imagedata format="PNG" fileref="figures/evo_googlecontacts.png"/></imageobject></mediaobject>
+
+ </listitem>
+ <listitem id="b1dl9x69">
+ <para>Select Google from the Type drop-down list.</para>
+ </listitem>
+ <listitem id="b1dl9z6j">
+ <para>Specify a name for the address book.</para>
+ </listitem>
+ <listitem id="b1dl9zh8">
+ <para>Select or deselect the following options and provide the username for the Google account:</para>
+ <itemizedlist>
+ <listitem>
+ <formalpara id="b1dla0di">
+ <title>Mark as default address book:</title>
+ <para>Select this option to make the Google address book as your default address book.</para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara id="b1dla0sn">
+ <title>Copy book content locally for offline operations:</title>
+ <para>Select this option to copy the address book to your machine so you can access the contacts even when you are not connected to the network.</para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara id="b1dla28w">
+ <title>Username:</title>
+ <para>Specify the username of your Google account.</para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara id="b1dla46h">
+ <title>Use SSL:</title>
+ <para> Select Use SSL to enable a secure connection between Evolution and the server</para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara id="b1dla666">
+ <title>Refresh:</title>
+ <para>Set the time to automatically refresh the Google address book.</para>
+ </formalpara>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem id="b1dla994">
+ <para>Click OK.</para>
+ </listitem>
+ </orderedlist>
+ </section>
</section>
-
+
<section id="contact-search">
<title>Searching for Contacts</title>
<formalpara id="b131mz65">
@@ -3662,7 +3908,7 @@
<para>Select the calendar from the side bar at the left.</para>
</listitem>
<listitem id="b13xyc0b">
- <para>Right click on the calendar.</para>
+ <para>Right-click on the calendar.</para>
</listitem>
<listitem id="b13xyc3r">
<para>Select Properties to open Calendar Properties dialog box.</para>
@@ -3688,7 +3934,7 @@
</orderedlist>
<para>To mark your calendar content for offline use, click Copy calendar contents locally for offline operations.</para>
<para>Or</para>
- <para>Right click on the calendar at the left and select Mark Calendar for offline use. For more information on working offline refer <link linkend="usage-mail-getnsend-offline">Working Offline</link>.</para>
+ <para>Right-click on the calendar at the left and select Mark Calendar for offline use. For more information on working offline refer <link linkend="usage-mail-getnsend-offline">Working Offline</link>.</para>
<tip>
<para>To export or share or to store a calendar locally in iCal format, right click on the calendar in the calendar view at the left and select Save to Disk.</para>
</tip>
@@ -3729,7 +3975,7 @@
<para>Set the time to automatically refresh the calendar.</para>
</listitem>
<listitem id="b1a4ak4r">
- <para>Select Use SSL to enable SSL for communication between Evolution and the Google server.</para>
+ <para>Select Use SSL to enable a secure connection between Evolution and the Google server.</para>
</listitem>
<listitem id="b1a4amec">
<para>If you want to set a color label for the calendar, click the Color tab, select the desired color, then click OK.</para>
@@ -5637,7 +5883,7 @@
<listitem id="buw5x0p">
<para>Type the name of your mail server, your user name, and select whether to use SSL.</para>
<note>
- <para>Select SSL for a highly secured connection between your client and server. Contact your administrator for further details.</para>
+ <para>Select Use SSL to enable a secure connection between Evolution and the server.</para>
</note>
</listitem>
<listitem id="bsthkyr">
@@ -6314,13 +6560,6 @@
<para>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</para>
</formalpara>
<para>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the "Basic Headers Only" option.</para>
- <formalpara id="b15g0l0t">
- <title>Custom Headers:</title>
- <para>These are the extra headers in addition to the above standard headers. You can add custom headers in addition to the standard headers. If you want to have filters based on some specific custom headers and you do not want to compromise on the network speed by downloading-all-mail-headers, Evolution provides a handy way of achieving this by the Custom Headers Option. Here, you can selectively Add/Remove headers based on your needs.</para>
- </formalpara>
- <note>
- <para>This option may not be needed if you have chosen to download ALL Headers.</para>
- </note>
<para>To set the IMAP Mail headers:</para>
<orderedlist>
<listitem id="b15fy0yh">
@@ -6475,7 +6714,7 @@
<para>To enable Junk plugins:</para>
<orderedlist>
<listitem id="b17rdxkm">
- <para>Select Edit > Plugins </para>
+ <para>Select Edit > Plugins.</para>
</listitem>
<listitem id="b17rdxz8">
<para>Select the junk plugins you want. You can select either Bogofilter or SpamAssassin, or you can select both.</para>
@@ -6685,6 +6924,130 @@
</section>
</section>
+ <section id="b15m55rz">
+ <title>Network Preferences</title>
+ <para>This interface lets you configure your network proxy settings.</para>
+ <mediaobject id="b15m5vi1"><imageobject><imagedata format="PNG" fileref="figures/network_pref.png"/></imageobject></mediaobject>
+ <para>Use the following four options to configure the proxy settings:</para>
+ <formalpara id="b15m5zr2">
+ <title>Use system defaults:</title>
+ <para>Select this option to use the system wide proxy settings configured through Control Center > Network Proxies in GNOME. When this option is selected, Evolution uses the proxy settings in the /system/http_proxy and /system/proxy/gconf keys.</para>
+ </formalpara>
+ <important>
+ <para>If these keys do not reflect the settings configured through Control Center > Network Proxies, Evolution does not work with the proxy and you must either update these gconf keys or choose Manual proxy configuration.</para>
+ </important>
+ <formalpara id="b15m65gt">
+ <title>Direct connection to the Internet:</title>
+ <para> Select this option to connect directly to the internet.</para>
+ </formalpara>
+ <formalpara id="b15m65i4">
+ <title>Manual proxy configuration:</title>
+ <para>This option helps you costomize proxy settings regardless of the desktop you use. Specify hosts and ports for HTTP and optionally for other protocols. In the No Proxy Domain field, specify that comma-separated domain names do not go through the configured proxy server. You can specify patterns like *.example.com or .example.com in the No Proxy Domain list. Specify a username and password, and if the proxy server requires authentication, select Use Authentication to enable the username and password fields. The customized proxy settings are as follows:</para>
+ </formalpara>
+ <informaltable>
+ <tgroup cols="2">
+ <colspec colwidth="2.688*" colname="1" colnum="1"/>
+ <colspec colwidth="2.688*" colname="2" colnum="2"/>
+ <thead valign="top">
+ <row id="b15ot8mi">
+ <entry colname="1">
+ <para>Proxy Configuration Settings</para>
+ </entry>
+ <entry colname="2">
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody valign="top">
+ <row id="b15ot8mj">
+ <entry colname="1">
+ <para>HTTP Proxy</para>
+ </entry>
+ <entry colname="2">
+ <para>The machine name to proxy HTTP through.</para>
+ </entry>
+ </row>
+ <row id="b15ot8mk">
+ <entry colname="1">
+ <para>Port</para>
+ </entry>
+ <entry colname="2">
+ <para>The port for the machine defined by the HTTP Proxy field that you proxy through.</para>
+ </entry>
+ </row>
+ <row id="b15ot9cv">
+ <entry colname="1">
+ <para>Secure HTTP Proxy</para>
+ </entry>
+ <entry colname="2">
+ <para>The machine name to proxy secure HTTP through.</para>
+ </entry>
+ </row>
+ <row id="b15ot9e8">
+ <entry colname="1">
+ <para>Port</para>
+ </entry>
+ <entry colname="2">
+ <para>The port for the machine defined by the Secure HTTP Proxy port field.</para>
+ </entry>
+ </row>
+ <row id="b15ot9f9">
+ <entry colname="1">
+ <para>SOCKS Host</para>
+ </entry>
+ <entry colname="2">
+ <para>The machine name to proxy SOCKS through.</para>
+ </entry>
+ </row>
+ <row id="b15ot9g7">
+ <entry colname="1">
+ <para>Port</para>
+ </entry>
+ <entry colname="2">
+ <para>The port for the machine defined by the SOCKS host.</para>
+ </entry>
+ </row>
+ <row id="b15ot9h3">
+ <entry colname="1">
+ <para>No proxy domain</para>
+ </entry>
+ <entry colname="2">
+ <para>This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.example.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask similar to 192.168.0.0/24.</para>
+ </entry>
+ </row>
+ <row id="b15ot9hy">
+ <entry colname="1">
+ <para>Use authentication</para>
+ </entry>
+ <entry colname="2">
+ <para>If this option is enabled, it uses authentication to connect via the proxy server.</para>
+ </entry>
+ </row>
+ <row id="b15ot9j3">
+ <entry colname="1">
+ <para>Username</para>
+ </entry>
+ <entry colname="2">
+ <para>Username used to authenticate when performing an HTTP proxying.</para>
+ </entry>
+ </row>
+ <row id="b15ot9ln">
+ <entry colname="1">
+ <para>Password</para>
+ </entry>
+ <entry colname="2">
+ <para>Password used to authenticate when performing an HTTP proxying.</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ <formalpara id="b15m65j9">
+ <title>Automatic proxy configuration URL:</title>
+ <para>Specify the automatic proxy configuration URL for Evolution to use in the autoconfig script to configure the proxy.</para>
+ </formalpara>
+ </section>
+
<section id="bshoty0">
<title>Certificates</title>
<para>Evolution allows you to add certificates for yourself as well as for contacts. This allows you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</para>
@@ -7000,7 +7363,7 @@
</formalpara>
<formalpara id="b17sa9q1">
<title>Creating a New Email Message:</title>
- <para>Click File > New > Mail Message or Shift+Ctrl+M.</para>
+ <para>Select File > New > Mail Message or Shift+Ctrl+M.</para>
</formalpara>
<formalpara id="b17saa12">
<title>Creating a New Appointment:</title>
Modified: branches/kill-bonobo/help/C/figures/mailer_preferences.png
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/Makefile.am
==============================================================================
--- branches/kill-bonobo/help/Makefile.am (original)
+++ branches/kill-bonobo/help/Makefile.am Wed Oct 1 20:56:04 2008
@@ -121,7 +121,7 @@
figures/quick_reference.png \
figures/replymsg.png \
figures/schedule.png \
- figures/Screenshot-Evolution -mailer-Preferences.png \
+ figures/Screenshot-Evolution-mailer-Preferences.png \
figures/Screenshot-Free-Busy.png \
figures/stock_search.png \
figures/sub-others-folder.png \
Modified: branches/kill-bonobo/iconv-detect.c
==============================================================================
--- branches/kill-bonobo/iconv-detect.c (original)
+++ branches/kill-bonobo/iconv-detect.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/default/Makefile.am
==============================================================================
--- branches/kill-bonobo/mail/default/Makefile.am (original)
+++ branches/kill-bonobo/mail/default/Makefile.am Wed Oct 1 20:56:04 2008
@@ -1,4 +1,4 @@
-SUBDIRS=C zh_CN de es fi fr ja ko lt mk nl pl pt sv
+SUBDIRS=C cs zh_CN de es fi fr hu it ja ko lt mk nl pl pt sr sr latin sv
Modified: branches/kill-bonobo/mail/default/de/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/de/Inbox (original)
+++ branches/kill-bonobo/mail/default/de/Inbox Wed Oct 1 20:56:04 2008
@@ -50,20 +50,6 @@
Sie die F1-Taste.
-Neue Funktionen
-
- Evolution 2.8 bietet
-
- * Eine neue Suchfunktion und eine globale Suche in der Mail-Komponente
- * Einen Breitbild-Modus mit vertikaler Vorschau in der Mail-Komponente
- * Verbesserte Darstellung (durch Integration von ÂCairoÂ)
- * Verbesserte Leistung und reduzierten Speicherverbrauch
- * UnterstÃtzung fÃr GroupWise-Erinnerungsnotizen und ZurÃckziehen von
- E-Mails
- * Gemeinsame Notizen (im Dateisystem)
- * Integration des GNOME-SchlÃsselbunds
- * Viele behobene Fehler und weitere Verbesserungen
-
Fehlerberichte
Falls Sie einen Fehler entdecken, erstellen Sie bitte einen
@@ -160,23 +146,6 @@
<br><br>
</blockquote>
-<h2>Neue Funktionen</h2>
-<blockquote>
- Evolution 2.8 bietet
- <ul>
- <li>Eine neue Suchfunktion und eine globale Suche in der Mail-Komponente</li>
- <li>Einen Breitbild-Modus mit vertikaler Vorschau in der Mail-Komponente</li>
- <li>Verbesserte Darstellung (durch Integration von ÂCairoÂ)</li>
- <li>Verbesserte Leistung und reduzierten Speicherverbrauch</li>
- <li>UnterstÃtzung fÃr GroupWise-Erinnerungsnotizen und ZurÃckziehen von
- E-Mails</li>
- <li>Gemeinsame Notizen (im Dateisystem)</li>
- <li>Integration des GNOME-SchlÃsselbunds</li>
- <li>Viele behobene Fehler und weitere Verbesserungen</li>
- </ul>
-<br>
-</blockquote>
-
<h2>Fehlerberichte</h2>
<blockquote>
Falls Sie einen Fehler entdecken, erstellen Sie bitte einen
Modified: branches/kill-bonobo/mail/default/es/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/es/Inbox (original)
+++ branches/kill-bonobo/mail/default/es/Inbox Wed Oct 1 20:56:04 2008
@@ -1,19 +1,19 @@
From evolution novell com Wed Sep 06 07:45:12 2006
Return-Path: <evolution novell com>
Received: from pop.novell.com (IDENT:mail localhost [127.0.0.1]) by
- pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 06 Sep 2006
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Mon, 21 Sep 2008
07:45:12 -0400
Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
- <evolution novell com>; Wed, 06 Sep 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 06 Sep 2006 12:00:00 -0000
+ <evolution novell com>; Wed, 21 Sep 2008 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 21 Sep 2008 12:00:00 -0000
Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
- pop.novell.com with SMTP; 06 Sep 2006 12:00:00 -0000
+ pop.novell.com with SMTP; 21 Sep 2008 12:00:00 -0000
From: "El equipo de Evolution" <evolution novell com>
To: Usuarios de Evolution <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.8.0
-Date: 06 September 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 21 Septiembre 2008 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
Subject: Bienvenido a Evolution
@@ -41,47 +41,29 @@
IntroducciÃn
- A la izquierda de la ventana de evolution està la barra lateral,
+ A la izquierda de la ventana de Evolution està la barra lateral,
con accesos a todas sus carpetas de correo. Debajo de Ãsta,
encontrarà botones para sus calendarios, contactos, tareas,
correo y notas.
- Para una guÃa completa de uso de Evolution, seleccione Contenido
- en el menà Ayuda, o pulse la tecla F1.
-
-CaracterÃsticas nuevas
-
- Evolution 2.8 tiene
- * Un interfaz de bÃsqueda nuevo y una bÃsqueda global en
- el interfaz del correo
- * Un modo de pantalla panorÃmica, y vista previa vertical
- en el interfaz del correo
- * Apariencia mejorada con integraciÃn de ÂCairoÂ
- * Rendimiento mÃs rÃpido, montones de optimizaciones de
- memoria y reducciÃn del uso de memoria
- * Suporte para Recordatorios de notas GroupWise y Mail
- Retract
- * Notas compatibles en el Diario (sistema de ficheros)
- * Soporte para el gestor de depÃsitos de claves de GNOME
- * Montones de errores corregidos y otras mejoras
-
+ Para una guÃa completa de uso de Evolution, seleccione ÂÃndiceÂ
+ en el menà ÂAyudaÂ, o pulse la tecla F1.
InformaciÃn de errores
- Los errores se deben notificar en el Bugzilla de GNOME
- http://bugzilla.gnome.org.
+ Los errores se deben notificar en http://bugzilla.gnome.org.
MÃs informaciÃn
Puede suscribirse a la lista de correo de usuarios de Evolution
- en http://lists.gnome.org/mailman/listinfo/evolution. La
- informaciÃn acerca del proyecto Evolution està disponible en
- http://www.go-evolution.org.
+ en http://lists.gnome.org/mailman/listinfo/evolution.
+
+ La informaciÃn acerca del proyecto Evolution està disponible en
+ http://www.gnome.org/projects/evolution.
Con afecto,
El equipo de Evolution
-evolution novell com
--=-2gZ1roA/HoYrlRDVGyiM
@@ -126,51 +108,20 @@
<blockquote>
- A la izquierda de la ventana de Evolution está la barra
+ A la izquierda de la ventana de Evolution está la barra
lateral, con accesos a todas sus carpetas de correo. Debajo de
ésta, encontrará botones para sus calendarios, contactos,
tareas, correo y notas.
<br><br>
- Para una guía completa de uso de Evolution, seleccione
-<B>Contenido</B> en el menú <B>Ayuda</B>, o pulse la tecla
-<B>F1</B>.
+ Para una guía completa de uso de Evolution, seleccione
+ <B>Índice</B> en el menú <B>Ayuda</B>, o pulse la tecla
+ <B>F1</B>.
<br><br>
</blockquote>
<h2>
-Características nuevas
-</h2>
-
-<blockquote>
- Evolution 2.8 tiene
- <ul>
- <li>
- Un interfaz de búsqueda nuevo y una búsqueda global en
- el interfaz del correo
- </li><li>
- Un modo de pantalla panorámica, y vista previa vertical en
- el interfaz del correo
- </li><li>
- Apariencia mejorada con integración de «Cairo»
- </li><li>
- Rendimiento más rápido, montones de optimizaciones de
- memoria y reducción del uso de memoria
- </li><li>
- Soporte para Recordatorios de notas GroupWise y Mail Retract
- </li><li>
- Notas compatibles en el Diario (sistema de ficheros)
- </li><li>
- Soporte para el gestor de depósitos de claves de GNOME
- </li><li>
- Montones de errores corregidos y otras mejoras
- </li>
- </ul>
-<br>
-</blockquote>
-
-<h2>
Información de errores
</h2>
<blockquote>
@@ -183,12 +134,11 @@
</h2>
<blockquote>
- Puede suscribirse a la lista de correo de usuarios de Evolution
-en
+ Puede suscribirse a la lista de correo de usuarios de Evolution en
<a href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
La información acerca del proyecto Evolution está
-disponible en
+ disponible en
<a href="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</a>.
<!--
You can find a list of answers to Frequently Asked Questions (FAQ) at
@@ -200,7 +150,6 @@
Con afecto,
<br>
El equipo de Evolution
-<br><a href="mailto:evolution novell com">evolution novell com</a>
</BODY>
</HTML>
Modified: branches/kill-bonobo/mail/default/fi/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/fi/Inbox (original)
+++ branches/kill-bonobo/mail/default/fi/Inbox Wed Oct 1 20:56:04 2008
@@ -1,19 +1,19 @@
From evolution novell com Wed Sep 06 12:00:00 2006
Return-Path: <evolution novell com>
Received: from pop.novell.com (IDENT:mail localhost [127.0.0.1]) by
- pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 06 Sep 2006
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
07:45:12 -0400
Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
- <evolution novell com>; Wed, 06 Sep 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 06 Sep 2006 12:00:00 -0000
+ <evolution novell com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
- pop.novell.com with SMTP; 06 Sep 2006 12:00:00 -0000
+ pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
From: "Evolution-tiimi" <evolution novell com>
To: Evolutionin kÃyttÃjÃt <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.8.0
-Date: 15 March 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 14 March 2007 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
Subject: Tervetuloa Evolutioniin!
@@ -22,7 +22,7 @@
X-Mailman-Version: 1.1
Status:
X-Evolution-Source: pop://rupert pop novell com/inbox
-X-Evolution: 00000ddd-0030
+X-Evolution: 00000002-0000
--=-t4dRE6cqcdSBHOrMdTQ1
@@ -30,7 +30,7 @@
--=-2gZ1roA/HoYrlRDVGyiM
-Content-Type: text/plain; charset=utf-8
+Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Evolution-tiimi toivottaa sinut tervetulleeksi kÃyttÃmÃÃn Evolutionia.
@@ -39,7 +39,7 @@
Ohjeita uusille kÃyttÃjille
- Evolution-ikkunan vasemman reunan sivupalkissa on lista, josta
+ Evolution-ikkunan vasemman reunan sivupalkissa on luettelo, josta
lÃydÃt kaikki sÃhkÃpostikansiosi. TÃmÃn listan alla on ryhmÃ
painikkeita, joista voit vaihtaa nÃkymÃÃ sÃhkÃpostin, kalenterin,
yhteystietojen, tehtÃvien ja muistilappujen vÃlillÃ.
@@ -48,18 +48,6 @@
kohta "SisÃltÃ" valikosta tai painamalla F1-nÃppÃintÃ. Valitettavasti
tÃtà ohjetta ei vielà kuitenkaan ole suomennettu.
-Uusia ominaisuuksia
-
- Evolutionin version 2.8 uusia ominaisuuksia ovat muun muassa
-
- # Uusi kÃyttÃliittymà tekstin hakuun kaikista sÃhkÃposteista
- # LeveÃn nÃytÃn tila ja pystysuuntainen viestin esikatselu
- # Parannettu kÃyttÃtuntuma ja Cairo-tuki
- # Nopeampi suorituskyky ja pienempi muistinkÃytÃ
- # Tuki Groupwise-tilien muistilapuille ja viestien perumiselle
- # TiedostojÃrjestelmÃssà tuetua jaettuvat pÃivÃkirjan muistilaput
- # Paljon korjattuja vikoja ja muita parannuksia
-
Vikailmoitukset
Raportoi lÃytÃmÃsi viat osoitteessa http://bugzilla.gnome.org.
@@ -73,7 +61,7 @@
http://www.gnome.org/projects/evolution.
-Evolution-tiimi
+Evolution-tiimi,
evolution novell com
@@ -141,7 +129,7 @@
<h2> Ohjeita uusille kÃyttÃjille </h2>
<blockquote>
- Evolution-ikkunan vasemman reunan sivupalkissa on lista, josta
+ Evolution-ikkunan vasemman reunan sivupalkissa on luettelo, josta
lÃydÃt kaikki sÃhkÃpostikansiosi. TÃmÃn listan alla on ryhmÃ
painikkeita, joista voit vaihtaa nÃkymÃÃ sÃhkÃpostin, kalenterin,
yhteystietojen, tehtÃvien ja muistilappujen vÃlillÃ.
@@ -154,24 +142,6 @@
</blockquote>
-<h2> Uusia ominaisuuksia </h2>
-
-<blockquote>
-
- Evolutionin version 2.8 uusia ominaisuuksia ovat muun muassa
- <br /><br />
- <ul>
- <li> Uusi kÃyttÃliittymà tekstin hakuun kaikista sÃhkÃposteista </li>
- <li> LeveÃn nÃytÃn tila ja pystysuuntainen viestin esikatselu </li>
- <li> Parannettu kÃyttÃtuntuma ja Cairo-tuki </li>
- <li> Nopeampi suorituskyky ja pienempi muistinkÃytà </li>
- <li> Tuki Groupwise-tilien muistilapuille ja viestien perumiselle </li>
- <li> TiedostojÃrjestelmÃssà tuetua jaettuvat pÃivÃkirjan muistilaput </li>
- <li> Paljon korjattuja vikoja ja muita parannuksia </li>
- </ul>
-
-</blockquote>
-
<h2> Vikailmoitukset </h2>
<blockquote>
Modified: branches/kill-bonobo/mail/default/fr/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/fr/Inbox (original)
+++ branches/kill-bonobo/mail/default/fr/Inbox Wed Oct 1 20:56:04 2008
@@ -1,19 +1,19 @@
-From evolution novell com Wed Mar 15 07:45:12 2006
+From evolution novell com Tue Sep 16 07:45:12 2008
Return-Path: <evolution novell com>
Received: from pop.novell.com (IDENT:mail localhost [127.0.0.1]) by
- pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 15 Mar 2006
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Tue, 16 Sep 2008
07:45:12 -0400
Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
- <evolution novell com>; Wed, 15 Mar 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 15 Mar 2006 12:00:00 -0000
+ <evolution novell com>; Tue, 16 Sep 2008 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 16 Sep 2008 12:00:00 -0000
Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
- pop.novell.com with SMTP; 15 Mar 2006 12:00:00 -0000
+ pop.novell.com with SMTP; 16 Sep 2008 12:00:00 -0000
From: "L'Ãquipe d'Evolution" <evolution novell com>
To: Utilisateurs d'Evolution <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.6.0
-Date: 15 March 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 16 September 2008 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
Subject: Bienvenue dans Evolution !
@@ -22,6 +22,7 @@
X-Mailman-Version: 1.1
Status:
X-Evolution-Source: pop://rupert pop novell com/inbox
+X-Evolution: 00000002-0000
--=-t4dRE6cqcdSBHOrMdTQ1
@@ -29,67 +30,41 @@
--=-2gZ1roA/HoYrlRDVGyiM
-Content-Type: text/plain; charset=ISO-8859-15
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
-L'éipe
-d'Evolution est fiè de vous prénter Evolution, un systè complet pour gér votre correspondance numéque et vos donné personnelles.
+L'Ãquipe d'Evolution est fiÃre de vous prÃsenter Evolution, un systÃme
+complet pour gÃrer votre correspondance numÃrique et vos donnÃes personnelles.
Introduction
- La partie gauche de la fenêe d'Evolution affiche un panneau de
+ La partie gauche de la fenÃtre d'Evolution affiche un panneau de
navigation contenant les raccourcis vers vos dossiers de
- courriels. En dessous, vous trouverez les boutons donnant accè- àos calendriers, contacts, tâes, courriels et més.
+ courriels. En dessous, vous trouverez les boutons donnant accÃs
+ Ã vos calendriers, contacts, tÃches, courriels et mÃmos.
- Pour accér au guide complet sur l'utilisation d'Evolution,
- séctionnez Sommaire dans le menu Aide ou appuyez sur la touche
+ Pour accÃder au guide complet sur l'utilisation d'Evolution,
+ sÃlectionnez Sommaire dans le menu Aide ou appuyez sur la touche
F1.
-Nouvelles fonctionnalité-
- Evolution 2.6 contient :
- * un nouveau composant Mé ;
- * une nouvelle interface pour l'éteur d'Éèments,
- Tâes et Réions ;
- * la possibilitée publier des calendriers ;
- * la prise en charge de CalDAV ;
- * la prise en charge de l'outil Network Manager ;
- * la prise en charge de la connectivitéula ;
- * une améoration du support GroupWise ;
- * une améoration du support des énements rérrents ;
- * les astuces de calendrier ;
- * les importateurs CSV depuis les formats Mozilla, Outlook
- et Evolution ;
- * la prise en charge des listes de contacts dans les carnets
- d'adresses LDAP ;
- * la possibilitée sauvegarder les recherches avancé
- sur les carnets d'adresses ;
- * la possibilitée fixer la prioritées messages dans
- l'éteur ;
- * et de trènombreuses corrections de bogues et
- améorations de l'interface utilisateur.
-
Rapport de bogues
- Les bogues doivent êes signalésur http://bugzilla.gnome.org.
+ Les bogues doivent Ãtres signalÃs sur http://bugzilla.gnome.org.
-Informations suppléntaires
+Informations supplÃmentaires
- Vous pouvez vous inscrire àa liste de diffusion anglophone des
- utilisateurs d'Evolution à http://lists.gnome.org/mailman/listinfo/evolution. Des
- informations sur le projet Evolution sont disponibles à Vous pouvez vous inscrire à la liste de diffusion anglophone des
+ utilisateurs d'Evolution Ã
+ http://mail.gnome.org/mailman/listinfo/evolution-list. Des
+ informations sur le projet Evolution sont disponibles Ã
http://www.gnome.org/projects/evolution.
Cordialement,
-L'éipe d'Evolution
-evolution novell com
+L'Ãquipe d'Evolution
--=-2gZ1roA/HoYrlRDVGyiM
Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
@@ -99,62 +74,27 @@
</HEAD>
<BODY BGCOLOR="#f8fcf8">
<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TD ALIGN="left" VALIGN="top">
-<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
+<TR><TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
<TD ALIGN="right" VALIGN="top">
-<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
-</TD>
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
</TR>
-<TR>
-<TD>
-</TD>
-<TD>
-<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-<TD>
-<B><FONT SIZE="4"><FONT COLOR="#f8fcf8">L'équipe d'Evolution</FONT></FONT></B><FONT COLOR="#f8fcf8"><FONT SIZE="4"> est fière de vous présenter </FONT></FONT><FONT COLOR="#f8fcf8"><B><FONT SIZE="4">Evolution</FONT></B></FONT><FONT COLOR="#f8fcf8"><FONT SIZE="4">, un système complet pour gérer votre correspondance numérique et vos données personnelles.</FONT></FONT>
-</TD>
-<TD>
-</TD>
-<TD>
-<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-</TR>
-<TR>
-<TD ALIGN="left" VALIGN="bottom">
-<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
+<TR><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+<B>L'équipe d'Evolution</B> est fière de vous présenter <B>Evolution</B>, un système complet pour gérer votre correspondance numérique et vos données personnelles.
+</FONT></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
<TD ALIGN="right" VALIGN="bottom">
-<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0"></DIV>
-</TD>
-</TR>
-</TABLE>
+<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</DIV></TD></TR></TABLE>
+
<H2>Introduction</H2>
<BLOCKQUOTE>
@@ -163,27 +103,6 @@
Pour accéder au guide complet sur l'utilisation d'Evolution, sélectionnez <B>Sommaire</B> dans le menu <B>Aide</B> ou appuyez sur la touche <B>F1</B>.
</BLOCKQUOTE>
-<H2>Nouvelles fonctionnalités</H2>
-<BLOCKQUOTE>
- Evolution 2.6 contient :
- <UL>
- <LI>un nouveau composant Mémo ;
- <LI>une nouvelle interface pour l'éditeur d'Évènements, Tâches et Réunions ;
- <LI>la possibilité de publier des calendriers ;
- <LI>la prise en charge de CalDAV ;
- <LI>la prise en charge de l'outil Network Manager ;
- <LI>la prise en charge de la connectivité Hula ;
- <LI>une amélioration du support GroupWise ;
- <LI>une amélioration du support des évènements récurrents ;
- <LI>les astuces de calendrier ;
- <LI>les importateurs CSV depuis les formats Mozilla, Outlook et Evolution ;
- <LI>la prise en charge des listes de contacts dans les carnets d'adresses LDAP ;
- <LI>la possibilité de sauvegarder les recherches avancées sur les carnets d'adresses ;
- <LI>la possibilité de fixer la priorité des messages dans l'éditeur ;
- <LI>et de très nombreuses corrections de bogues et améliorations de l'interface utilisateur.
- </UL>
-</BLOCKQUOTE>
-
<H2>Rapport de bogues</H2>
<BLOCKQUOTE>
Les bogues doivent êtres signalés sur <A HREF="http://bugzilla.gnome.org";>http://bugzilla.gnome.org</A>.
@@ -191,13 +110,12 @@
<H2>Informations supplémentaires</H2>
<BLOCKQUOTE>
- Vous pouvez vous inscrire à la liste de diffusion anglophone des utilisateurs d'Evolution à <A HREF="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</A>. Des informations sur le projet Evolution sont disponibles à <A HREF="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</A>.
+ Vous pouvez vous inscrire à la liste de diffusion anglophone des utilisateurs d'Evolution à <A HREF="http://mail.gnome.org/mailman/listinfo/evolution-list";>http://mail.gnome.org/mailman/listinfo/evolution-list</A>. Des informations sur le projet Evolution sont disponibles à <A HREF="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</A>.
<BR><BR>
</BLOCKQUOTE>
Cordialement,<BR>
L'équipe d'Evolution<BR>
-<A HREF="mailto:evolution novell com">evolution novell com</A>
</BODY>
</HTML>
Modified: branches/kill-bonobo/mail/default/ko/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/ko/Inbox (original)
+++ branches/kill-bonobo/mail/default/ko/Inbox Wed Oct 1 20:56:04 2008
@@ -12,7 +12,7 @@
From: "The Evolution Team" <evolution novell com>
To: Evolution Users <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.10.0
+X-Mailer: Evolution 2.24.0
Date: 14 March 2007 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
@@ -48,14 +48,6 @@
ìëëì ììëì ëí ìëìë ëìëë, ëìë ëëì ìëë
ìííìêë, F1 íë ëëììì.
-ì êë
-
- ìëëì 2.10ìë ëìê êì ìíì ëëììëë.
- # gtk-print êë íí
- # IMAP íë êììê êë ììì ìì
- # ëë ìë, ëëë ëì íê, ëëë ììë êì
- # ìëêì ëê ìì ë ìëêì êë íì
-
ëê ëêíê
ëêë http://bugzilla.gnome.org ììíì ëêí ìììì.
@@ -69,7 +61,6 @@
íëìíì ëí ìëê ììëë.
ìëëì í ëë.
-evolution novell com
--=-2gZ1roA/HoYrlRDVGyiM
@@ -127,26 +118,6 @@
</blockquote>
<h2>
-ì êë
-</h2>
-
-<blockquote>
- ìëëì 2.10ìë ëìê êì ìíì ëëììëë.
- <ul>
- <li>
- gtk-print êë íí
- </li><li>
- IMAP íë êììê êë ììì ìì
- </li><li>
- ëë ìë, ëëë ëì íê, ëëë ììë êì
- </li><li>
- ìëêì ëê ìì ë ìëêì êë íì
- </li>
- </ul>
-<br>
-</blockquote>
-
-<h2>
ëê ëêíê
</h2>
<blockquote>
@@ -172,7 +143,6 @@
</blockquote>
ìëëì í ëë.
-<br><a href="mailto:evolution novell com">evolution novell com</a>
</BODY>
</HTML>
Modified: branches/kill-bonobo/mail/default/lt/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/lt/Inbox (original)
+++ branches/kill-bonobo/mail/default/lt/Inbox Wed Oct 1 20:56:04 2008
@@ -1,28 +1,28 @@
-From evolution novell com Wed Mar 15 12:00:00 2006
+From evolution novell com Wed Sep 06 07:45:12 2006
Return-Path: <evolution novell com>
Received: from pop.novell.com (IDENT:mail localhost [127.0.0.1]) by
- pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 15 Mar 2006
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
07:45:12 -0400
Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
- <evolution novell com>; Wed, 15 Mar 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 15 Mar 2006 12:00:00 -0000
+ <evolution novell com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
- pop.novell.com with SMTP; 15 Mar 2006 12:00:00 -0000
-From: "The Evolution Team" <evolution novell com>
-To: Evolution Users <evolution novell com>
+ pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
+From: "Evolution komanda" <evolution novell com>
+To: Evolution naudotojai <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.6.0
-Date: 15 March 2006 12:00:00 +0000
+X-Mailer: Evolution 2.10.0
+Date: 14 March 2007 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
-Subject: Welcome to Evolution!
+Subject: Sveiki, Evolution naudotojai!
Sender: evolution novell com
Errors-To: evolution novell com
X-Mailman-Version: 1.1
-Status:
+Status:
X-Evolution-Source: pop://rupert pop novell com/inbox
-X-Evolution: 00000ddd-0030
+X-Evolution: 00000002-0000
--=-t4dRE6cqcdSBHOrMdTQ1
@@ -34,14 +34,15 @@
Content-Transfer-Encoding: 7bit
-Evolution komanda didÅiuojasi galÄdami Jums pristatyti Evolution -
-universaliÄ bendravio ir asmeninÄs informacijos valdymui skirtÄ
+Evolution komanda dÅiaugiasi galÄdama Jums pristatyti Evolution â
+universaliÄ bendravimui ir asmeninÄs informacijos valdymui skirtÄ
programÄ.
+
Pirmieji Åingsniai
KairÄje Evolution lango pusÄje yra Åoninis skydelis, kuriame
- yra nuorodos Ä visus JÅsÅ paÅto aplankus. Po juo rasite JÅsÅ
+ yra nuorodos Ä visus paÅto aplankus. Po juo rasite
kalendoriÅ, kontaktÅ, uÅduoÄiÅ, paÅto bei raÅteliÅ mygtukus.
NorÄdami pamatyti pilnÄ Evolution ÅinynÄ, meniu âÅinynasâ
@@ -49,33 +50,23 @@
Naujos funkcijos
- Evolution 2.6 yra
-
- # naujas RaÅteliÅ komponentas
- # naujos iÅvaizdos ÄvykiÅ/uÅduoÄiÅ/susitikimÅ redaktorius
- # kalendoriÅ publikavimo palaikymas
- # CalDAV palaikymas
- # Network Manager palaikymas
- # prisijungimo prie HULA palaikymas
- # pagerintas GroupWise palaikymas
- # pagerintas ÄvykiÅ pasikartojimo palaikymas
- # kalendoriÅ paaiÅkinimai
- # Mozilla, Outlook ir Evolution formatÅ CSV/tab importavimas
- # kontaktÅ sÄraÅÅ palaikymas LDAP adresÅ knygoms
- # sudÄtingÅ paieÅkÅ adresÅ knygose iÅsaugojimo palaikymas
- # laiÅkÅ prioritetÅ palaikymas raÅyklÄje
- # daug iÅtaisytÅ klaidÅ bei kitÅ naudotojo sÄsajos patobulinimÅ
+ Evolution 2.10 atsirado
+
+ # Integracija su gtk-print
+ # Nustatomas IMAP antraÅÄiÅ parsiuntimas
+ # Didesnis greitis ir maÅesnis atminties naudojimas
+ # Daug smulkiÅ pataisymÅ ir kitÅ patobulinimÅ
PraneÅimas apie klaidas
- Apie klaidas turÄtÅ bÅti praneÅta http://bugzilla.gnome.org.
+ Apie klaidas galite praneÅti adresu http://bugzilla.gnome.org.
Papildoma informacija
Evolution naudotojÅ paÅto konferencijÄ galite uÅsisakyti adresu
http://mail.gnome.org/mailman/listinfo/evolution-list.
- Informacija apie Evolution projektÄ galite rasti
+ InformacijÄ apie Evolution projektÄ galite rasti
http://www.gnome.org/projects/evolution.
@@ -95,116 +86,100 @@
</HEAD>
<BODY BGCOLOR="#f8fcf8">
<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TD ALIGN="left" VALIGN="top">
+<TR><TD ALIGN="left" VALIGN="top">
<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
<TD ALIGN="right" VALIGN="top">
<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
-</TR>
-<TR>
-<TD>
-</TD>
-<TD>
+</TR><TR><TD></TD><TD>
<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
-<TD>
-</TD>
-<TD>
-<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution komanda</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"> didÅiuojasi galÄdami Jums pristatyti</FONT></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"> - universaliÄ bendravimo ir asmeninÄs informacijos valdymui skirtÄ programÄ.</FONT></FONT SIZE="4"></TD>
-<TD>
-</TD>
-<TD>
-<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
-<TD>
-</TD>
-</TR>
-<TR>
-<TD ALIGN="left" VALIGN="bottom">
-<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD ALIGN="right" VALIGN="bottom">
-<div align=right>
-<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></div>
-</TD>
-</TR>
-</TABLE>
-<h2>Pirmieji Åingsniai</h2>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+
+
+<B>Evolution komanda</B> dÅiaugiasi galÄdama pristatyti <B>Evolution</B> â
+universaliÄ bendravimui ir asmeninÄs informacijos valdymui skirtÄ
+programÄ.
+
+
+</FONT SIZE="4"></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="bottom"><div align=right>
+<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</div></TD></TR></TABLE>
+
+
+<h2>
+Pirmieji Åingsniai
+</h2>
<blockquote>
+
KairÄje Evolution lango pusÄje yra Åoninis skydelis, kuriame
- yra nuorodos Ä visus JÅsÅ paÅto aplankus. Po juo rasite JÅsÅ
- kalendoriÅ, kontaktÅ, uÅduoÄiÅ, paÅto bei raÅteliÅ mygtukus.
+ yra nuorodos Ä visus paÅto aplankus. Po juo rasite
+ kalendoriÅ, kontaktÅ, uÅduoÄiÅ, paÅto bei raÅteliÅ mygtukus.
+
<br><br>
- NorÄdami pamatyti pilnÄ Evolution ÅinynÄ, meniu <b>Åinynas</b>
- pasirinkite punktÄ <b>Turinys</b>, arba paspauskite klaviÅÄ <b>F1</b>.
+
+ NorÄdami pamatyti pilnÄ Evolution ÅinynÄ, meniu âÅinynasâ
+ pasirinkite punktÄ âTurinysâ, arba paspauskite klaviÅÄ F1.
+
<br><br>
</blockquote>
-<h2>Naujos funkcijos</h2>
+<h2>
+Naujos funkcijos
+</h2>
+
<blockquote>
- Evolution 2.6 yra
+ Evolution 2.10 atsirado
<ul>
- <li>Naujas RaÅteliÅ komponentas</li>
- <li>Naujos iÅvaizdos ÄvykiÅ/uÅduoÄiÅ/susitikimÅ redaktorius</li>
- <li>KalendoriÅ publikavimo palaikymas</li>
- <li>CalDAV palaikymas</li>
- <li>Network Manager palaikymas</li>
- <li>Prisijungimo prie HULA palaikymas</li>
- <li>Pagerintas GroupWise palaikymas</li>
- <li>Pagerintas ÄvykiÅ pasikartojimo palaikymas</li>
- <li>KalendoriÅ paaiÅkinimai</li>
- <li>Mozilla, Outlook ir Evolution formatÅ CSV/tab importavimas</li>
- <li>KontaktÅ sÄraÅÅ palaikymas LDAP adresÅ knygoms</li>
- <li>SudÄtingÅ paieÅkÅ adresÅ knygose iÅsaugojimo palaikymas</li>
- <li>LaiÅkÅ prioritetÅ palaikymas raÅyklÄje</li>
- <li>Daug iÅtaisytÅ klaidÅ bei kitÅ naudotojo sÄsajos patobulinimÅ</li>
+ <li>
+ Integracija su gtk-print
+ </li><li>
+ Nustatomas IMAP antraÅÄiÅ parsiuntimas
+ </li><li>
+ Didesnis greitis ir maÅesnis atminties naudojimas
+ </li><li>
+ Daug smulkiÅ pataisymÅ ir kitÅ patobulinimÅ
+ </li>
</ul>
<br>
</blockquote>
-<h2>PraneÅimas apie klaidas</h2>
+<h2>
+PraneÅimas apie klaidas
+</h2>
<blockquote>
- Apie klaidas turÄtÅ bÅti praneÅta <a href="http://bugzilla.gnome.org";>http://bugzilla.gnome.org</a>.
+ Apie klaidas galite praneÅti adresu <a href="http://bugzilla.gnome.org";>http://bugzilla.gnome.org</a>.
<br><br>
-</blockquote>
+</blockquote>
-<h2>Papildoma informacija</h2>
+<h2>
+Papildoma informacija
+</h2>
<blockquote>
Evolution naudotojÅ paÅto konferencijÄ galite uÅsisakyti adresu
- <a
- href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
+ <a href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
- Informacija apie Evolution projektÄ galite rasti
+ InformacijÄ apie Evolution projektÄ galite rasti adresu
<a href="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</a>.
<!--
- Galite rasti atsakymus Ä DaÅniausiai uÅduodamus klausimus (DUK)
+ Atsakymus Ä daÅniausiai uÅduodamus klausimus galite rasti adresu
<a href="http://go-evolution.org/FAQ";>http://go-evolution.org/FAQ</a>.
-->
-<br><br>
+<br><br>
</blockquote>
-Pagarbiai,<br>
-Evolution komanda<br>
-<a href="mailto:evolution novell com">evolution novell com</a>
+Pagarbiai,
+<br>
+Evolution komanda
+<br><a href="mailto:evolution novell com">evolution novell com</a>
</BODY>
</HTML>
@@ -365,4 +340,9 @@
wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Transfer-Encoding: 8bit
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+
Modified: branches/kill-bonobo/mail/default/nl/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/nl/Inbox (original)
+++ branches/kill-bonobo/mail/default/nl/Inbox Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
From evolution novell com Wed Sep 06 07:45:12 2006
Return-Path: <evolution novell com>
Received: from pop.novell.com (IDENT:mail localhost [127.0.0.1]) by
- pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 06 Sep 2006
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
07:45:12 -0400
Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
- <evolution novell com>; Wed, 06 Sep 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 06 Sep 2006 12:00:00 -0000
+ <evolution novell com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
- pop.novell.com with SMTP; 06 Sep 2006 12:00:00 -0000
+ pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
From: "The Evolution Team" <evolution novell com>
-To: Evolution Users <evolution novell com>
+To: Evolution-gebruikers <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.8.0
-Date: 06 September 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 14 March 2007 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
-Subject: Welcome bij Evolution!
+Subject: Welkom bij Evolution!
Sender: evolution novell com
Errors-To: evolution novell com
X-Mailman-Version: 1.1
@@ -34,50 +34,36 @@
Content-Transfer-Encoding: 7bit
-Het Evolution-team heeft het genoegen u deze nieuwe versie van Evolution te
-presenteren; het programma waarmee u uw e-mail en persoonlijke informatie
-kunt beheren.
+Het Evolution-team heeft het genoegen u deze nieuwe versie van Evolution
+te presenteren; het programma waarmee u uw e-mail en persoonlijke
+informatie kunt beheren.
-Korte uitleg
+Aan de slag
- Aan de linkerkant van het Evolution-venster ziet u de zijbalk met de
- snelkoppelingen naar al uw e-mailmappen. Daaronder ziet u knoppen voor uw
- agenda's, contacten, taken, e-mail en memo's.
-
- Voor een uitgebreidere uitleg over het gebruik van Evolution selecteert u
- "Inhoudsopgave" uit het menu "Hulp" of drukt u op de F1 toets.
+ Aan de linkerkant van het Evolutionvenster ziet u het zijpaneel met de
+ snelkoppeling naar al uw e-mailmappen. Daaronder ziet u knoppen voor
+ uw agenda's, contacten, taken, e-mail en memo's.
+ Voor een meer uitgebreide uitleg over het gebruik van Evolution
+ selecteert u "Inhoud" uit het menu "Hulp", of drukt u op de F1-toets.
-Nieuwe functies
+Fouten rapporteren
- Evolution 2.8 heeft
-
- # Een nieuwe zoekinterface en algemene zoekfunctie voor e-mail
- # Een breedbeeldweergave / verticale weergave voor e-mail
- # Verbeterd uiterlijk en gevoel ("Cairo"-integratie)
- # Meer snelheid en een lager geheugengebruik
- # Ondersteuning voor GroupWise-herinneringen en intrekken van e-mail
- # Deelbare notities in het dagboek (bestandssysteem)
- # Integratie met Gnome-sleutelbossen
- # Veel minder problemen en vele kleine verbeteringen
-
-Fouten melden
-
- Fouten kunnen gemeld worden op http://bugzilla.gnome.org.
+ Fouten moeten gerapporteerd worden op http://bugzilla.gnome.org.
Meer informatie
- U kunt zich abonneren op de (engelstalige) gebruikerslijst van Evolution
- op http://mail.gnome.org/mailman/listinfo/evolution-list.
-
- Informatie over het Evolution-project is beschikbaar op
+ U kunt kunt u abonneren op de (engelstalige) gebruikerslijst van
+ Evolution op http://mail.gnome.org/mailman/listinfo/evolution-list.
+ Informatie over het Evolution project is beschikbaar op
http://www.gnome.org/projects/evolution.
+ U kunt een lijst met (Engelstalige) antwoorden op veelgestelde
+ vragen vinden (FAQ) op http://go-evolution.org/FAQ
Hoogachtend,
-Het Evolution-Team
-evolution novell com
+Het Evolution-team
--=-2gZ1roA/HoYrlRDVGyiM
@@ -102,9 +88,7 @@
<FONT COLOR="#f8fcf8"><FONT SIZE="4">
-<B>Het Evolution-team</B> heeft het genoegen u deze nieuwe versie van Evolution te presenteren; het programma waarmee u uw e-mail en persoonlijke informatie kunt beheren.
-
-
+<B>Het Evolution-team</B> heeft het genoegen u deze nieuwe versie van <B>Evolution</B> te presenteren; het programma waarmee u uw e-mail en persoonlijke informatie kunt beheren.
</FONT SIZE="4"></FONT>
@@ -119,56 +103,30 @@
<h2>
-Korte uitleg
+Aan de slag
</h2>
<blockquote>
- Aan de linkerkant van het Evolution-venster ziet u de zijbalk met de
- snelkoppelingen naar al uw e-mailmappen. Daaronder ziet u knoppen voor uw
- agenda's, contacten, taken, e-mail en memo's.
+ Aan de linkerkant van het Evolution-venster ziet u het zijpaneel
+ met de snelkoppelingen naar al uw e-mailmappen. Daaronder ziet
+ u knoppen voor uw agenda's, contacten, taken, e-mail en memo's.
<br><br>
- Voor een uitgebreidere uitleg over het gebruik van Evolution selecteert
- u "Inhoudsopgave" uit het menu "Hulp" of drukt u op de F1 toets.
+ Voor een meer uitgebreide uitleg over het gebruik van Evolution
+ selecteert u <b>Inhoud</b> uit het menu <b>Hulp</b>, of drukt u
+ op de <b>F1</b>-toets.
<br><br>
</blockquote>
<h2>
-Nieuwe functies
-</h2>
-
-<blockquote>
- Evolution 2.8 heeft
- <ul>
- <li>
- Een nieuwe zoekinterface en algemene zoekfunctie voor e-mail
- </li><li>
- Een breedbeeldweergave / verticale weergave voor e-mail
- </li><li>
- Verbeterd uiterlijk en gevoel ("Cairo"-integratie)
- </li><li>
- Meer snelheid en een lager geheugengebruik
- </li><li>
- Ondersteuning voor GroupWise-herinneringen en intrekken van e-mail
- </li><li>
- Deelbare notities in het dagboek (bestandssysteem)
- </li><li>
- Integratie met Gnome-sleutelbossen
- </li><li>
- Veel minder problemen en vele kleine verbeteringen
- </li>
- </ul>
-<br>
-</blockquote>
-
-<h2>
-Fouten melden
+Fouten rapporteren
</h2>
<blockquote>
- Fouten kunnen gemeld worden op <a href="http://bugzilla.gnome.org";>http://bugzilla.gnome.org</a>.
+ Fouten moeten gerapporteerd worden op
+ <a href="http://bugzilla.gnome.org";>http://bugzilla.gnome.org</a>.
<br><br>
</blockquote>
@@ -177,19 +135,22 @@
</h2>
<blockquote>
- U kunt zich abonneren op de (engelstalige) gebruikerslijst van Evolution
- op <a href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
+ U kunt kunt u abonneren op de (Engelstalige) gebruikerslijst van
+ Evolution op <a href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
- Informatie over het Evolution-project is beschikbaar op
+ Informatie over het Evolution project is beschikbaar op
<a href="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</a>.
-
+ <!--
+ U kunt een lijst met (Engelstalige) antwoorden op veelgestelde
+ vragen vinden (FAQ) op
+ <a href="http://go-evolution.org/FAQ";>http://go-evolution.org/FAQ</a>.
+ -->
<br><br>
</blockquote>
Hoogachtend,
<br>
-Het Evolution-Team
-<br><a href="mailto:evolution novell com">evolution novell com</a>
+Het Evolution-team
</BODY>
</HTML>
Modified: branches/kill-bonobo/mail/default/pl/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/pl/Inbox (original)
+++ branches/kill-bonobo/mail/default/pl/Inbox Wed Oct 1 20:56:04 2008
@@ -48,15 +48,6 @@
wybierajÄc pozycjÄ "ZawartoÅÄ" z menu "Pomoc" lub naciskajÄc
klawisz F1 na klawiaturze.
-NowoÅci
-
- Evolution 2.10:
-
- # Integracja z gtk-print
- # Konfigurowalne pobieranie nagÅÃwkÃw IMAP
- # Lepsza wydajnoÅÄ, mniej wyciekÃw i mniejsze zuÅycie pamiÄci
- # Wiele innych ulepszeÅ poprawionych bÅÄdÃw
-
ZgÅaszanie bÅÄdÃw
Napotkane bÅÄdy prosimy zgÅaszaÄ pod adresem http://bugzilla.gnome.org.
@@ -128,26 +119,6 @@
</blockquote>
<h2>
-NowoÅci
-</h2>
-
-<blockquote>
- Evolution 2.10:
- <ul>
- <li>
- Integracja z gtk-print
- </li><li>
- Konfigurowalne pobieranie nagÅÃwkÃw IMAP
- </li><li>
- Lepsza wydajnoÅÄ, mniej wyciekÃw i mniejsze zuÅycie pamiÄci
- </li><li>
- Wiele innych ulepszeÅ poprawionych bÅÄdÃw
- </li>
- </ul>
-<br>
-</blockquote>
-
-<h2>
ZgÅaszanie bÅÄdÃw
</h2>
<blockquote>
Modified: branches/kill-bonobo/mail/default/sv/Inbox
==============================================================================
--- branches/kill-bonobo/mail/default/sv/Inbox (original)
+++ branches/kill-bonobo/mail/default/sv/Inbox Wed Oct 1 20:56:04 2008
@@ -10,9 +10,9 @@
Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
From: "Evolution-teamet" <evolution novell com>
-To: Evolution Users <evolution novell com>
+To: Evolution-anvÃndare <evolution novell com>
Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.10.0
+X-Mailer: Evolution 2.24.0
Date: 14 March 2007 12:00:00 +0000
Message-Id: <1001418302 27070 20 camel spectrolite>
Mime-Version: 1.0
@@ -34,27 +34,18 @@
Content-Transfer-Encoding: 7bit
-Evolution-teamet Ãr stolta Ãver att vÃlkomna dig till Evolution, ett komplett system
-fÃr att hantera dina kommunikationer och personlig information.
+Evolution-teamet Ãr stolta Ãver att vÃlkomna dig till Evolution, ett komplett
+system fÃr att hantera dina kommunikationer och personlig information.
Komma igÃng
- PÃ vÃnster sida av Evolution-fÃnstret finns det en sidopanel med
- genvÃgar till alla dina e-postmappar. I sidopanelen hittar du knappar
- fÃr dina kalendrar, kontakter, uppgifter, e-post och memon.
-
- FÃr en komplett anvÃndarguide fÃr Evolution kan du vÃlja "InnehÃll"
- frÃn "HjÃlp"-menyn eller trycka pà F1-tangenten.
-
-Nya funktioner
-
- Evolution 2.10 erbjuder dig
-
- # Integration med gtk-print
- # Anpassningsbar hÃmtning av IMAP-rubriker.
- # Ãkad prestanda, en mÃngd av felrÃttningar fÃr minnesanvÃndning
- # En mÃngd andra felrÃttningar och andra fÃrbÃttringar
+ PÃ vÃnster sida av Evolution-fÃnstret finns det en sidopanel
+ med genvÃgar till alla dina e-postmappar. I sidopanelen hittar
+ du knappar fÃr dina kalendrar, kontakter, uppgifter, e-post och memon.
+
+ FÃr en komplett anvÃndarguide fÃr Evolution kan du vÃlja InnehÃlls-
+ fÃrteckning frÃn HjÃlp-menyn eller trycka pà F1-tangenten.
Felrapportering
@@ -62,16 +53,15 @@
Mer information
- Du kan prenumerera pà sÃndlistan "Evolution users" pÃ
- http://mail.gnome.org/mailman/listinfo/evolution-list.
-
- Information om Evolution-projektet finns tillgÃnglig pÃ
- http://www.gnome.org/projects/evolution.
+ Du kan prenumerera pà sÃndlistan Evolution users pÃ
+ http://lists.gnome.org/mailman/listinfo/evolution.
+
+ Information om Evolution-projektet finns tillgÃngligt pÃ
+ http://www.gnome.org/projects/evolution.
-Med vÃnliga hÃlsningar,
-Evolution-teamet
-evolution novell com
+Med vÃnliga hÃlsningar,
+Evolution-teamet
--=-2gZ1roA/HoYrlRDVGyiM
@@ -95,7 +85,6 @@
<TD></TD><TD>
<FONT COLOR="#f8fcf8"><FONT SIZE="4">
-
<B>Evolution-teamet</B> Ãr stolta Ãver att vÃlkomna dig till <B>Evolution</B>, ett komplett system fÃr att hantera dina kommunikationer och personlig information.
@@ -116,39 +105,19 @@
<blockquote>
- PÃ vÃnster sida av Evolution-fÃnstret finns det en sidopanel med
- genvÃgar till alla dina e-postmappar. I sidopanelen hittar du knappar
- fÃr dina kalendrar, kontakter, uppgifter, e-post och memon.
+ PÃ vÃnster sida av Evolution-fÃnstret finns det en sidopanel
+ med genvÃgar till alla dina e-postmappar. I sidopanelen hittar
+ du knappar fÃr dina kalendrar, kontakter, uppgifter, e-post och memon.
<br><br>
- FÃr en komplett anvÃndarguide fÃr Evolution kan du vÃlja <b>InnehÃll</b>
- frÃn <b>HjÃlp</b>-menyn eller trycka pà <B>F1</B>-tangenten.
+ FÃr en komplett anvÃndarguide fÃr Evolution kan du vÃlja InnehÃlls-
+ fÃrteckning frÃn HjÃlp-menyn eller trycka pà F1-tangenten.
<br><br>
</blockquote>
<h2>
-Nya funktioner
-</h2>
-
-<blockquote>
- Evolution 2.10 erbjuder dig
- <ul>
- <li>
- Integration med gtk-print
- </li><li>
- Anpassningsbar hÃmtning av IMAP-rubriker
- </li><li>
- Ãkad prestanda, en mÃngd av felrÃttningar fÃr minnesanvÃndning
- </li><li>
- En mÃngd andra felrÃttningar och andra fÃrbÃttringar
- </li>
- </ul>
-<br>
-</blockquote>
-
-<h2>
Felrapportering
</h2>
<blockquote>
@@ -161,13 +130,12 @@
</h2>
<blockquote>
- Du kan prenumerera pà sÃndlistan <b>Evolution users</b> pÃ
- <a href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
+ Du kan prenumerera pà sÃndlistan Evolution users pà <a href="http://lists.gnome.org/mailman/listinfo/evolution";>http://lists.gnome.org/mailman/listinfo/evolution</a>.
+
+ Information om Evolution-projektet finns tillgÃngligt pà <a href="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</a>.
- Information om Evolution-projektet finns tillgÃnglig pÃ
- <a href="http://www.gnome.org/projects/evolution";>http://www.gnome.org/projects/evolution</a>.
<!--
- Du kan hitta en lista med svar pà ofta stÃllda frÃgor (FAQ) pÃ
+ Du kan hitta en lista med frÃgor och svar (FAQ) pÃ
<a href="http://go-evolution.org/FAQ";>http://go-evolution.org/FAQ</a>.
-->
<br><br>
@@ -176,7 +144,6 @@
Med vÃnliga hÃlsningar,
<br>
Evolution-teamet
-<br><a href="mailto:evolution novell com">evolution novell com</a>
</BODY>
</HTML>
Modified: branches/kill-bonobo/mail/em-account-editor.c
==============================================================================
--- branches/kill-bonobo/mail/em-account-editor.c (original)
+++ branches/kill-bonobo/mail/em-account-editor.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors:
- * Dan Winship <danw ximian com>
- * Jeffrey Stedfast <fejj ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Dan Winship <danw ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
+ * Michael Zucchi <notzed ximian com>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-account-prefs.c
==============================================================================
--- branches/kill-bonobo/mail/em-account-prefs.c (original)
+++ branches/kill-bonobo/mail/em-account-prefs.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-composer-utils.c
==============================================================================
--- branches/kill-bonobo/mail/em-composer-utils.c (original)
+++ branches/kill-bonobo/mail/em-composer-utils.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -1419,7 +1419,7 @@
}
if (account && (account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS || account->receipt_policy == E_ACCOUNT_RECEIPT_ASK)
- && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES)
+ && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg), NULL) == GTK_RESPONSE_YES)
em_utils_send_receipt(folder, msg);
}
Modified: branches/kill-bonobo/mail/em-filter-i18n.h
==============================================================================
--- branches/kill-bonobo/mail/em-filter-i18n.h (original)
+++ branches/kill-bonobo/mail/em-filter-i18n.h Wed Oct 1 20:56:04 2008
@@ -1,3 +1,19 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ */
/* Automatically generated. Do not edit. */
char *s = N_("Adjust Score");
char *s = N_("Assign Color");
Modified: branches/kill-bonobo/mail/em-folder-browser.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-browser.c (original)
+++ branches/kill-bonobo/mail/em-folder-browser.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
- * Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -1141,7 +1141,7 @@
g_free (word);
word = NULL;
g_object_get (esb, "query", &search_word, NULL);
- if (efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
+ if (search_word && efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
break;
}
gtk_widget_set_sensitive (esb->scopeoption, FALSE);
Modified: branches/kill-bonobo/mail/em-folder-tree-model.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-tree-model.c (original)
+++ branches/kill-bonobo/mail/em-folder-tree-model.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-folder-tree.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-tree.c (original)
+++ branches/kill-bonobo/mail/em-folder-tree.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -662,7 +662,7 @@
row = si->row;
path = gtk_tree_row_reference_get_path (row);
- gtk_tree_view_expand_row (priv->treeview, path, FALSE);
+ gtk_tree_view_expand_to_path (priv->treeview, path);
u = g_hash_table_lookup(emft->priv->select_uris_table, key);
if (u)
Modified: branches/kill-bonobo/mail/em-folder-utils.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-utils.c (original)
+++ branches/kill-bonobo/mail/em-folder-utils.c Wed Oct 1 20:56:04 2008
@@ -367,84 +367,32 @@
}
static void
-emfu_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, void *data)
{
- while (fi) {
- CamelFolder *folder;
+ GtkWidget *dialog = data;
- if (fi->child) {
- emfu_delete_rec (store, fi->child, ex);
- if (camel_exception_is_set (ex))
- return;
- }
-
- d(printf ("deleting folder '%s'\n", fi->full_name));
-
- /* shouldn't camel do this itself? */
- if (camel_store_supports_subscriptions (store))
- camel_store_unsubscribe_folder (store, fi->full_name, NULL);
-
- if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
- return;
-
- if (!CAMEL_IS_VEE_FOLDER (folder)) {
- GPtrArray *uids = camel_folder_get_uids (folder);
- int i;
-
- camel_folder_freeze (folder);
- for (i = 0; i < uids->len; i++)
- camel_folder_delete_message (folder, uids->pdata[i]);
-
- camel_folder_free_uids (folder, uids);
-
- camel_folder_sync (folder, TRUE, NULL);
- camel_folder_thaw (folder);
- }
-
- camel_store_delete_folder (store, fi->full_name, ex);
- if (camel_exception_is_set (ex))
- return;
-
- fi = fi->next;
+ if (ex && camel_exception_is_set (ex)) {
+ GtkWidget *w = e_error_new (NULL,
+ "mail:no-delete-folder", folder->full_name, camel_exception_get_description (ex), NULL);
+ em_utils_show_error_silent (w);
+ camel_exception_clear (ex);
}
-}
-static void
-emfu_delete_folders (CamelStore *store, const char *full_name, CamelException *ex)
-{
- guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
- CamelFolderInfo *fi;
-
- fi = camel_store_get_folder_info (store, full_name, flags, ex);
- if (camel_exception_is_set (ex))
- return;
-
- emfu_delete_rec (store, fi, ex);
- camel_store_free_folder_info (store, fi);
+ if (dialog)
+ gtk_widget_destroy (dialog);
}
static void
emfu_delete_response (GtkWidget *dialog, int response, gpointer data)
{
- CamelStore *store;
- CamelException ex;
- char *full_name;
-
- full_name = g_object_get_data ((GObject *) dialog, "full_name");
- store = g_object_get_data ((GObject *) dialog, "store");
-
if (response == GTK_RESPONSE_OK) {
- camel_exception_init (&ex);
- emfu_delete_folders (store, full_name, &ex);
- if (camel_exception_is_set (&ex)) {
- GtkWidget *w = e_error_new(NULL,
- "mail:no-delete-folder", full_name, ex.desc, NULL);
- em_utils_show_error_silent (w);
- camel_exception_clear (&ex);
- }
- }
+ /* disable dialog until operation finishes */
+ gtk_widget_set_sensitive (dialog, FALSE);
- gtk_widget_destroy (dialog);
+ mail_remove_folder (g_object_get_data ((GObject *) dialog, "folder"), emfu_delete_done, dialog);
+ } else {
+ gtk_widget_destroy (dialog);
+ }
}
/* FIXME: these functions must be documented */
@@ -462,13 +410,12 @@
return;
}
- camel_object_ref (folder->parent_store);
+ camel_object_ref (folder);
dialog = e_error_new(NULL,
(folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
folder->full_name, NULL);
- g_object_set_data_full ((GObject *) dialog, "full_name", g_strdup (folder->full_name), g_free);
- g_object_set_data_full ((GObject *) dialog, "store", folder->parent_store, camel_object_unref);
+ g_object_set_data_full ((GObject *) dialog, "folder", folder, camel_object_unref);
g_signal_connect (dialog, "response", G_CALLBACK (emfu_delete_response), NULL);
gtk_widget_show (dialog);
}
Modified: branches/kill-bonobo/mail/em-folder-view.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-view.c (original)
+++ branches/kill-bonobo/mail/em-folder-view.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -1091,7 +1091,7 @@
_("You do not have sufficient permissions to delete this mail."));
gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
} else {
- GtkWidget *w = e_error_new (NULL, "mail:no-delete-permission", "", "");
+ GtkWidget *w = e_error_new (NULL, "mail:no-delete-permission", "", NULL);
em_utils_show_error_silent (w);
}
Modified: branches/kill-bonobo/mail/em-format-html-display.c
==============================================================================
--- branches/kill-bonobo/mail/em-format-html-display.c (original)
+++ branches/kill-bonobo/mail/em-format-html-display.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-format-html.c
==============================================================================
--- branches/kill-bonobo/mail/em-format-html.c (original)
+++ branches/kill-bonobo/mail/em-format-html.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -1931,10 +1931,11 @@
} else {
int mailer_shown = FALSE;
while (h->next) {
- int mailer;
+ int mailer, face;
header = ((CamelMimePart *)part)->headers;
mailer = !g_ascii_strcasecmp (h->name, "X-Evolution-Mailer");
+ face = !g_ascii_strcasecmp (h->name, "Face");
while (header) {
if (emf->show_photo && !photo_name && !g_ascii_strcasecmp (header->name, "From"))
@@ -1967,7 +1968,7 @@
efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
if (strstr(use_header->value, "Evolution"))
have_icon = TRUE;
- } else if (!g_ascii_strcasecmp (header->name, "Face") && !face_decoded) {
+ } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
char *cp = header->value;
/* Skip over spaces */
@@ -1978,7 +1979,8 @@
face_header_value = g_realloc (face_header_value, face_header_len + 1);
face_header_value[face_header_len] = 0;
face_decoded = TRUE;
- } else if (!g_ascii_strcasecmp (header->name, h->name)) {
+ /* Showing an encoded "Face" header makes little sense */
+ } else if (!g_ascii_strcasecmp (header->name, h->name) && !face) {
efh_format_header(emf, stream, part, header, h->flags, charset);
}
Modified: branches/kill-bonobo/mail/em-format.c
==============================================================================
--- branches/kill-bonobo/mail/em-format.c (original)
+++ branches/kill-bonobo/mail/em-format.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
- * Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -889,6 +889,7 @@
{ N_("Subject"), EM_FORMAT_HEADER_BOLD },
{ N_("Date"), EM_FORMAT_HEADER_BOLD },
{ N_("Newsgroups"), EM_FORMAT_HEADER_BOLD },
+ { N_("Face"), 0 },
};
/**
Modified: branches/kill-bonobo/mail/em-icon-stream.c
==============================================================================
--- branches/kill-bonobo/mail/em-icon-stream.c (original)
+++ branches/kill-bonobo/mail/em-icon-stream.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-junk-hook.c
==============================================================================
--- branches/kill-bonobo/mail/em-junk-hook.c (original)
+++ branches/kill-bonobo/mail/em-junk-hook.c Wed Oct 1 20:56:04 2008
@@ -300,18 +300,52 @@
return 0;
}
+struct manage_error_idle_data
+{
+ const char *msg;
+ GError *error;
+};
+
static void
-manage_error (const char *msg, GError *error)
+free_mei (gpointer data)
+{
+ struct manage_error_idle_data *mei = (struct manage_error_idle_data*) data;
+
+ if (!mei)
+ return;
+
+ g_error_free (mei->error);
+ g_free (mei);
+}
+
+static gboolean
+manage_error_idle (gpointer data)
{
GtkWidget *w;
+ struct manage_error_idle_data *mei = (struct manage_error_idle_data *) data;
+
+ if (!mei)
+ return FALSE;
+
+ w = e_error_new (NULL, mei->msg, mei->error->message, NULL);
+ em_utils_show_error_silent (w);
+
+ return FALSE;
+}
+
+static void
+manage_error (const char *msg, GError *error)
+{
+ struct manage_error_idle_data *mei;
if (!error)
return;
- w = e_error_new (NULL, msg, error->message, NULL);
- em_utils_show_error_silent (w);
+ mei = g_new0 (struct manage_error_idle_data, 1);
+ mei->msg = msg; /* it's a static string, should be safe to use it as this */
+ mei->error = error;
- g_error_free (error);
+ g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, manage_error_idle, mei, free_mei);
}
/*XXX: don't think we need here*/
Modified: branches/kill-bonobo/mail/em-mailer-prefs.c
==============================================================================
--- branches/kill-bonobo/mail/em-mailer-prefs.c (original)
+++ branches/kill-bonobo/mail/em-mailer-prefs.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -80,6 +80,7 @@
N_("Subject"),
N_("Date"),
N_("Newsgroups"),
+ N_("Face"),
"x-evolution-mailer", /* DO NOT translate */
};
Modified: branches/kill-bonobo/mail/em-mailer-prefs.h
==============================================================================
--- branches/kill-bonobo/mail/em-mailer-prefs.h (original)
+++ branches/kill-bonobo/mail/em-mailer-prefs.h Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-message-browser.c
==============================================================================
--- branches/kill-bonobo/mail/em-message-browser.c (original)
+++ branches/kill-bonobo/mail/em-message-browser.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-migrate.c
==============================================================================
--- branches/kill-bonobo/mail/em-migrate.c (original)
+++ branches/kill-bonobo/mail/em-migrate.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -2895,10 +2895,9 @@
len = e_list_length ((EList *) accounts);
camel_session_set_online ((CamelSession *) session, FALSE);
- em_migrate_setup_progress_dialog (
- _("The summary format for Evolution's mailbox folders "
- "has changed.\n\nPlease be patient while Evolution "
- "migrates your folders to the new format..."));
+ em_migrate_setup_progress_dialog (_("The summary format of the Evolution mailbox "
+ "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be "
+ "patient while Evolution migrates your folders..."));
em_migrate_set_progress ( (double)i/(len+1));
store = setup_local_store (component);
Modified: branches/kill-bonobo/mail/em-network-prefs.c
==============================================================================
--- branches/kill-bonobo/mail/em-network-prefs.c (original)
+++ branches/kill-bonobo/mail/em-network-prefs.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Veerapuram Varadhan <vvaradhan novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ * Authors:
+ * Veerapuram Varadhan <vvaradhan novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-network-prefs.h
==============================================================================
--- branches/kill-bonobo/mail/em-network-prefs.h (original)
+++ branches/kill-bonobo/mail/em-network-prefs.h Wed Oct 1 20:56:04 2008
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Veerapuram Varadhan <vvaradhan novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Veerapuram Varadhan <vvaradhan novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
-
#ifndef __EM_NETWORK_PREFS_H__
#define __EM_NETWORK_PREFS_H__
Modified: branches/kill-bonobo/mail/em-popup.c
==============================================================================
--- branches/kill-bonobo/mail/em-popup.c (original)
+++ branches/kill-bonobo/mail/em-popup.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -799,17 +799,18 @@
for (cp = mime_type; *cp != '\0'; cp++)
*cp = g_ascii_tolower (*cp);
- /* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine
- on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between
- these two soon. */
- apps = g_app_info_get_all_for_type (mime_type);
+ cp = g_content_type_from_mime_type (mime_type);
+ apps = g_app_info_get_all_for_type (cp ? cp : mime_type);
+ g_free (cp);
if (apps == NULL && strcmp (mime_type, "application/octet-stream") == 0) {
if (filename != NULL) {
gchar *name_type;
- name_type = e_util_guess_mime_type (filename);
- apps = g_app_info_get_all_for_type (name_type);
+ name_type = e_util_guess_mime_type (filename, FALSE);
+ cp = g_content_type_from_mime_type (name_type);
+ apps = g_app_info_get_all_for_type (cp ? cp : name_type);
+ g_free (cp);
g_free (name_type);
}
}
Modified: branches/kill-bonobo/mail/em-subscribe-editor.c
==============================================================================
--- branches/kill-bonobo/mail/em-subscribe-editor.c (original)
+++ branches/kill-bonobo/mail/em-subscribe-editor.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * em-subscribe-editor.c *
- *
- * Authors: Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/em-utils.c
==============================================================================
--- branches/kill-bonobo/mail/em-utils.c (original)
+++ branches/kill-bonobo/mail/em-utils.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -2260,7 +2260,7 @@
filename = camel_mime_part_get_filename (part);
if (filename != NULL)
- name_type = e_util_guess_mime_type (filename);
+ name_type = e_util_guess_mime_type (filename, FALSE);
dw = camel_medium_get_content_object((CamelMedium *)part);
if (!camel_data_wrapper_is_offline(dw)) {
Modified: branches/kill-bonobo/mail/evolution-mail.schemas.in
==============================================================================
--- branches/kill-bonobo/mail/evolution-mail.schemas.in (original)
+++ branches/kill-bonobo/mail/evolution-mail.schemas.in Wed Oct 1 20:56:04 2008
@@ -315,9 +315,9 @@
<type>int</type>
<default>0</default>
<locale name="C">
- <short>Load images for HTML messages over http</short>
+ <short>Load images for HTML messages over HTTP</short>
<long>
- Load images for HTML messages over http(s). Possible values are:
+ Load images for HTML messages over HTTP(S). Possible values are:
"0" - Never load images off the net.
"1" - Load images in messages from contacts.
"2" - Always load images off the net.
@@ -390,11 +390,11 @@
<type>list</type>
<list_type>string</list_type>
<locale name="C">
- <short>List of mime types to check for bonobo component viewers</short>
+ <short>List of MIME types to check for Bonobo component viewers</short>
<long>
- If there isn't a builtin viewer for a particular mime-type inside Evolution,
- any mime-types appearing in this list which map to a bonobo-component viewer
- in GNOME's mime-type database may be used for displaying content.
+ If there isn't a builtin viewer for a particular MIME type inside Evolution,
+ any MIME types appearing in this list which map to a Bonobo component viewer
+ in GNOME's MIME type database may be used for displaying content.
</long>
</locale>
</schema>
@@ -633,7 +633,7 @@
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Allows evolution to display text part of limited size</short>
+ <short>Allows Evolution to display text part of limited size</short>
<long>
Enable to render message text part of limited size.
</long>
@@ -650,7 +650,7 @@
<short>Text message part limit</short>
<long>
This decides the max size of the text part that can be formatted under
- evolution. The default is 4MB / 4096 KB and is specified interms of KB.
+ Evolution. The default is 4MB / 4096 KB and is specified in terms of KB.
</long>
</locale>
</schema>
Modified: branches/kill-bonobo/mail/importers/evolution-mbox-importer.c
==============================================================================
--- branches/kill-bonobo/mail/importers/evolution-mbox-importer.c (original)
+++ branches/kill-bonobo/mail/importers/evolution-mbox-importer.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* evolution-mbox-importer.c
- *
- * Authors: Iain Holmes <iain ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Iain Holmes <iain ximian com>
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/mail/importers/mail-importer.c
==============================================================================
--- branches/kill-bonobo/mail/importers/mail-importer.c (original)
+++ branches/kill-bonobo/mail/importers/mail-importer.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.c
- *
- * Authors: Iain Holmes <iain ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Iain Holmes <iain ximian com>
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/mail/importers/pine-importer.c
==============================================================================
--- branches/kill-bonobo/mail/importers/pine-importer.c (original)
+++ branches/kill-bonobo/mail/importers/pine-importer.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* pine-importer.c
- *
- * Authors:
- * Iain Holmes <iain ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Iain Holmes <iain ximian com>
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/mail/mail-component.c
==============================================================================
--- branches/kill-bonobo/mail/mail-component.c (original)
+++ branches/kill-bonobo/mail/mail-component.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-component.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Ettore Perazzoli <ettore ximian com>
- * Michael Zucchi <notzed ximian com>
- * Jeffrey Stedfast <fejj ximian com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Ettore Perazzoli <ettore ximian com>
+ * Michael Zucchi <notzed ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/mail-config.c
==============================================================================
--- branches/kill-bonobo/mail/mail-config.c (original)
+++ branches/kill-bonobo/mail/mail-config.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Jeffrey Stedfast <fejj ximian com>
- * Radek Doulik <rodo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jeffrey Stedfast <fejj ximian com>
+ * Radek Doulik <rodo ximian com>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/mail/mail-config.glade
==============================================================================
--- branches/kill-bonobo/mail/mail-config.glade (original)
+++ branches/kill-bonobo/mail/mail-config.glade Wed Oct 1 20:56:04 2008
@@ -2804,7 +2804,7 @@
<widget class="Custom" id="sent_button">
<property name="visible">True</property>
<property name="creation_function">em_account_editor_folder_selector_button_new</property>
- <property name="string1">Select Sent Folder</property>
+ <property name="string1" translatable="yes">Select Sent Folder</property>
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Tue, 14 Dec 2004 17:07:09 GMT</property>
@@ -2823,7 +2823,7 @@
<widget class="Custom" id="drafts_button">
<property name="visible">True</property>
<property name="creation_function">em_account_editor_folder_selector_button_new</property>
- <property name="string1">Select Drafts Folder</property>
+ <property name="string1" translatable="yes">Select Drafts Folder</property>
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Tue, 14 Dec 2004 17:07:02 GMT</property>
Modified: branches/kill-bonobo/mail/mail-folder-cache.c
==============================================================================
--- branches/kill-bonobo/mail/mail-folder-cache.c (original)
+++ branches/kill-bonobo/mail/mail-folder-cache.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Peter Williams <peterw ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Peter Williams <peterw ximian com>
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/mail/mail-mt.c
==============================================================================
--- branches/kill-bonobo/mail/mail-mt.c (original)
+++ branches/kill-bonobo/mail/mail-mt.c Wed Oct 1 20:56:04 2008
@@ -1,19 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
#include <config.h>
Modified: branches/kill-bonobo/mail/mail-ops.c
==============================================================================
--- branches/kill-bonobo/mail/mail-ops.c (original)
+++ branches/kill-bonobo/mail/mail-ops.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
/*
- * Authors: Dan Winship <danw ximian com>
- * Jeffrey Stedfast <fejj ximian com>
- * Peter Williams <peterw ximian com>
- * Michael Zucchi <notzed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * mail-ops.c: callbacks for the mail toolbar/menus
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Dan Winship <danw ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
+ * Peter Williams <peterw ximian com>
+ * Michael Zucchi <notzed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
#include <config.h>
@@ -1400,68 +1401,94 @@
struct _remove_folder_msg {
MailMsg base;
- char *uri;
+ CamelFolder *folder;
gboolean removed;
- void (*done) (char *uri, gboolean removed, void *data);
+ void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data);
void *data;
};
static gchar *
remove_folder_desc (struct _remove_folder_msg *m)
{
- return g_strdup_printf (_("Removing folder %s"), m->uri);
+ return g_strdup_printf (_("Removing folder %s"), m->folder->full_name);
+}
+
+static void
+remove_folder_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+{
+ while (fi) {
+ CamelFolder *folder;
+
+ if (fi->child) {
+ remove_folder_rec (store, fi->child, ex);
+ if (camel_exception_is_set (ex))
+ return;
+ }
+
+ d(printf ("deleting folder '%s'\n", fi->full_name));
+
+ if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
+ return;
+
+ if (!CAMEL_IS_VEE_FOLDER (folder)) {
+ GPtrArray *uids = camel_folder_get_uids (folder);
+ int i;
+
+ /* Delete every message in this folder, then expunge it */
+ camel_folder_freeze (folder);
+ for (i = 0; i < uids->len; i++)
+ camel_folder_delete_message (folder, uids->pdata[i]);
+
+ camel_folder_free_uids (folder, uids);
+
+ camel_folder_sync (folder, TRUE, NULL);
+ camel_folder_thaw (folder);
+ }
+
+ /* if the store supports subscriptions, unsubscribe from this folder... */
+ if (camel_store_supports_subscriptions (store))
+ camel_store_unsubscribe_folder (store, fi->full_name, NULL);
+
+ /* Then delete the folder from the store */
+ camel_store_delete_folder (store, fi->full_name, ex);
+ if (camel_exception_is_set (ex))
+ return;
+
+ fi = fi->next;
+ }
}
static void
remove_folder_exec (struct _remove_folder_msg *m)
{
CamelStore *store;
- CamelFolder *folder;
- GPtrArray *uids;
- int i;
+ CamelFolderInfo *fi;
m->removed = FALSE;
- folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex);
- if (!folder)
- return;
+ store = m->folder->parent_store;
- store = folder->parent_store;
+ fi = camel_store_get_folder_info (store, m->folder->full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &m->base.ex);
+ if (camel_exception_is_set (&m->base.ex))
+ return;
- /* Delete every message in this folder, then expunge it */
- uids = camel_folder_get_uids (folder);
- camel_folder_freeze(folder);
- for (i = 0; i < uids->len; i++)
- camel_folder_delete_message (folder, uids->pdata[i]);
- camel_folder_sync (folder, TRUE, NULL);
- camel_folder_thaw(folder);
- camel_folder_free_uids (folder, uids);
-
- /* if the store supports subscriptions, unsubscribe from this folder... */
- if (camel_store_supports_subscriptions (store))
- camel_store_unsubscribe_folder (store, folder->full_name, NULL);
+ remove_folder_rec (store, fi, &m->base.ex);
+ camel_store_free_folder_info (store, fi);
- /* Then delete the folder from the store */
- camel_store_delete_folder (store, folder->full_name, &m->base.ex);
m->removed = !camel_exception_is_set (&m->base.ex);
- camel_object_unref (folder);
}
static void
remove_folder_done (struct _remove_folder_msg *m)
{
- if (m->removed) {
- /* FIXME: Remove this folder from the folder cache ??? */
- }
-
if (m->done)
- m->done (m->uri, m->removed, m->data);
+ m->done (m->folder, m->removed, &m->base.ex, m->data);
}
static void
remove_folder_free (struct _remove_folder_msg *m)
{
- g_free (m->uri);
+ camel_object_unref (m->folder);
}
static MailMsgInfo remove_folder_info = {
@@ -1473,12 +1500,15 @@
};
void
-mail_remove_folder (const char *uri, void (*done) (char *uri, gboolean removed, void *data), void *data)
+mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data), void *data)
{
struct _remove_folder_msg *m;
+ g_return_if_fail (folder != NULL);
+
m = mail_msg_new (&remove_folder_info);
- m->uri = g_strdup (uri);
+ m->folder = folder;
+ camel_object_ref (folder);
m->data = data;
m->done = done;
Modified: branches/kill-bonobo/mail/mail-ops.h
==============================================================================
--- branches/kill-bonobo/mail/mail-ops.h (original)
+++ branches/kill-bonobo/mail/mail-ops.h Wed Oct 1 20:56:04 2008
@@ -111,8 +111,8 @@
void *data);
/* remove an existing folder */
-void mail_remove_folder (const char *uri,
- void (*done) (char *uri, gboolean removed, void *data),
+void mail_remove_folder (CamelFolder *folder,
+ void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data),
void *data);
/* transfer (copy/move) a folder */
Modified: branches/kill-bonobo/mail/mail-send-recv.c
==============================================================================
--- branches/kill-bonobo/mail/mail-send-recv.c (original)
+++ branches/kill-bonobo/mail/mail-send-recv.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Michael Zucchi <NotZed ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Michael Zucchi <NotZed ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -415,6 +415,10 @@
g_object_unref (iter);
+ /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */
+ if (outbox && destination && camel_folder_get_message_count (outbox) == 0)
+ num_sources--;
+
table = gtk_table_new (num_sources, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
@@ -539,7 +543,8 @@
target = em_event_target_new_send_receive (em_event_peek(), table, data, row, EM_EVENT_SEND_RECEIVE);
e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
- if (outbox && destination) {
+ /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */
+ if (outbox && destination && camel_folder_get_message_count (outbox) != 0) {
info = g_hash_table_lookup (data->active, SEND_URI_KEY);
if (info == NULL) {
info = g_malloc0 (sizeof (*info));
@@ -601,9 +606,9 @@
g_signal_connect (
cancel_button, "clicked",
G_CALLBACK (receive_cancel), info);
- gtk_widget_show_all (table);
}
+ gtk_widget_show_all (table);
gtk_widget_show (GTK_WIDGET (gd));
g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data);
Modified: branches/kill-bonobo/mail/mail-session.c
==============================================================================
--- branches/kill-bonobo/mail/mail-session.c (original)
+++ branches/kill-bonobo/mail/mail-session.c Wed Oct 1 20:56:04 2008
@@ -171,7 +171,7 @@
char *ret = NULL;
EAccount *account = NULL;
- url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL;
+ url = service ? camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL & (~CAMEL_URL_HIDE_AUTH)) : NULL;
if (!strcmp(item, "popb4smtp_uri")) {
/* not 100% mt safe, but should be ok */
@@ -286,20 +286,13 @@
static void user_message_exec (struct _user_message_msg *m);
-/* clicked, send back the reply */
static void
-user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
+user_message_response_free (GtkDialog *dialog, int button, struct _user_message_msg *m)
{
gtk_widget_destroy ((GtkWidget *) dialog);
user_message_dialog = NULL;
- /* if !allow_cancel, then we've already replied */
- if (m->allow_cancel) {
- m->result = button == GTK_RESPONSE_OK;
- e_flag_set (m->done);
- }
-
/* check for pendings */
if (!g_queue_is_empty (&user_message_queue)) {
m = g_queue_pop_head (&user_message_queue);
@@ -308,6 +301,19 @@
}
}
+/* clicked, send back the reply */
+static void
+user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
+{
+ /* if !allow_cancel, then we've already replied */
+ if (m->allow_cancel) {
+ m->result = button == GTK_RESPONSE_OK;
+ e_flag_set (m->done);
+ }
+
+ user_message_response_free (dialog, button, m);
+}
+
static void
user_message_exec (struct _user_message_msg *m)
{
@@ -364,7 +370,7 @@
} else {
g_signal_connect (
user_message_dialog, "response",
- G_CALLBACK (user_message_response), m);
+ G_CALLBACK (user_message_response_free), m);
g_object_set_data (
user_message_dialog, "response-handled",
GINT_TO_POINTER (TRUE));
@@ -375,8 +381,8 @@
static void
user_message_free (struct _user_message_msg *m)
{
- g_free(m->prompt);
- e_flag_free(m->done);
+ g_free (m->prompt);
+ e_flag_free (m->done);
}
static MailMsgInfo user_message_info = {
Modified: branches/kill-bonobo/mail/mail-vfolder.c
==============================================================================
--- branches/kill-bonobo/mail/mail-vfolder.c (original)
+++ branches/kill-bonobo/mail/mail-vfolder.c Wed Oct 1 20:56:04 2008
@@ -956,6 +956,9 @@
g_signal_connect(context, "rule_added", G_CALLBACK(context_rule_added), context);
g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
+ /* load store to mail component */
+ mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders"));
+
/* and setup the rules we have */
rule = NULL;
while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
@@ -966,9 +969,6 @@
d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule));
}
- /* load store to mail component at the end, when everything is loaded */
- mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders"));
-
g_free(storeuri);
/* reenable the feature if required */
Modified: branches/kill-bonobo/mail/message-list.c
==============================================================================
--- branches/kill-bonobo/mail/message-list.c (original)
+++ branches/kill-bonobo/mail/message-list.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Miguel de Icaza (miguel ximian com)
- * Bertrand Guiheneuf (bg aful org)
- * And just about everyone else in evolution ...
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Miguel de Icaza (miguel ximian com)
+ * Bertrand Guiheneuf (bg aful org)
+ * And just about everyone else in evolution ...
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -235,6 +235,7 @@
{ "stock_score-highest", NULL },
{ "stock_mail-flag-for-followup", NULL },
{ "stock_mail-flag-for-followup-done", NULL },
+ { "stock_new-meeting", NULL }
};
/* FIXME: junk prefs */
@@ -1267,6 +1268,61 @@
return count;
}
+static const char *
+get_trimmed_subject (CamelMessageInfo *info)
+{
+ const char *subject;
+ const char *mlist;
+ int mlist_len = 0;
+ gboolean found_mlist;
+
+ subject = camel_message_info_subject (info);
+ if (!subject || !*subject)
+ return subject;
+
+ mlist = camel_message_info_mlist (info);
+
+ if (mlist && *mlist) {
+ const char *mlist_end;
+
+ mlist_end = strchr (mlist, '@');
+ if (mlist_end)
+ mlist_len = mlist_end - mlist;
+ else
+ mlist_len = strlen (mlist);
+ }
+
+ do {
+ found_mlist = FALSE;
+
+ while (!g_ascii_strncasecmp ((char *) subject, "Re:", 3)) {
+ subject += 3;
+
+ /* jump over any spaces */
+ while (*subject && isspace ((int) *subject))
+ subject++;
+ }
+
+ if (mlist_len &&
+ *subject == '[' &&
+ !g_ascii_strncasecmp ((char *) subject + 1, mlist, mlist_len) &&
+ subject [1 + mlist_len] == ']') {
+ subject += 1 + mlist_len + 1; /* jump over "[mailing-list]" */
+ found_mlist = TRUE;
+
+ /* jump over any spaces */
+ while (*subject && isspace ((int) *subject))
+ subject++;
+ }
+ } while (found_mlist);
+
+ /* jump over any spaces */
+ while (*subject && isspace ((int) *subject))
+ subject++;
+
+ return subject;
+}
+
static void *
ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
{
@@ -1340,6 +1396,8 @@
str = camel_message_info_user_tag(msg_info, "follow-up");
return (void *)(str ? str : "");
case COL_ATTACHMENT:
+ if (camel_message_info_user_flag (msg_info, "$has_cal"))
+ return GINT_TO_POINTER (2);
return GINT_TO_POINTER ((camel_message_info_flags(msg_info) & CAMEL_MESSAGE_ATTACHMENTS) != 0);
case COL_FROM:
str = camel_message_info_from (msg_info);
@@ -1349,6 +1407,9 @@
case COL_SUBJECT:
str = camel_message_info_subject (msg_info);
return (void *)(str ? str : "");
+ case COL_SUBJECT_TRIMMED:
+ str = get_trimmed_subject (msg_info);
+ return (void *)(str ? str : "");
case COL_SUBJECT_NORM:
return (void *) get_normalised_string (message_list, msg_info, col);
case COL_SENT: {
@@ -1734,8 +1795,9 @@
for (i = 0; i < 2; i++)
images [i] = states_pixmaps [i + 6].pixbuf;
+ images [2] = states_pixmaps [18].pixbuf;
- e_table_extras_add_cell (extras, "render_attachment", e_cell_toggle_new (0, 2, images));
+ e_table_extras_add_cell (extras, "render_attachment", e_cell_toggle_new (0, 3, images));
images [1] = states_pixmaps [8].pixbuf;
e_table_extras_add_cell (extras, "render_flagged", e_cell_toggle_new (0, 2, images));
Modified: branches/kill-bonobo/mail/message-list.etspec
==============================================================================
--- branches/kill-bonobo/mail/message-list.etspec (original)
+++ branches/kill-bonobo/mail/message-list.etspec Wed Oct 1 20:56:04 2008
@@ -7,15 +7,15 @@
<ETableColumn model_col="3" _title="Attachment" pixbuf="attachment" expansion="0.0" minimum_width="18" resizable="false" cell="render_attachment" compare="integer" />
- <ETableColumn model_col="4" compare_col="19" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/>
+ <ETableColumn model_col="4" compare_col="20" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/>
- <ETableColumn model_col="5" compare_col="20" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
+ <ETableColumn model_col="5" compare_col="21" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
<ETableColumn model_col="6" _title="Date" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
<ETableColumn model_col="7" _title="Received" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
- <ETableColumn model_col="8" compare_col="21" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="5"/>
+ <ETableColumn model_col="8" compare_col="22" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="5"/>
<ETableColumn model_col="9" _title="Size" expansion="0.2" minimum_width="32" resizable="true" cell="render_size" compare="integer"/>
@@ -33,6 +33,8 @@
<ETableColumn model_col="17" _title="Sent Messages" expansion="1.0" minimum_width="32" resizable="true" cell="render_composite_to" compare="address_compare" search="string" priority="10" sortable="false"/>
<ETableColumn model_col="18" _title="Labels" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="string" search="string" priority="10"/>
+ <ETableColumn model_col="19" compare_col="21" _title="Subject - Trimmed" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
+
<ETableState>
<column source="0"/> <column source="3"/> <column source="1"/>
<column source="4"/> <column source="5" expansion="1.60"/> <column source="6" expansion="0.40"/>
Modified: branches/kill-bonobo/mail/message-list.h
==============================================================================
--- branches/kill-bonobo/mail/message-list.h (original)
+++ branches/kill-bonobo/mail/message-list.h Wed Oct 1 20:56:04 2008
@@ -60,6 +60,9 @@
COL_MIXED_RECIPIENTS,
COL_LABELS,
+ /* subject with junk removed */
+ COL_SUBJECT_TRIMMED,
+
/* normalised strings */
COL_FROM_NORM,
COL_SUBJECT_NORM,
Modified: branches/kill-bonobo/plugins/attachment-reminder/attachment-reminder.c
==============================================================================
--- branches/kill-bonobo/plugins/attachment-reminder/attachment-reminder.c (original)
+++ branches/kill-bonobo/plugins/attachment-reminder/attachment-reminder.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Author: Johnny Jacob <jjohnny novell com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Johnny Jacob <jjohnny novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/audio-inline/org-gnome-audio-inline.eplug.xml (original)
+++ branches/kill-bonobo/plugins/audio-inline/org-gnome-audio-inline.eplug.xml Wed Oct 1 20:56:04 2008
@@ -6,7 +6,7 @@
location="@PLUGINDIR@/liborg-gnome-audio-inline SOEXT@"
_name="Audio inline plugin">
- <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution.</_description>
+ <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from Evolution.</_description>
<author name="Radek DoulÃk" email="rodo novell com"/>
<hook class="org.gnome.evolution.mail.format:1.0">
Modified: branches/kill-bonobo/plugins/bbdb/bbdb.c
==============================================================================
--- branches/kill-bonobo/plugins/bbdb/bbdb.c (original)
+++ branches/kill-bonobo/plugins/bbdb/bbdb.c Wed Oct 1 20:56:04 2008
@@ -1,34 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * An Evolution EPlugin that automatically populates your addressbook
- * as you reply to messages. Inspired by an Emacs contact management
- * tool called The Insidious Big Brother Database, a jwz joint.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Nat Friedman
- * 22 October 2004
- * Boston
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Authors:
+ * Nat Friedman <nat novell com>
*
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
@@ -143,33 +132,120 @@
return TRUE;
}
-/* Code to populate addressbook when you reply to a mail follows */
+typedef struct
+{
+ char *name;
+ char *email;
+} todo_struct;
-void
-bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target)
+static void
+free_todo_struct (todo_struct *td)
{
- const CamelInternetAddress *cia;
- EBook *book = NULL;
- int i;
+ if (td) {
+ g_free (td->name);
+ g_free (td->email);
+ g_free (td);
+ }
+}
+
+static GSList *todo = NULL;
+G_LOCK_DEFINE_STATIC (todo);
+
+static gpointer
+bbdb_do_in_thread (gpointer data)
+{
+ EBook *book;
/* Open the addressbook */
book = bbdb_open_addressbook (AUTOMATIC_CONTACTS_ADDRESSBOOK);
- if (book == NULL)
+ if (book == NULL) {
+ G_LOCK (todo);
+
+ g_slist_foreach (todo, (GFunc)free_todo_struct, NULL);
+ g_slist_free (todo);
+ todo = NULL;
+
+ G_UNLOCK (todo);
+ return NULL;
+ }
+
+ G_LOCK (todo);
+ while (todo) {
+ todo_struct *td = todo->data;
+
+ todo = g_slist_remove (todo, td);
+
+ G_UNLOCK (todo);
+
+ if (td) {
+ bbdb_do_it (book, td->name, td->email);
+ free_todo_struct (td);
+ }
+
+ G_LOCK (todo);
+ }
+ G_UNLOCK (todo);
+
+ g_object_unref (book);
+
+ return NULL;
+}
+
+static void
+bbdb_do_thread (const char *name, const char *email)
+{
+ todo_struct *td;
+
+ if (!name && !email)
return;
+ td = g_new (todo_struct, 1);
+ td->name = g_strdup (name);
+ td->email = g_strdup (email);
+
+ G_LOCK (todo);
+ if (todo) {
+ /* the list isn't empty, which means there is a thread taking
+ care of that, thus just add it to the queue */
+ todo = g_slist_append (todo, td);
+ } else {
+ GError *error = NULL;
+
+ /* list was empty, add item and create a thread */
+ todo = g_slist_append (todo, td);
+ g_thread_create (bbdb_do_in_thread, NULL, FALSE, &error);
+
+ if (error) {
+ g_warning ("%s: Creation of the thread failed with error: %s", G_STRFUNC, error->message);
+ g_error_free (error);
+
+ G_UNLOCK (todo);
+ bbdb_do_in_thread (NULL);
+ G_LOCK (todo);
+ }
+ }
+ G_UNLOCK (todo);
+}
+
+/* Code to populate addressbook when you reply to a mail follows */
+void
+bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target)
+{
+ const CamelInternetAddress *cia;
+ int i;
+
cia = camel_mime_message_get_from (target->message);
if (cia) {
for (i = 0; i < camel_address_length (CAMEL_ADDRESS (cia)); i ++) {
const char *name=NULL, *email=NULL;
if (!(camel_internet_address_get (cia, i, &name, &email)))
continue;
- bbdb_do_it (book, name, email);
+ bbdb_do_thread (name, email);
}
}
/* If this is a reply-all event, process To: and Cc: also. */
if (((EEventTarget *) target)->mask & EM_EVENT_MESSAGE_REPLY_ALL) {
- g_object_unref (G_OBJECT (book));
return;
}
@@ -179,7 +255,7 @@
const char *name=NULL, *email=NULL;
if (!(camel_internet_address_get (cia, i, &name, &email)))
continue;
- bbdb_do_it (book, name, email);
+ bbdb_do_thread (name, email);
}
}
@@ -189,11 +265,9 @@
const char *name=NULL, *email=NULL;
if (!(camel_internet_address_get (cia, i, &name, &email)))
continue;
- bbdb_do_it (book, name, email);
+ bbdb_do_thread (name, email);
}
}
-
- g_object_unref (G_OBJECT (book));
}
static void
@@ -446,12 +520,11 @@
GError *error = NULL;
source = e_source_combo_box_get_active (source_combo_box);
- g_return_if_fail (source != NULL);
gconf_client_set_string (
stuff->target->gconf,
GCONF_KEY_WHICH_ADDRESSBOOK,
- e_source_get_uri (source), &error);
+ source ? e_source_get_uri (source) : "", &error);
if (error != NULL) {
g_warning ("%s", error->message);
@@ -467,12 +540,11 @@
GError *error = NULL;
source = e_source_combo_box_get_active (source_combo_box);
- g_return_if_fail (source != NULL);
gconf_client_set_string (
stuff->target->gconf,
GCONF_KEY_WHICH_ADDRESSBOOK_GAIM,
- e_source_get_uri (source), &error);
+ source ? e_source_get_uri (source) : "", &error);
if (error != NULL) {
g_warning ("%s", error->message);
Modified: branches/kill-bonobo/plugins/default-mailer/default-mailer.c
==============================================================================
--- branches/kill-bonobo/plugins/default-mailer/default-mailer.c (original)
+++ branches/kill-bonobo/plugins/default-mailer/default-mailer.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Author: Jonathan Dieter <jdieter99 gmx net>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright 2005 Jonathan Dieter
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Jonathan Dieter <jdieter99 gmx net>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright 2005 Jonathan Dieter
*
*/
Modified: branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c (original)
+++ branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Ashish Shrivastava <shashish novell com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Ashish Shrivastava <shashish novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, MA 02110-1301.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/plugins/email-custom-header/email-custom-header.h
==============================================================================
--- branches/kill-bonobo/plugins/email-custom-header/email-custom-header.h (original)
+++ branches/kill-bonobo/plugins/email-custom-header/email-custom-header.h Wed Oct 1 20:56:04 2008
@@ -1,20 +1,25 @@
- /* Evolution Email custom header options
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Ashish <shashish novell com>
- *
+/*
+ * Evolution Email custom header options
+ *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Ashish <shashish novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, MA 02110-1301.
*/
#ifndef __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__
Modified: branches/kill-bonobo/plugins/exchange-operations/exchange-config-listener.c
==============================================================================
--- branches/kill-bonobo/plugins/exchange-operations/exchange-config-listener.c (original)
+++ branches/kill-bonobo/plugins/exchange-operations/exchange-config-listener.c Wed Oct 1 20:56:04 2008
@@ -776,7 +776,7 @@
}
if (current_quota_usage) {
- widget = e_error_new (NULL, error_code, current_quota_usage);
+ widget = e_error_new (NULL, error_code, current_quota_usage, NULL);
g_signal_connect ((GtkDialog *)widget, "response",
G_CALLBACK (gtk_widget_destroy), widget);
gtk_widget_show (widget);
Modified: branches/kill-bonobo/plugins/exchange-operations/exchange-delegates-user.c
==============================================================================
--- branches/kill-bonobo/plugins/exchange-operations/exchange-delegates-user.c (original)
+++ branches/kill-bonobo/plugins/exchange-operations/exchange-delegates-user.c Wed Oct 1 20:56:04 2008
@@ -1,20 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* Copyright (C) 2002-2004 Novell, Inc.
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
/* ExchangeDelegatesUser: A single delegate */
Modified: branches/kill-bonobo/plugins/exchange-operations/exchange-user-dialog.c
==============================================================================
--- branches/kill-bonobo/plugins/exchange-operations/exchange-user-dialog.c (original)
+++ branches/kill-bonobo/plugins/exchange-operations/exchange-user-dialog.c Wed Oct 1 20:56:04 2008
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Copyright (C) 2001-2004 Novell, Inc.
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
#ifdef HAVE_CONFIG_H
Modified: branches/kill-bonobo/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml (original)
+++ branches/kill-bonobo/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml Wed Oct 1 20:56:04 2008
@@ -4,7 +4,7 @@
location="@PLUGINDIR@/liborg-gnome-evolution-google SOEXT@" load-on-startup="false" localedir = "@LOCALEDIR@" system_plugin="true">
<author name="Ebby Wiselyn" email="ebbywiselyn gmail com"/>
<author name="Joergen Scheibengruber" email="joergen scheibengruber googlemail com"/>
- <_description>A plugin to setup google calendar and contacts.</_description>
+ <_description>A plugin to setup Google Calendar and Contacts.</_description>
<hook class="org.gnome.evolution.calendar.config:1.0">
<group target="source" id="org.gnome.evolution.calendar.calendarProperties">
Modified: branches/kill-bonobo/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml (original)
+++ branches/kill-bonobo/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml Wed Oct 1 20:56:04 2008
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<e-plugin-list>
- <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup"
+ <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="GroupWise Account Setup"
location="@PLUGINDIR@/liborg-gnome-gw-account-setup SOEXT@" load-on-startup="true" system_plugin="true">
<author name="Sivaiah Nallagatla" email="snallagatla novell com"/>
- <_description>A plugin to setup groupwise calendar and contacts sources.</_description>
+ <_description>A plugin to setup GroupWise calendar and contacts sources.</_description>
<hook class="org.gnome.evolution.mail.config:1.0">
<group target="account" id="org.gnome.evolution.mail.config.accountDruid">
Modified: branches/kill-bonobo/plugins/groupwise-features/install-shared.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/install-shared.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/install-shared.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors: Vivek Jain <jvivek novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Vivek Jain <jvivek novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/groupwise-features/junk-settings.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/junk-settings.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/junk-settings.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Author: Vivek Jain <jvivek novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Vivek Jain <jvivek novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/groupwise-features/org-gnome-compose-send-options.xml
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/org-gnome-compose-send-options.xml (original)
+++ branches/kill-bonobo/plugins/groupwise-features/org-gnome-compose-send-options.xml Wed Oct 1 20:56:04 2008
@@ -1,7 +1,7 @@
<Root>
<commands>
<cmd name="EPSOSendOptions" _label="Send Options"
- _tip="Add Send Options to groupwise messages"/>
+ _tip="Add Send Options to GroupWise messages"/>
</commands>
<menu>
Modified: branches/kill-bonobo/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml (original)
+++ branches/kill-bonobo/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml Wed Oct 1 20:56:04 2008
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<e-plugin-list>
- <e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="Groupwise Features"
+ <e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="GroupWise Features"
location="@PLUGINDIR@/liborg-gnome-groupwise-features SOEXT@">
<author name="Sivaiah Nallagatla" email="snallagatla novell com" />
<author name="Vivek Jain" email="jvivek novell com" />
@@ -10,7 +10,7 @@
<author name="Shreyas Srinivasan" email="sshreyas novell com"/>
<author name="Raghavendran R" email="raghavguru7 gmail com"/>
- <_description>A plugin for the features in Groupwise accounts.</_description>
+ <_description>A plugin for the features in GroupWise accounts.</_description>
<hook class="org.gnome.evolution.mail.config:1.0">
<group id="org.gnome.evolution.mail.folderConfig" target="folder"
check= "shared_folder_check"
Modified: branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-errors.xml
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-errors.xml (original)
+++ branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-errors.xml Wed Oct 1 20:56:04 2008
@@ -2,6 +2,7 @@
<error-list domain="org.gnome.evolution.proxy">
<error id="invalid-user" type="error">
<_primary>Invalid user</_primary>
+<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation -->
<_secondary>
Proxy access cannot be given to user "{0}"
</_secondary>
@@ -9,6 +10,7 @@
<error id="no-user" type="error">
<_primary>Specify User</_primary>
+<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation -->
<_secondary>
You have to specify a valid user name to give proxy rights.
</_secondary>
@@ -16,6 +18,7 @@
<error id="user-is-proxy" type="error">
<_primary>Specify User</_primary>
+<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation -->
<_secondary>
You have already given proxy permissions to this user.
</_secondary>
Modified: branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-login-errors.xml (original)
+++ branches/kill-bonobo/plugins/groupwise-features/org-gnome-proxy-login-errors.xml Wed Oct 1 20:56:04 2008
@@ -3,6 +3,7 @@
<error id="invalid-user" type="error">
<_primary>Invalid user</_primary>
<_secondary>
+<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation-->
Proxy login as "{0}" was unsuccessful. Please check your email address and try again.
</_secondary>
</error>
Modified: branches/kill-bonobo/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/org-gnome-shared-folder.errors.xml (original)
+++ branches/kill-bonobo/plugins/groupwise-features/org-gnome-shared-folder.errors.xml Wed Oct 1 20:56:04 2008
@@ -4,19 +4,20 @@
<error id="invalid-user" type="error">
<_primary>Invalid user</_primary>
<_secondary>
-You cannot share folder with specified user "{0}"
+You cannot share this folder with the specified user "{0}"
</_secondary>
</error>
<error id="no-user" type="error">
<_primary>Specify User</_primary>
<_secondary>
- You have to specify a user name whom you want to add to the list
+ You have to specify a user name which you want to add to the list
</_secondary>
</error>
<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES">
<_primary>This is a recurring meeting</_primary>
+<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
<_secondary>Would you like to accept it?</_secondary>
<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
<button label="This instance" response="GTK_RESPONSE_NO"/>
@@ -25,6 +26,7 @@
<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES">
<_primary>This is a recurring meeting</_primary>
+<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
<_secondary>Would you like to decline it?</_secondary>
<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
<button label="This instance" response="GTK_RESPONSE_NO"/>
Modified: branches/kill-bonobo/plugins/groupwise-features/proxy-listing.glade
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/proxy-listing.glade (original)
+++ branches/kill-bonobo/plugins/groupwise-features/proxy-listing.glade Wed Oct 1 20:56:04 2008
@@ -169,7 +169,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Proxy</property>
+ <property name="label" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: branches/kill-bonobo/plugins/groupwise-features/proxy-login-dialog.glade
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/proxy-login-dialog.glade (original)
+++ branches/kill-bonobo/plugins/groupwise-features/proxy-login-dialog.glade Wed Oct 1 20:56:04 2008
@@ -7,7 +7,7 @@
<widget class="GtkDialog" id="proxy_login_dialog">
<property name="visible">True</property>
<property name="height_request">325</property>
- <property name="title" translatable="yes">Proxy Login</property>
+ <property name="title" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy Login</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">True</property>
Modified: branches/kill-bonobo/plugins/groupwise-features/proxy-login.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/proxy-login.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/proxy-login.c Wed Oct 1 20:56:04 2008
@@ -219,7 +219,7 @@
}
static EGwConnection *
-proxy_login_get_cnc (EAccount *account)
+proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
{
EGwConnection *cnc;
CamelURL *url;
@@ -254,7 +254,7 @@
if (!password)
password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
- E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL);
+ E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, password_dlg_parrent);
g_free (prompt);
cnc = e_gw_connection_new (uri, url->user, password);
@@ -333,7 +333,7 @@
}
srcAccount = pld->account;
- cnc = proxy_login_get_cnc(srcAccount);
+ cnc = proxy_login_get_cnc (srcAccount, NULL);
proxy_get_password (srcAccount, &user_name, &password);
proxy_cnc = e_gw_connection_get_proxy_connection (cnc, user_name, password, email, &permissions);
@@ -444,10 +444,11 @@
EGwConnection *cnc;
proxyLoginPrivate *priv = pld->priv;
gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48);
- broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
+ broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL;
- cnc = proxy_login_get_cnc(pld->account);
- e_gw_connection_get_proxy_list (cnc, &proxy_list);
+ cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL);
+ if (cnc)
+ e_gw_connection_get_proxy_list (cnc, &proxy_list);
gtk_tree_store_clear (priv->store);
if (proxy_list != NULL) {
@@ -465,7 +466,8 @@
if (broken_image)
g_object_unref (broken_image);
- g_object_unref (cnc);
+ if (cnc)
+ g_object_unref (cnc);
}
void
@@ -477,8 +479,9 @@
char *gladefile;
/* This pops-up the password dialog in case the User has forgot-passwords explicitly */
- cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri));
- g_object_unref (cnc);
+ cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri), NULL);
+ if (cnc)
+ g_object_unref (cnc);
pld = proxy_login_new();
priv = pld->priv;
Modified: branches/kill-bonobo/plugins/groupwise-features/proxy.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/proxy.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/proxy.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Shreyas Srinivasan (sshreyas novell com)
- * Sankar P ( psankar novell com )
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Shreyas Srinivasan <sshreyas novell com>
+ * Sankar P <psankar novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -688,15 +688,18 @@
} else if (account->enabled){
GtkWidget *label;
priv->tab_dialog = gtk_vbox_new (TRUE, 10);
+ /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/
label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
} else {
GtkWidget *label;
priv->tab_dialog = gtk_vbox_new (TRUE, 10);
+ /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/
label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled."));
gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
}
+ /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/
gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
Modified: branches/kill-bonobo/plugins/groupwise-features/send-options.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/send-options.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/send-options.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Chenthill Palanisamy (pchenthill novell com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Chenthill Palanisamy <pchenthill novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -200,15 +202,19 @@
target_account = (EMConfigTargetAccount *)data->config->target;
account = target_account->account;
+ gchar *markup;
+
if(!g_strrstr (account->source->url, "groupwise://"))
return NULL;
vbox = gtk_vbox_new (FALSE, 0);
frame = gtk_frame_new ("");
label = gtk_frame_get_label_widget (GTK_FRAME (frame));
- gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>");
- button = gtk_button_new_with_label ("Advanced send options");
+ markup = g_strdup_printf("<b>%s</b>", _("Send Options"));
+ gtk_label_set_markup (GTK_LABEL (label), markup);
+ button = gtk_button_new_with_label (_("Advanced send options"));
gtk_widget_show (button);
+ g_free (markup);
g_signal_connect(button, "clicked",
G_CALLBACK (e_sendoptions_clicked_cb), account);
Modified: branches/kill-bonobo/plugins/groupwise-features/share-folder.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/share-folder.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/share-folder.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Author: Vivek Jain <jvivek novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Vivek Jain <jvivek novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/groupwise-features/status-track.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/status-track.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/status-track.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,27 @@
/*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author(s): Chenthill Palanisamy <pchenthill novell com>
- * Parthasarathi Susarla <sparthasarathi novell com>
- * Sankar P <psankar novell com>
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chenthill Palanisamy <pchenthill novell com>
+ * Parthasarathi Susarla <sparthasarathi novell com>
+ * Sankar P <psankar novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Modified: branches/kill-bonobo/plugins/ipod-sync/evolution-ipod-sync.c
==============================================================================
--- branches/kill-bonobo/plugins/ipod-sync/evolution-ipod-sync.c (original)
+++ branches/kill-bonobo/plugins/ipod-sync/evolution-ipod-sync.c Wed Oct 1 20:56:04 2008
@@ -1,9 +1,24 @@
/*
- * evolution-ipod-sync.c - Evolution->Ipod synchronisation
+ * Evolution->Ipod synchronisation
*
- * (C)2004 Justin Wake <jwake iinet net au>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * Licensed under the GNU GPL v2. See COPYING.
+ *
+ * Authors:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * (C)2004 Justin Wake <jwake iinet net au>
*
*/
Modified: branches/kill-bonobo/plugins/ipod-sync/ical-format.c
==============================================================================
--- branches/kill-bonobo/plugins/ipod-sync/ical-format.c (original)
+++ branches/kill-bonobo/plugins/ipod-sync/ical-format.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Rodrigo Moya <rodrigo novell com>
+ * Philip Van Hoof <pvanhoof gnome org>
*
- * Authors: Rodrigo Moya <rodrigo novell com>
- * Philip Van Hoof <pvanhoof gnome org>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/ipod-sync/ipod-sync.c
==============================================================================
--- branches/kill-bonobo/plugins/ipod-sync/ipod-sync.c (original)
+++ branches/kill-bonobo/plugins/ipod-sync/ipod-sync.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Srinivasa Ragavan <sragavan novell com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Srinivasa Ragavan <sragavan novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/ipod-sync/sync.c
==============================================================================
--- branches/kill-bonobo/plugins/ipod-sync/sync.c (original)
+++ branches/kill-bonobo/plugins/ipod-sync/sync.c Wed Oct 1 20:56:04 2008
@@ -1,9 +1,20 @@
/*
- * sync.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * (C)2004 Justin Wake <jwake iinet net au>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Licensed under the GNU GPL v2. See COPYING.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2004 Justin Wake <jwake iinet net au>
*
*/
Modified: branches/kill-bonobo/plugins/itip-formatter/itip-formatter.c
==============================================================================
--- branches/kill-bonobo/plugins/itip-formatter/itip-formatter.c (original)
+++ branches/kill-bonobo/plugins/itip-formatter/itip-formatter.c Wed Oct 1 20:56:04 2008
@@ -2243,6 +2243,11 @@
classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str);
+ /* mark message as containing calendar, thus it will show the icon in message list now on */
+ if (target->format->uid && target->format->folder &&
+ !camel_folder_get_message_user_flag (target->format->folder, target->format->uid, "$has_cal"))
+ camel_folder_set_message_user_flag (target->format->folder, target->format->uid, "$has_cal", TRUE);
+
puri = (struct _itip_puri *)em_format_add_puri(target->format, sizeof(struct _itip_puri), classid, target->part, itip_attachment_frame);
pobj = em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object);
Modified: branches/kill-bonobo/plugins/itip-formatter/itip-view.c
==============================================================================
--- branches/kill-bonobo/plugins/itip-formatter/itip-view.c (original)
+++ branches/kill-bonobo/plugins/itip-formatter/itip-view.c Wed Oct 1 20:56:04 2008
@@ -1194,6 +1194,24 @@
return priv->type;
}
+/* ensures the returned text will be valid UTF-8 text, thus gtk functions expecting
+ only valid UTF-8 texts will not crash. Returned pointer should be freed with g_free. */
+static gchar *
+ensure_utf8 (const char *text)
+{
+ gchar *res = g_strdup (text), *p;
+
+ if (!text)
+ return res;
+
+ p = res;
+ while (!g_utf8_validate (p, -1, (const gchar **) &p)) {
+ /* make all invalid characters appear as question marks */
+ *p = '?';
+ }
+
+ return res;
+}
void
itip_view_set_organizer (ItipView *view, const char *organizer)
@@ -1208,7 +1226,7 @@
if (priv->organizer)
g_free (priv->organizer);
- priv->organizer = g_strdup (organizer);
+ priv->organizer = ensure_utf8 (organizer);
set_sender_text (view);
}
@@ -1239,7 +1257,7 @@
if (priv->organizer_sentby)
g_free (priv->organizer_sentby);
- priv->organizer_sentby = g_strdup (sentby);
+ priv->organizer_sentby = ensure_utf8 (sentby);
set_sender_text (view);
}
@@ -1270,7 +1288,7 @@
if (priv->attendee)
g_free (priv->attendee);
- priv->attendee = g_strdup (attendee);
+ priv->attendee = ensure_utf8 (attendee);
set_sender_text (view);
}
@@ -1301,7 +1319,7 @@
if (priv->attendee_sentby)
g_free (priv->attendee_sentby);
- priv->attendee_sentby = g_strdup (sentby);
+ priv->attendee_sentby = ensure_utf8 (sentby);
set_sender_text (view);
}
@@ -1332,7 +1350,7 @@
if (priv->proxy)
g_free (priv->proxy);
- priv->proxy = g_strdup (proxy);
+ priv->proxy = ensure_utf8 (proxy);
set_sender_text (view);
}
@@ -1363,7 +1381,7 @@
if (priv->delegator)
g_free (priv->delegator);
- priv->delegator = g_strdup (delegator);
+ priv->delegator = ensure_utf8 (delegator);
set_sender_text (view);
}
@@ -1394,7 +1412,7 @@
if (priv->summary)
g_free (priv->summary);
- priv->summary = summary ? g_strstrip (g_strdup (summary)) : NULL;
+ priv->summary = summary ? g_strstrip (ensure_utf8 (summary)) : NULL;
set_summary_text (view);
}
@@ -1425,7 +1443,7 @@
if (priv->location)
g_free (priv->location);
- priv->location = location ? g_strstrip (g_strdup (location)) : NULL;
+ priv->location = location ? g_strstrip (ensure_utf8 (location)) : NULL;
set_location_text (view);
}
@@ -1456,7 +1474,7 @@
if (priv->status)
g_free (priv->status);
- priv->status = status ? g_strstrip (g_strdup (status)) : NULL;
+ priv->status = status ? g_strstrip (ensure_utf8 (status)) : NULL;
set_status_text (view);
}
@@ -1487,7 +1505,7 @@
if (priv->comment)
g_free (priv->comment);
- priv->comment = comment ? g_strstrip (g_strdup (comment)) : NULL;
+ priv->comment = comment ? g_strstrip (ensure_utf8 (comment)) : NULL;
set_comment_text (view);
}
@@ -1519,7 +1537,7 @@
if (priv->description)
g_free (priv->description);
- priv->description = description ? g_strstrip (g_strdup (description)) : NULL;
+ priv->description = description ? g_strstrip (ensure_utf8 (description)) : NULL;
set_description_text (view);
}
@@ -1624,7 +1642,7 @@
item = g_new0 (ItipViewInfoItem, 1);
item->type = type;
- item->message = g_strdup (message);
+ item->message = ensure_utf8 (message);
item->id = priv->next_info_item_id++;
priv->upper_info_items = g_slist_append (priv->upper_info_items, item);
@@ -1719,7 +1737,7 @@
item = g_new0 (ItipViewInfoItem, 1);
item->type = type;
- item->message = g_strdup (message);
+ item->message = ensure_utf8 (message);
item->id = priv->next_info_item_id++;
priv->lower_info_items = g_slist_append (priv->lower_info_items, item);
Modified: branches/kill-bonobo/plugins/mail-notification/mail-notification.c
==============================================================================
--- branches/kill-bonobo/plugins/mail-notification/mail-notification.c (original)
+++ branches/kill-bonobo/plugins/mail-notification/mail-notification.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Author: Miguel Angel Lopez Hernandez <miguel gulev org mx>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Miguel Angel Lopez Hernandez <miguel gulev org mx>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
@@ -493,13 +494,15 @@
g_free (msg);
- #ifdef HAVE_LIBNOTIFY
- g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify);
- #else
- g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
- #endif
+ if (new_icon) {
+ #ifdef HAVE_LIBNOTIFY
+ g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify);
+ #else
+ g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
+ #endif
- g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL);
+ g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL);
+ }
}
static void
Modified: branches/kill-bonobo/plugins/mark-calendar-offline/mark-calendar-offline.c
==============================================================================
--- branches/kill-bonobo/plugins/mark-calendar-offline/mark-calendar-offline.c (original)
+++ branches/kill-bonobo/plugins/mark-calendar-offline/mark-calendar-offline.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Harish Krishnaswamy (kharish novell com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Harish Krishnaswamy <kharish novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/publish-calendar/publish-calendar.c
==============================================================================
--- branches/kill-bonobo/plugins/publish-calendar/publish-calendar.c (original)
+++ branches/kill-bonobo/plugins/publish-calendar/publish-calendar.c Wed Oct 1 20:56:04 2008
@@ -592,7 +592,7 @@
confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
- _("Are you sure you want to remove this URL?"));
+ _("Are you sure you want to remove this location?"));
gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES);
gtk_dialog_set_default_response (GTK_DIALOG (confirm), GTK_RESPONSE_CANCEL);
Modified: branches/kill-bonobo/plugins/publish-calendar/publish-calendar.glade
==============================================================================
--- branches/kill-bonobo/plugins/publish-calendar/publish-calendar.glade (original)
+++ branches/kill-bonobo/plugins/publish-calendar/publish-calendar.glade Wed Oct 1 20:56:04 2008
@@ -712,7 +712,7 @@
<child>
<widget class="GtkComboBox" id="publish_service">
<property name="visible">True</property>
- <property name="items" translatable="yes">SSH
+ <property name="items" translatable="yes">Secure FTP (SSH)
Public FTP
FTP (with login)
Windows share
Modified: branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c
==============================================================================
--- branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c (original)
+++ branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c Wed Oct 1 20:56:04 2008
@@ -54,7 +54,7 @@
method = "smb";
break;
- case TYPE_SSH:
+ case TYPE_SFTP:
method = "sftp";
break;
@@ -110,7 +110,7 @@
/* This should probably be more complex, since ' ' isn't a valid server name */
switch (uri->service_type) {
case TYPE_SMB:
- case TYPE_SSH:
+ case TYPE_SFTP:
case TYPE_FTP:
case TYPE_DAV:
case TYPE_DAVS:
@@ -160,7 +160,7 @@
gtk_widget_show (dialog->password_hbox);
gtk_widget_show (dialog->remember_pw);
break;
- case TYPE_SSH:
+ case TYPE_SFTP:
case TYPE_FTP:
case TYPE_DAV:
case TYPE_DAVS:
@@ -275,7 +275,7 @@
if (strcmp ((const char *)method, "smb") == 0)
uri->service_type = TYPE_SMB;
else if (strcmp ((const char *)method, "sftp") == 0)
- uri->service_type = TYPE_SSH;
+ uri->service_type = TYPE_SFTP;
else if (strcmp ((const char *)method, "ftp") == 0)
/* we set TYPE_FTP here for now. if we don't find a
* username later, we'll change it to TYPE_ANON_FTP */
Modified: branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.h
==============================================================================
--- branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.h (original)
+++ branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.h Wed Oct 1 20:56:04 2008
@@ -44,7 +44,7 @@
};
enum {
- TYPE_SSH,
+ TYPE_SFTP,
TYPE_ANON_FTP,
TYPE_FTP,
TYPE_SMB,
Modified: branches/kill-bonobo/plugins/python/org-gnome-evolution-python.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/python/org-gnome-evolution-python.eplug.xml (original)
+++ branches/kill-bonobo/plugins/python/org-gnome-evolution-python.eplug.xml Wed Oct 1 20:56:04 2008
@@ -3,7 +3,7 @@
<e-plugin type="shlib" id="org.gnome.evolution.plugin.python"
location="@PLUGINDIR@/liborg-gnome-evolution-python SOEXT@" _name="Python Loader" load_level="1">
- <_description>A plugin which loads other plugins written using python.</_description>
+ <_description>A plugin which loads other plugins written using Python.</_description>
<author name="Johnny Jacob" email="jjohnny novell com"/>
</e-plugin>
Modified: branches/kill-bonobo/plugins/python/python-plugin-loader.c
==============================================================================
--- branches/kill-bonobo/plugins/python/python-plugin-loader.c (original)
+++ branches/kill-bonobo/plugins/python/python-plugin-loader.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Author: Johnny Jacob <jjohnny novell com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Johnny Jacob <jjohnny novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/python/python-plugin-loader.h
==============================================================================
--- branches/kill-bonobo/plugins/python/python-plugin-loader.h (original)
+++ branches/kill-bonobo/plugins/python/python-plugin-loader.h Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Author: Johnny Jacob <jjohnny novell com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Johnny Jacob <jjohnny novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/sa-junk-plugin/em-junk-filter.c
==============================================================================
--- branches/kill-bonobo/plugins/sa-junk-plugin/em-junk-filter.c (original)
+++ branches/kill-bonobo/plugins/sa-junk-plugin/em-junk-filter.c Wed Oct 1 20:56:04 2008
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Author:
- * Radek Doulik <rodo ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Radek Doulik <rodo ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -138,7 +137,7 @@
if (pipe (fds) == -1) {
errnosav = errno;
- d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+ d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno)));
g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav));
errno = errnosav;
return rv_err;
@@ -146,7 +145,7 @@
if (output_buffer && pipe (out_fds) == -1) {
errnosav = errno;
- d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+ d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno)));
g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav));
close (fds [0]);
close (fds [1]);
@@ -243,7 +242,7 @@
result = waitpid (pid, &status, WNOHANG);
g_set_error (error, EM_JUNK_ERROR, -2, _("SpamAssassin child process does not respond, killing..."));
} else
- g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Spamassassin child process interrupted, terminating..."));
+ g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for SpamAssassin child process interrupted, terminating..."));
}
if (result != -1 && WIFEXITED (status))
@@ -541,7 +540,7 @@
em_junk_sa_kill_spamd ();
if (em_junk_sa_check_respawn_too_fast ()) {
- g_warning ("respawning of spamd too fast => fallback to use spamassassin directly");
+ g_warning ("respawning of spamd too fast => fallback to use SpamAssassin directly");
em_junk_sa_use_spamc = em_junk_sa_use_daemon = FALSE;
return FALSE;
@@ -594,7 +593,7 @@
rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out, &target->error) != 0;
- if (!rv && out && !strcmp ((const char *)out->data, "0/0\n")) {
+ if (!rv && out && out->data && !strcmp ((const char *)out->data, "0/0\n")) {
/* an error occurred */
if (em_junk_sa_respawn_spamd ()) {
g_byte_array_set_size (out, 0);
Modified: branches/kill-bonobo/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml (original)
+++ branches/kill-bonobo/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml Wed Oct 1 20:56:04 2008
@@ -18,7 +18,7 @@
<!-- hook into the 'mail properties' menu -->
<hook class="org.gnome.evolution.mail.config:1.0">
<group target="prefs" id="org.gnome.evolution.mail.prefs">
- <item type="section_table" path="40.junk/10.options" _label="Spamassassin Options"/>
+ <item type="section_table" path="40.junk/10.options" _label="SpamAssassin Options"/>
<item type="item_table" path="40.junk/20.options" factory="org_gnome_sa_use_remote_tests"/>
</group>
</hook>
Modified: branches/kill-bonobo/plugins/save-attachments/save-attachments.c
==============================================================================
--- branches/kill-bonobo/plugins/save-attachments/save-attachments.c (original)
+++ branches/kill-bonobo/plugins/save-attachments/save-attachments.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Michael Zucchi <notzed ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/save-calendar/csv-format.c
==============================================================================
--- branches/kill-bonobo/plugins/save-calendar/csv-format.c (original)
+++ branches/kill-bonobo/plugins/save-calendar/csv-format.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Philip Van Hoof <pvanhoof gnome org>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Philip Van Hoof <pvanhoof gnome org>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/save-calendar/ical-format.c
==============================================================================
--- branches/kill-bonobo/plugins/save-calendar/ical-format.c (original)
+++ branches/kill-bonobo/plugins/save-calendar/ical-format.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Rodrigo Moya <rodrigo novell com>
+ * Philip Van Hoof <pvanhoof gnome org>
*
- * Authors: Rodrigo Moya <rodrigo novell com>
- * Philip Van Hoof <pvanhoof gnome org>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/save-calendar/rdf-format.c
==============================================================================
--- branches/kill-bonobo/plugins/save-calendar/rdf-format.c (original)
+++ branches/kill-bonobo/plugins/save-calendar/rdf-format.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Philip Van Hoof <pvanhoof gnome org>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Philip Van Hoof <pvanhoof gnome org>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/save-calendar/save-calendar.c
==============================================================================
--- branches/kill-bonobo/plugins/save-calendar/save-calendar.c (original)
+++ branches/kill-bonobo/plugins/save-calendar/save-calendar.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors: Rodrigo Moya <rodrigo novell com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Authors:
+ * Rodrigo Moya <rodrigo novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/plugins/startup-wizard/startup-wizard.c
==============================================================================
--- branches/kill-bonobo/plugins/startup-wizard/startup-wizard.c (original)
+++ branches/kill-bonobo/plugins/startup-wizard/startup-wizard.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * JP Rosevear <jpr novell com>
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * JP Rosevear <jpr novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include <gconf/gconf-client.h>
Modified: branches/kill-bonobo/plugins/templates/templates.c
==============================================================================
--- branches/kill-bonobo/plugins/templates/templates.c (original)
+++ branches/kill-bonobo/plugins/templates/templates.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,25 @@
/*
- * templates.c
- * This file is part of Draft Templates plugin for Evolution
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Diego Escalante Urrelo <diegoe gnome org>
- * Bharath Acharya <abharath novell com>
- * Copyright (C) 2008 - Diego Escalante Urrelo
- * Bharath Acharya
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Draft Templates is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * Draft Templates is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with Draft Templates; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * Authors:
+ * Diego Escalante Urrelo <diegoe gnome org>
+ * Bharath Acharya <abharath novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2008 - Diego Escalante Urrelo
+ *
*/
#include <gtk/gtk.h>
Modified: branches/kill-bonobo/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
==============================================================================
--- branches/kill-bonobo/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml (original)
+++ branches/kill-bonobo/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml Wed Oct 1 20:56:04 2008
@@ -5,7 +5,7 @@
id="org.gnome.evolution.mail.tnefattachments"
location="@PLUGINDIR@/liborg-gnome-tnef-attachments SOEXT@"
_name="TNEF Attachment decoder">
- <_description>A simple plugin which uses ytnef to decode tnef attachments.</_description>
+ <_description>A simple plugin which uses yTNEF to decode TNEF attachments.</_description>
<author name="Lucky Wankhede" email="wlakke novell com"/>
<hook class="org.gnome.evolution.mail.format:1.0">
Modified: branches/kill-bonobo/plugins/webdav-account-setup/webdav-contacts-source.c
==============================================================================
--- branches/kill-bonobo/plugins/webdav-account-setup/webdav-contacts-source.c (original)
+++ branches/kill-bonobo/plugins/webdav-account-setup/webdav-contacts-source.c Wed Oct 1 20:56:04 2008
@@ -335,7 +335,7 @@
uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON(
gtk_check_button_new_with_mnemonic(
- _("_Avoid IfMatch (needed on apache < 2.2.8)")));
+ _("_Avoid IfMatch (needed on Apache < 2.2.8)")));
gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle),
FALSE, FALSE, 0);
Modified: branches/kill-bonobo/shell/e-config-upgrade.c
==============================================================================
--- branches/kill-bonobo/shell/e-config-upgrade.c (original)
+++ branches/kill-bonobo/shell/e-config-upgrade.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-upgrade.c - upgrade previous config versions
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Michael Zucchi <notzed ximian com>
- * Jeffery Stedfast <fejj ximian com>
+/*
+ * e-upgrade.c - upgrade previous config versions
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Michael Zucchi <notzed ximian com>
+ * Jeffery Stedfast <fejj ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/shell/e-shell-importer.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-importer.c (original)
+++ branches/kill-bonobo/shell/e-shell-importer.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* importer.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Iain Holmes <iain ximian com>
+ * Authors:
+ * Iain Holmes <iain ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/shell/e-shell-nm.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-nm.c (original)
+++ branches/kill-bonobo/shell/e-shell-nm.c Wed Oct 1 20:56:04 2008
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Shreyas Srinivasan <sshreyas novell com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Shreyas Srinivasan <sshreyas novell com>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * (C) Copyright 2005 Novell, Inc.
*/
#define DBUS_API_SUBJECT_TO_CHANGE 1
Modified: branches/kill-bonobo/shell/e-shell-view.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-view.c (original)
+++ branches/kill-bonobo/shell/e-shell-view.c Wed Oct 1 20:56:04 2008
@@ -1,5 +1,5 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- * e-shell-view.c
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-shell-view.c
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
Modified: branches/kill-bonobo/shell/e-shell-view.h
==============================================================================
--- branches/kill-bonobo/shell/e-shell-view.h (original)
+++ branches/kill-bonobo/shell/e-shell-view.h Wed Oct 1 20:56:04 2008
@@ -1,8 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
* e-shell-view.h
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -11,12 +9,14 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
/**
Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c (original)
+++ branches/kill-bonobo/shell/e-shell.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,16 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*/
#include "e-shell.h"
Modified: branches/kill-bonobo/shell/main.c
==============================================================================
--- branches/kill-bonobo/shell/main.c (original)
+++ branches/kill-bonobo/shell/main.c Wed Oct 1 20:56:04 2008
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
- * Author: Ettore Perazzoli
+ * Authors:
+ * Ettore Perazzoli <ettore ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/shell/shell.error.xml
==============================================================================
--- branches/kill-bonobo/shell/shell.error.xml (original)
+++ branches/kill-bonobo/shell/shell.error.xml Wed Oct 1 20:56:04 2008
@@ -27,9 +27,9 @@
</error>
<error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
- <title>Delete old data from version {0}?</title>
+ <_title>Delete old data from version {0}?</_title>
<_primary>Delete old data from version {0}?</_primary>
- <_secondary xml:space="preserve">The previous version of evolution stored its data in a different location.
+ <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location.
If you choose to remove this data, the entire contents of the "evolution" directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of "evolution" at your convenience.
</_secondary>
@@ -39,7 +39,7 @@
</error>
<error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
- <title>Really delete old data?</title>
+ <_title>Really delete old data?</_title>
<_primary>Really delete old data?</_primary>
<_secondary xml:space="preserve">The entire contents of the "evolution" directory are about to be permanently removed.
Modified: branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.c
==============================================================================
--- branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.c (original)
+++ branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * gal-define-views-dialog.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.h
==============================================================================
--- branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.h (original)
+++ branches/kill-bonobo/widgets/menus/gal-view-instance-save-as-dialog.h Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * gal-define-views-dialog.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifndef __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
Modified: branches/kill-bonobo/widgets/misc/e-attachment-bar.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-attachment-bar.c (original)
+++ branches/kill-bonobo/widgets/misc/e-attachment-bar.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Authors: Ettore Perazzoli <ettore ximian com>
- * Jeffrey Stedfast <fejj ximian com>
- * Srinivasa Ragavan <sragavan novell com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ * Ettore Perazzoli <ettore ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
+ * Srinivasa Ragavan <sragavan novell com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
Modified: branches/kill-bonobo/widgets/misc/e-attachment.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-attachment.c (original)
+++ branches/kill-bonobo/widgets/misc/e-attachment.c Wed Oct 1 20:56:04 2008
@@ -229,8 +229,7 @@
char *type;
gchar *content = NULL;
- type = e_util_guess_mime_type (file_name);
-
+ type = e_util_guess_mime_type (file_name, TRUE);
if (type && strcmp (type, "text/directory") == 0 &&
file_ext_is (file_name, ".vcf") &&
Modified: branches/kill-bonobo/widgets/misc/e-calendar.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-calendar.c (original)
+++ branches/kill-bonobo/widgets/misc/e-calendar.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- * Bolian Yin <bolian yin sun com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ * Bolian Yin <bolian yin sun com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/widgets/misc/e-canvas-background.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-canvas-background.c (original)
+++ branches/kill-bonobo/widgets/misc/e-canvas-background.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-canvas-background.c - background color for canvas.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- * Chris Lahey <clahey ximian com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/misc/e-canvas.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-canvas.c (original)
+++ branches/kill-bonobo/widgets/misc/e-canvas.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-canvas.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/misc/e-cell-percent.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-cell-percent.c (original)
+++ branches/kill-bonobo/widgets/misc/e-cell-percent.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/widgets/misc/e-colors.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-colors.c (original)
+++ branches/kill-bonobo/widgets/misc/e-colors.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-colors.c - General color allocation utilities
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- * Miguel de Icaza (miguel kernel org)
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Miguel de Icaza <miguel ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
*/
/* We keep our own color context, as the color allocation might take
Modified: branches/kill-bonobo/widgets/misc/e-dateedit.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-dateedit.c (original)
+++ branches/kill-bonobo/widgets/misc/e-dateedit.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
- * Author :
- * Damon Chaplin <damon ximian com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Based on the GnomeDateEdit, part of the Gnome Library.
- * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
- *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Damon Chaplin <damon ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
*/
/*
Modified: branches/kill-bonobo/widgets/misc/e-expander.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-expander.c (original)
+++ branches/kill-bonobo/widgets/misc/e-expander.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,26 @@
-/* GTK - The GIMP Toolkit
+/*
+ * GTK - The GIMP Toolkit
*
- * Copyright (C) 2003 Sun Microsystems, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) version 3.
*
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*
* Authors:
- * Mark McLoughlin <mark skynet ie>
+ * Mark McLoughlin <mark skynet ie>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2003 Sun Microsystems, Inc.
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/misc/e-online-button.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-online-button.c (original)
+++ branches/kill-bonobo/widgets/misc/e-online-button.c Wed Oct 1 20:56:04 2008
@@ -1,21 +1,18 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-offline-button.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
#include "e-online-button.h"
Modified: branches/kill-bonobo/widgets/misc/e-online-button.h
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-online-button.h (original)
+++ branches/kill-bonobo/widgets/misc/e-online-button.h Wed Oct 1 20:56:04 2008
@@ -1,21 +1,18 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-online-button.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
#ifndef E_ONLINE_BUTTON_H
Modified: branches/kill-bonobo/widgets/misc/e-search-bar.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-search-bar.c (original)
+++ branches/kill-bonobo/widgets/misc/e-search-bar.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-search-bar.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- * Chris Lahey <clahey ximian com>
- * Ettore Perazzoli <ettore ximian com>
- * Jon Trowbridge <trow ximian com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ * Ettore Perazzoli <ettore ximian com>
+ * Jon Trowbridge <trow ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
*/
#include "e-search-bar.h"
Modified: branches/kill-bonobo/widgets/misc/e-unicode.h
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-unicode.h (original)
+++ branches/kill-bonobo/widgets/misc/e-unicode.h Wed Oct 1 20:56:04 2008
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-unicode.h - utf-8 support functions for gal
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- * Lauris Kaplinski <lauris ximian com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Lauris Kaplinski <lauris ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
*/
#ifndef _E_UNICODE_H_
Modified: branches/kill-bonobo/widgets/table/Makefile.am
==============================================================================
--- branches/kill-bonobo/widgets/table/Makefile.am (original)
+++ branches/kill-bonobo/widgets/table/Makefile.am Wed Oct 1 20:56:04 2008
@@ -29,7 +29,6 @@
e-cell-popup.c \
e-cell-progress.c \
e-cell-size.c \
- e-cell-spin-button.c \
e-cell-text.c \
e-cell-toggle.c \
e-cell-tree.c \
@@ -93,7 +92,6 @@
e-cell-popup.h \
e-cell-progress.h \
e-cell-size.h \
- e-cell-spin-button.h \
e-cell-text.h \
e-cell-toggle.h \
e-cell-tree.h \
Modified: branches/kill-bonobo/widgets/table/e-cell-float.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-cell-float.c (original)
+++ branches/kill-bonobo/widgets/table/e-cell-float.c Wed Oct 1 20:56:04 2008
@@ -1,27 +1,28 @@
/*
* e-cell-float.c - Float item for e-table.
- * Copyright 2001, CodeFactory AB
- * Copyright 2001, Mikael Hallendal <micke codefactory se>
*
- * Derived from e-cell-number by Chris Lahey <clahey ximian com>
- * ECellFloat - Float item for e-table.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Author:
- * Mikael Hallendal <micke codefactory se>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Mikael Hallendal <micke imendio com>
+ *
+ * Derived from e-cell-number by Chris Lahey <clahey ximian com>
+ * ECellFloat - Float item for e-table.
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-cell-float.h
==============================================================================
--- branches/kill-bonobo/widgets/table/e-cell-float.h (original)
+++ branches/kill-bonobo/widgets/table/e-cell-float.h Wed Oct 1 20:56:04 2008
@@ -1,27 +1,28 @@
/*
* e-cell-float.h - Float item for e-table.
- * Copyright 2001, CodeFactory AB
- * Copyright 2001, Mikael Hallendal <micke codefactory se>
*
- * Derived from e-cell-number by Chris Lahey <clahey ximian com>
- * ECellFloat - Float item for e-table.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Author:
- * Mikael Hallendal <micke codefactory se>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Mikael Hallendal <micke imendio com>
+ *
+ * Derived from e-cell-number by Chris Lahey <clahey ximian com>
+ * ECellFloat - Float item for e-table.
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#ifndef _E_CELL_FLOAT_H_
Modified: branches/kill-bonobo/widgets/table/e-cell-text.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-cell-text.c (original)
+++ branches/kill-bonobo/widgets/table/e-cell-text.c Wed Oct 1 20:56:04 2008
@@ -1,11 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-cell-text.c: Text cell renderer.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
*
* Authors:
- * Miguel de Icaza <miguel ximian com>
- * Chris Lahey <clahey ximian com>
+ * Miguel de Icaza <miguel ximian com>
+ * Chris Lahey <clahey ximian com>
*
* A lot of code taken from:
*
@@ -19,19 +29,8 @@
*
* Author: Federico Mena <federico nuclecu unam mx>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-table-col.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-col.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-col.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-table-col.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Miguel de Icaza <miguel ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Miguel de Icaza <miguel ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-table-field-chooser-item.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-field-chooser-item.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-field-chooser-item.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-table-field-chooser-item.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-table-field-chooser.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-field-chooser.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-field-chooser.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-table-field-chooser.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-table-scrolled.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-scrolled.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-scrolled.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-table-scrolled.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-table-sorting-utils.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-sorting-utils.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-sorting-utils.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-table-sorting-utils.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-table.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table.c (original)
+++ branches/kill-bonobo/widgets/table/e-table.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-table.c - A graphical view of a Table.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- * Chris Lahey <clahey ximian com>
- * Miguel de Icaza <miguel ximian com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ * Miguel de Icaza <miguel ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-tree-model.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-tree-model.c (original)
+++ branches/kill-bonobo/widgets/table/e-tree-model.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-tree-model.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
- * Chris Toshok <toshok ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ * Chris Toshok <toshok ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-tree-selection-model.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-tree-selection-model.c (original)
+++ branches/kill-bonobo/widgets/table/e-tree-selection-model.c Wed Oct 1 20:56:04 2008
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-tree-selection-model.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
- * Mike Kestner <mkestner ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ * Mike Kestner <mkestner ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/table/e-tree.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-tree.c (original)
+++ branches/kill-bonobo/widgets/table/e-tree.c Wed Oct 1 20:56:04 2008
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * e-tree.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
*
- * Authors:
- * Chris Lahey <clahey ximian com>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ * Chris Lahey <clahey ximian com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
Modified: branches/kill-bonobo/widgets/text/e-text.h
==============================================================================
--- branches/kill-bonobo/widgets/text/e-text.h (original)
+++ branches/kill-bonobo/widgets/text/e-text.h Wed Oct 1 20:56:04 2008
@@ -1,11 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-text.h - Text item for evolution.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
*
* Authors:
- * Chris Lahey <clahey ximian com>
- * Jon Trowbridge <trow ximian com>
+ * Chris Lahey <clahey ximian com>
+ * Jon Trowbridge <trow ximian com>
*
* A majority of code taken from:
*
@@ -19,19 +31,8 @@
*
* Author: Federico Mena <federico nuclecu unam mx>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
*/
#ifndef E_TEXT_H
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
