Commit Graph

566 Commits

Author SHA1 Message Date
504642b798 Use Behdad's brilliant git.mk to generate .gitignore files. 2009-05-03 12:47:34 -04:00
9192f0dc88 Merge branch 'master' into kill-bonobo
Conflicts:
	a11y/widgets/Makefile.am
	a11y/widgets/ea-widgets.c
	a11y/widgets/ea-widgets.h
	addressbook/gui/component/addressbook-component.c
	calendar/gui/Makefile.am
	calendar/gui/calendar-component.c
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/dialogs/event-editor.c
	calendar/gui/dialogs/memo-editor.c
	calendar/gui/dialogs/task-editor.c
	calendar/gui/memos-component.c
	calendar/gui/tasks-component.c
	composer/e-composer-private.c
	composer/e-msg-composer.c
	configure.in
	e-util/e-plugin-ui.c
	e-util/e-plugin-ui.h
	mail/ChangeLog
	mail/Makefile.am
	mail/e-mail-attachment-bar.c
	mail/em-format-html-display.c
	mail/em-format-html-display.h
	mail/em-format-html.h
	mail/em-format.h
	mail/em-popup.c
	mail/mail-component.c
	plugins/external-editor/external-editor.c
	widgets/misc/Makefile.am
	widgets/misc/e-attachment-paned.c
	widgets/misc/e-attachment-view.c
	widgets/misc/e-attachment.c
2009-04-28 21:38:15 -04:00
c868ace2e9 Fix filter breakage after deprecated Gtk+ symbols removal
** Fix for bug #572348

	* filter/filter-option.c: (combobox_changed), (get_widget):
	* mail/em-filter-rule.c: (part_combobox_changed):
	* mail/em-filter-source-element.c: (source_changed):
	Fix breakage of filter options.
2009-04-28 16:31:45 +02:00
faf1c14c11 Manual conflict resolution 2009-04-25 10:16:00 -04:00
86fdd3a1cb Merge branch 'master' into kill-bonobo
This was a particularly messy merge.  Watch out for regressions!

Conflicts:
	ChangeLog
	NEWS
	a11y/ChangeLog
	a11y/widgets/ea-combo-button.c
	a11y/widgets/ea-combo-button.h
	a11y/widgets/ea-widgets.c
	addressbook/ChangeLog
	addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
	addressbook/gui/component/addressbook-component.c
	addressbook/gui/component/addressbook-component.h
	addressbook/gui/component/addressbook-config.c
	addressbook/gui/component/addressbook-migrate.h
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/addressbook-view.h
	addressbook/gui/component/addressbook.h
	addressbook/gui/component/autocompletion-config.c
	addressbook/gui/component/autocompletion-config.h
	addressbook/gui/component/component-factory.c
	addressbook/gui/component/e-book-shell-module-migrate.c
	addressbook/gui/component/ldap-config.glade
	addressbook/gui/contact-editor/Makefile.am
	addressbook/gui/contact-editor/contact-editor.glade
	addressbook/gui/contact-editor/e-contact-editor-address.c
	addressbook/gui/contact-editor/e-contact-editor-address.h
	addressbook/gui/contact-editor/e-contact-editor-im.c
	addressbook/gui/contact-editor/e-contact-editor-im.h
	addressbook/gui/contact-editor/e-contact-editor.c
	addressbook/gui/contact-editor/e-contact-editor.h
	addressbook/gui/contact-editor/eab-editor.c
	addressbook/gui/contact-editor/eab-editor.h
	addressbook/gui/contact-editor/test-editor.c
	addressbook/gui/contact-list-editor/Makefile.am
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/e-addressbook-model.c
	addressbook/gui/widgets/e-addressbook-model.h
	addressbook/gui/widgets/e-addressbook-reflow-adapter.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/e-addressbook-view.h
	addressbook/gui/widgets/e-minicard-view.c
	addressbook/gui/widgets/eab-contact-display.c
	addressbook/gui/widgets/eab-gui-util.c
	addressbook/gui/widgets/eab-menu.c
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup-control.c
	addressbook/gui/widgets/eab-popup-control.h
	addressbook/gui/widgets/eab-popup.c
	addressbook/gui/widgets/eab-popup.h
	addressbook/gui/widgets/eab-vcard-control.c
	addressbook/gui/widgets/eab-vcard-control.h
	addressbook/gui/widgets/gal-view-minicard.c
	addressbook/gui/widgets/gal-view-minicard.h
	addressbook/printing/e-contact-print-style-editor.c
	addressbook/printing/e-contact-print-style-editor.h
	addressbook/printing/e-contact-print.glade
	addressbook/printing/test-contact-print-style-editor.c
	addressbook/tools/evolution-addressbook-export.c
	addressbook/util/Makefile.am
	calendar/ChangeLog
	calendar/gui/Makefile.am
	calendar/gui/apps_evolution_calendar.schemas.in
	calendar/gui/calendar-component.c
	calendar/gui/calendar-component.h
	calendar/gui/calendar-config.c
	calendar/gui/comp-editor-factory.c
	calendar/gui/comp-editor-factory.h
	calendar/gui/comp-util.c
	calendar/gui/comp-util.h
	calendar/gui/control-factory.c
	calendar/gui/control-factory.h
	calendar/gui/dialogs/alarm-dialog.c
	calendar/gui/dialogs/cal-prefs-dialog.c
	calendar/gui/dialogs/cal-prefs-dialog.glade
	calendar/gui/dialogs/cal-prefs-dialog.h
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/dialogs/comp-editor.h
	calendar/gui/dialogs/event-editor.c
	calendar/gui/dialogs/event-page.c
	calendar/gui/dialogs/memo-editor.c
	calendar/gui/dialogs/memo-page.c
	calendar/gui/dialogs/recurrence-page.c
	calendar/gui/dialogs/task-details-page.c
	calendar/gui/dialogs/task-details-page.glade
	calendar/gui/dialogs/task-editor.c
	calendar/gui/dialogs/task-page.c
	calendar/gui/e-cal-component-memo-preview.c
	calendar/gui/e-cal-component-memo-preview.h
	calendar/gui/e-cal-component-preview.c
	calendar/gui/e-cal-component-preview.h
	calendar/gui/e-cal-event.h
	calendar/gui/e-cal-model.c
	calendar/gui/e-cal-popup.c
	calendar/gui/e-calendar-table.c
	calendar/gui/e-calendar-view.c
	calendar/gui/e-day-view.c
	calendar/gui/e-itip-control.c
	calendar/gui/e-memo-table.c
	calendar/gui/e-memos.c
	calendar/gui/e-memos.h
	calendar/gui/e-tasks.c
	calendar/gui/e-tasks.h
	calendar/gui/e-week-view.c
	calendar/gui/gnome-cal.c
	calendar/gui/goto.c
	calendar/gui/itip-bonobo-control.c
	calendar/gui/itip-bonobo-control.h
	calendar/gui/itip-utils.c
	calendar/gui/itip-utils.h
	calendar/gui/main.c
	calendar/gui/memos-component.c
	calendar/gui/memos-control.c
	calendar/gui/memos-control.h
	calendar/gui/migration.c
	calendar/gui/migration.h
	calendar/gui/tasks-component.c
	calendar/gui/tasks-control.c
	calendar/importers/main.c
	composer/ChangeLog
	composer/e-composer-actions.c
	composer/e-composer-private.c
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	composer/evolution-composer.ui
	configure.in
	doc/reference/shell/eshell-overrides.txt
	e-util/ChangeLog
	e-util/Makefile.am
	e-util/e-corba-utils.c
	e-util/e-corba-utils.h
	e-util/e-gui-utils.c
	e-util/e-gui-utils.h
	e-util/e-logger.c
	e-util/e-non-intrusive-error-dialog.c
	e-util/e-non-intrusive-error-dialog.h
	e-util/e-plugin-ui.c
	e-util/e-util-labels.c
	e-util/e-util-labels.h
	e-util/e-util.c
	e-util/e-util.h
	filter/ChangeLog
	filter/filter-option.c
	help/C/evolution.xml
	help/ChangeLog
	help/Makefile.am
	help/cs/cs.po
	help/de/de.po
	help/es/es.po
	help/eu/figures/Screenshot-Free-Busy.png
	help/eu/figures/evo_blink.png
	help/eu/figures/evo_dialog-info.png
	help/eu/figures/evo_dialog-warning.png
	help/eu/figures/evo_email_a.png
	help/eu/figures/evo_flag_follow_up_a.png
	help/eu/figures/evo_proxyadd_a.png
	help/eu/figures/evo_shd_memo_a.png
	help/eu/figures/exchange-delegation.png
	help/eu/figures/exchange-identity.png
	help/eu/figures/exchange-receive-options.png
	help/eu/figures/exchange-receive.png
	help/eu/figures/exchg-identity.png
	help/eu/figures/exchng-identity.png
	help/eu/figures/exchng-rec-mail.png
	help/eu/figures/exchng-rec-option.png
	help/eu/figures/exchng-rec-options.png
	help/eu/figures/free_busy.png
	help/eu/figures/full-1.png
	help/eu/figures/full-2.png
	help/eu/figures/full-3.png
	help/eu/figures/full-4.png
	help/eu/figures/full-5.png
	help/eu/figures/full-6.png
	help/eu/figures/full-7.png
	help/eu/figures/mail-druid-pic.png
	help/eu/figures/mail-inbox.png
	help/eu/figures/mail-threaded.png
	help/eu/figures/mainwindow-pic.png
	help/eu/figures/minus.png
	help/eu/figures/plus.png
	help/eu/figures/proxy-cal.png
	help/eu/figures/proxy-login.png
	help/eu/figures/schedule.png
	help/eu/figures/stock_search.png
	help/eu/figures/sub-others-folder.png
	help/eu/figures/sub-pub-fold.png
	help/eu/figures/vfolder-createrule-fig.png
	help/quickref/Makefile.am
	mail/ChangeLog
	mail/Makefile.am
	mail/default/Makefile.am
	mail/e-mail-shell-module-migrate.c
	mail/e-searching-tokenizer.c
	mail/em-account-editor.c
	mail/em-account-prefs.h
	mail/em-composer-prefs.c
	mail/em-composer-prefs.h
	mail/em-composer-utils.c
	mail/em-filter-folder-element.c
	mail/em-folder-browser.c
	mail/em-folder-selection-button.h
	mail/em-folder-selector.c
	mail/em-folder-tree-model.c
	mail/em-folder-tree-model.h
	mail/em-folder-tree.c
	mail/em-folder-tree.h
	mail/em-folder-utils.c
	mail/em-folder-utils.h
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html-print.c
	mail/em-format-html-print.h
	mail/em-format-html.c
	mail/em-format-quote.h
	mail/em-format.c
	mail/em-format.h
	mail/em-html-stream.h
	mail/em-mailer-prefs.c
	mail/em-mailer-prefs.h
	mail/em-message-browser.c
	mail/em-message-browser.h
	mail/em-migrate.h
	mail/em-network-prefs.h
	mail/em-popup.c
	mail/em-search-context.h
	mail/em-subscribe-editor.c
	mail/em-utils.c
	mail/em-utils.h
	mail/filtertypes.xml
	mail/mail-component-factory.c
	mail/mail-component.c
	mail/mail-config-factory.c
	mail/mail-config-factory.h
	mail/mail-config.c
	mail/mail-config.glade
	mail/mail-crypto.c
	mail/mail-crypto.h
	mail/mail-dialogs.glade
	mail/mail-folder-cache.c
	mail/mail-mt.c
	mail/mail-send-recv.c
	mail/mail-send-recv.h
	mail/mail-session.c
	mail/mail-session.h
	mail/mail-types.h
	mail/mail-vfolder.c
	mail/message-list.c
	mail/message-tag-followup.c
	mail/searchtypes.xml
	mail/vfoldertypes.xml
	plugins/attachment-reminder/Makefile.am
	plugins/audio-inline/org-gnome-audio-inline.eplug.xml
	plugins/caldav/ChangeLog
	plugins/caldav/caldav-source.c
	plugins/calendar-http/ChangeLog
	plugins/calendar-weather/ChangeLog
	plugins/calendar-weather/calendar-weather.c
	plugins/email-custom-header/ChangeLog
	plugins/email-custom-header/email-custom-header.c
	plugins/exchange-operations/ChangeLog
	plugins/google-account-setup/ChangeLog
	plugins/google-account-setup/Makefile.am
	plugins/google-account-setup/google-contacts-source.c
	plugins/google-account-setup/google-source.c
	plugins/import-ics-attachments/ChangeLog
	plugins/import-ics-attachments/Makefile.am
	plugins/import-ics-attachments/icsimporter.c
	plugins/itip-formatter/ChangeLog
	plugins/itip-formatter/itip-view.c
	plugins/mail-account-disable/ChangeLog
	plugins/mail-account-disable/mail-account-disable.c
	plugins/mail-notification/ChangeLog
	plugins/mail-notification/mail-notification.c
	plugins/mail-to-meeting/ChangeLog
	plugins/mail-to-task/ChangeLog
	plugins/mark-all-read/mark-all-read.c
	plugins/publish-calendar/ChangeLog
	plugins/publish-calendar/publish-format-fb.c
	plugins/publish-calendar/publish-format-ical.c
	plugins/save-attachments/ChangeLog
	plugins/save-attachments/Makefile.am
	plugins/save-attachments/save-attachments.c
	plugins/select-one-source/ChangeLog
	plugins/select-one-source/Makefile.am
	plugins/select-one-source/select-one-source.c
	plugins/startup-wizard/ChangeLog
	plugins/startup-wizard/startup-wizard.c
	plugins/webdav-account-setup/ChangeLog
	plugins/webdav-account-setup/Makefile.am
	plugins/webdav-account-setup/webdav-contacts-source.c
	po/ChangeLog
	po/POTFILES.in
	po/ar.po
	po/bg.po
	po/bn_IN.po
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/fr.po
	po/gl.po
	po/gu.po
	po/hi.po
	po/hu.po
	po/it.po
	po/ja.po
	po/kn.po
	po/ko.po
	po/lt.po
	po/ml.po
	po/mr.po
	po/nb.po
	po/nl.po
	po/pa.po
	po/pl.po
	po/pt.po
	po/ru.po
	po/sl.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/zh_HK.po
	po/zh_TW.po
	shell/ChangeLog
	shell/Evolution-Component.idl
	shell/Makefile.am
	shell/apps_evolution_shell.schemas.in
	shell/e-component-registry.c
	shell/e-component-registry.h
	shell/e-component-view.c
	shell/e-component-view.h
	shell/e-corba-config-page.c
	shell/e-corba-config-page.h
	shell/e-shell-constants.h
	shell/e-shell-importer.c
	shell/e-shell-importer.h
	shell/e-shell-nm.c
	shell/e-shell-settings-dialog.c
	shell/e-shell-settings-dialog.h
	shell/e-shell-view.c
	shell/e-shell-view.h
	shell/e-shell-window-commands.c
	shell/e-shell-window-commands.h
	shell/e-shell-window.c
	shell/e-shell-window.h
	shell/e-shell.c
	shell/e-shell.h
	shell/e-sidebar.c
	shell/e-sidebar.h
	shell/e-user-creatable-items-handler.c
	shell/e-user-creatable-items-handler.h
	shell/es-menu.c
	shell/es-menu.h
	shell/evolution-component.c
	shell/evolution-component.h
	shell/evolution-config-control.c
	shell/evolution-config-control.h
	shell/evolution-listener.c
	shell/evolution-listener.h
	shell/evolution-shell-component-utils.c
	shell/evolution-shell-component-utils.h
	shell/importer/evolution-importer-client.c
	shell/importer/evolution-importer-client.h
	shell/importer/evolution-importer-listener.c
	shell/importer/evolution-importer-listener.h
	shell/importer/evolution-importer.c
	shell/importer/evolution-importer.h
	shell/importer/evolution-intelligent-importer.c
	shell/importer/evolution-intelligent-importer.h
	shell/importer/import.glade
	shell/importer/intelligent.c
	shell/importer/intelligent.h
	shell/main.c
	shell/shell.error.xml
	shell/test/evolution-test-component.c
	shell/test/evolution-test-component.h
	smime/ChangeLog
	smime/lib/Makefile.am
	ui/Makefile.am
	ui/evolution-addressbook.xml
	ui/evolution-calendar.xml
	widgets/ChangeLog
	widgets/menus/gal-view-menus.c
	widgets/menus/gal-view-menus.h
	widgets/misc/ChangeLog
	widgets/misc/Makefile.am
	widgets/misc/e-activity-handler.c
	widgets/misc/e-activity-handler.h
	widgets/misc/e-attachment-bar.c
	widgets/misc/e-attachment-bar.h
	widgets/misc/e-attachment.c
	widgets/misc/e-attachment.h
	widgets/misc/e-calendar-item.c
	widgets/misc/e-charset-picker.c
	widgets/misc/e-combo-button.c
	widgets/misc/e-combo-button.h
	widgets/misc/e-config-page.c
	widgets/misc/e-config-page.h
	widgets/misc/e-dropdown-button.c
	widgets/misc/e-dropdown-button.h
	widgets/misc/e-filter-bar.h
	widgets/misc/e-info-label.c
	widgets/misc/e-info-label.h
	widgets/misc/e-multi-config-dialog.c
	widgets/misc/e-multi-config-dialog.h
	widgets/misc/e-online-button.c
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h
	widgets/misc/e-signature-combo-box.c
	widgets/misc/e-signature-combo-box.h
	widgets/misc/e-signature-editor.c
	widgets/misc/e-signature-editor.h
	widgets/misc/e-task-bar.c
	widgets/misc/e-task-bar.h
	widgets/misc/e-task-widget.c
	widgets/misc/e-task-widget.h
	widgets/misc/test-dropdown-button.c
	widgets/misc/test-info-label.c
	widgets/misc/test-multi-config-dialog.c
	widgets/table/ChangeLog
	widgets/table/e-cell-date.c
	widgets/table/e-table-group-container.c
	widgets/table/e-table-group-leaf.c
	widgets/table/e-table-group.c
	widgets/table/e-table-group.h
	widgets/table/e-table.c
	widgets/table/e-table.h
2009-04-25 10:07:44 -04:00
8a072ffc7c GN-bug #572348 - Removed deprecated Gtk+ symbols
Some still left, because those gone in kill-bonobo branch.
2009-04-24 11:45:21 +02:00
e42f276527 Bug 577929 – Consolidate marshallers
Consolidate all marshalling specifications to e-util/e-marshal.list.
This reduces code duplication and makes it slightly easier to locate
unused marshallers.
2009-04-23 10:02:07 -04:00
c7d3c9f956 Merge revisions 36866:37046 from trunk.
svn path=/branches/kill-bonobo/; revision=37050
2009-01-12 04:12:01 +00:00
e29a17618e Add cast to avoid warning.
2009-01-11  Tor Lillqvist  <tml@novell.com>

	* filter-option.c (get_dynamic_options): Add cast to avoid
	warning.


svn path=/trunk/; revision=37040
2009-01-11 20:09:36 +00:00
dab08c513e ** Bug #567244
2009-01-11  Tor Lillqvist  <tml@novell.com>

	** Bug #567244

	* filter-option.c (get_dynamic_options): For portability, use
	<gmodule.h> API instead of <dlfcn.h> API.


svn path=/trunk/; revision=37029
2009-01-10 22:21:47 +00:00
65e57aa9bd ** Fix for bug #567031
2009-01-08  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #567031

	* rule-editor.c: (rule_editor_new): Hide also label of the combo.


svn path=/trunk/; revision=37017
2009-01-08 15:55:09 +00:00
37362c7b25 ** Fix for bug #339879
2009-01-08  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #339879

	* filter/filter-code.h: (filter_code_new):
	* filter/filter-code.c: (filter_code_new), (build_code):
	* filter/rule-context.c: (new_element):
	Have two types of code expression, one "code", which adds also
	a "match-all" into the expression, and a "rawcode" without it.

	* addressbook/gui/widgets/addresstypes.xml: Use "rawcode" instead of "code"
	to have not added a "match-all" into the expression.


svn path=/trunk/; revision=37014
2009-01-08 11:09:02 +00:00
7365be40fe ** Part of fix for bug #563669
2008-12-15  Milan Crha  <mcrha@redhat.com>

	** Part of fix for bug #563669

	* mail/em-account-editor.c: (emae_option_checkspin):
	* filter/filter-int.c: (get_widget):
	* calendar/gui/dialogs/recurrence-page.c: (make_ending_count_special):
	* calendar/conduits/todo/todo-conduit.c: (e_todo_gui_new):
	Use zero GtkSpinButton's PageSize, as Gtk+ requires.


svn path=/trunk/; revision=36892
2008-12-15 11:46:53 +00:00
d158af8cdf Merge revisions 36811:36865 from trunk.
svn path=/branches/kill-bonobo/; revision=36867
2008-12-10 18:30:29 +00:00
65145381a6 ** Fix for bug #563870
2008-12-10  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #563870

	* e-util/e-util-labels.h: (e_util_labels_get_filter_options):
	* e-util/e-util-labels.c: (e_util_labels_get_filter_options):
	New helper function to be used in FilterOption.

	* filter/Makefile.am:
	* filter/filter-label.h:
	* filter/filter-label.c: Drop, not used anywhere.
	* filter/filter-element.c:
	* filter/rule-context.c: Remove dropped include and code.

	* filter/filter-option.c: (get_dynamic_options), (xml_create), (get_widget):
	Evaluate dynamic options even on create, to have them available for
	saved searches even before the widget itself is shown.

	* mail/vfoldertypes.xml:
	* mail/filtertypes.xml:
	* mail/searchtypes.xml: Use dynamic filter option.
	* mail/message-list.c: Drop unused header include.


svn path=/trunk/; revision=36863
2008-12-10 11:05:01 +00:00
14ed95aaaf ** Fix for bug #563669
2008-12-09  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #563669

	* addressbook/gui/component/ldap-config.glade:
	* addressbook/printing/e-contact-print.glade:
	* mail/mail-config.glade:
	* filter/filter.glade:
	* widgets/misc/e-send-options.glade:
	* calendar/gui/dialogs/recurrence-page.glade:
	* calendar/gui/dialogs/alarm-dialog.glade:
	* calendar/gui/dialogs/event-page.glade:
	* calendar/gui/dialogs/task-details-page.glade:
	* calendar/gui/dialogs/cal-prefs-dialog.glade:
	* calendar/gui/alarm-notify/alarm-notify.glade:
	* calendar/gui/goto-dialog.glade:
	Use zero GtkSpinButton's PageSize, as Gtk+ requires.


svn path=/trunk/; revision=36855
2008-12-09 12:53:32 +00:00
7b221ebc07 ** Fix for bug #332629
2008-12-05  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #332629

	* filter/filter-option.h: (struct _filter_option),
	(struct _FilterOption), (filter_option_add):
	* filter/filter-option.c: (filter_option_init), (filter_option_finalise),
	(filter_option_add), (xml_create), (get_widget), (clone):
	Be able to define optionlist with dynamically created list of options.

	* filter/filter-label.c: (fill_options): Adapt.

	* addressbook/gui/widgets/addresstypes.xml:
	* calendar/gui/caltypes.xml:
	* calendar/gui/memotypes.xml:
	* calendar/gui/tasktypes.xml:
	Use dynamically created list of categories in the option's widget.


svn path=/trunk/; revision=36836
2008-12-05 19:20:28 +00:00
85b2913a38 Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
2008-10-24 23:52:05 +00:00
bbbcb08af0 ** Fix for bug #503898
2008-10-17  Matthew Barnes  <mbarnes@redhat.com>

        ** Fix for bug #503898

        * filter-rule.c: (get_widget): s/criteria/condition/

svn path=/trunk/; revision=36637
2008-10-17 08:51:33 +00:00
e1ed13a4b3 ** Fix for bug #554566
2008-10-06  Lucian Langa <lucilanga@gnome.org>

** Fix for bug #554566

* rule-editor.c: (rule_editor_class_init), (rule_edit), (rule_top),
(rule_up), (rule_down), (rule_bottom), (cursor_changed)
(update_selected_rule): new function to update current selected
rule

svn path=/trunk/; revision=36569
2008-10-06 09:59:41 +00:00
b2cda1d0c6 Merge revisions 36016:36533 from trunk.
svn path=/branches/kill-bonobo/; revision=36534
2008-10-01 20:56:04 +00:00
3b318d5cbf Change License from GPL to LGPL.
svn path=/trunk/; revision=36520
2008-10-01 09:24:41 +00:00
bfc8b8784d License changes from GPL to LGPL
svn path=/trunk/; revision=36465
2008-09-29 08:36:04 +00:00
dc4967ab61 License change from GPL to LGPL
svn path=/trunk/; revision=36448
2008-09-25 10:03:08 +00:00
044925165f License changes from GPL to LGPL
svn path=/trunk/; revision=36440
2008-09-24 09:12:38 +00:00
9792036630 Progress update:
- Kill EABMenu.

	- Centralize marshallers to eliminate duplication.


svn path=/branches/kill-bonobo/; revision=36368
2008-09-18 03:31:42 +00:00
79d878670a License changes from GPL to LGPL
svn path=/trunk/; revision=36344
2008-09-16 10:52:29 +00:00
c0a255eb90 Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
2008-09-11 15:34:29 +00:00
52d683e48c Progress update:
- Contacts module mostly working now.
	- View and search UI not yet working.
	- Still refining shell design.


svn path=/branches/kill-bonobo/; revision=36268
2008-09-07 04:02:27 +00:00
14fa5c8a8c Change License from GPL to LGPL. 2nd batch.
More changes to come.

svn path=/trunk/; revision=36247
2008-09-02 16:25:53 +00:00
1bad915150 License Changes
svn path=/trunk/; revision=36116
2008-08-27 10:33:22 +00:00
cea054cd54 Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
2008-08-08 04:26:12 +00:00
d420d5c626 Reviewed by Srinivasa Ragavan <sragavan@novell.com>
2008-07-30  Takao Fujiwara  <takao.fujiwara@sun.com>

	Reviewed by Srinivasa Ragavan <sragavan@novell.com>

	** Fix for bug #545303

	* filter-rule.c: (xml_decode): Add gettext in the xml string.


svn path=/trunk/; revision=35868
2008-07-30 14:17:12 +00:00
c5f7464467 ** Fix for bug #530388
2008-07-28  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #530388

	* filter-label.c: (filter_label_init), (filter_label_finalise),
	(fill_options), (filter_label_count), (filter_label_label),
	(filter_label_index): Make 'cache_lock' a rec mutex.
	* filter-label.c: (regen_label_options): Guard also regeneration
	of each tracked item with the rec lock, thus noone will touch
	'tracked_filters' GSList until we are fully done with it.


svn path=/trunk/; revision=35849
2008-07-28 07:25:28 +00:00
ea3b220f04 ** Fix for bug #243201
2008-07-03  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #243201

	* filter-rule.c: (xml_encode): Escape rule title so that can contain
	also XML entities in the file.


svn path=/trunk/; revision=35716
2008-07-03 09:28:26 +00:00
9d3c5b2a5b Patch from Maciej Piechotka <uzytkownik2@gmail.com>
which fixes bug 526262 - "untranslated strings in advanced search"

svn path=/trunk/; revision=35689
2008-06-27 17:23:45 +00:00
16a3b9e946 fixed copyright notices
svn path=/trunk/; revision=35664
2008-06-20 22:14:43 +00:00
4813d6259f ** Fix for bug #382783
2008-06-19  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #382783

	* filter/filter-rule.c: (do_grab_focus_cb), (more_parts), (get_widget):
	* mail/em-filter-rule.c: (do_grab_focus_cb), (more_parts), (get_widget):
	Grab focus of new rule part on adding and scroll to the bottom too.


svn path=/trunk/; revision=35654
2008-06-19 16:38:18 +00:00
f1cfc8c031 ** Fix for bug #201011
2008-06-09  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #201011

	* filter/filter-rule.h: (struct _FilterRule): New property 'enabled'
	to be able to disable filter rules.
	* filter/filter-rule.c: (filter_rule_init), (rule_eq), (xml_encode),
	(xml_decode), (rule_copy): Store/restore/use 'enabled' value.
	* filter/rule-editor.c: (add_editor_response), (rule_move), (set_source):
	Set the 'enabled' column properly.
	* filter/rule-editor.c: (rule_able_toggled), (rule_editor_treeview_new):
	Add column "Enabled" to the tree, but have it hidden by default, only
	those whom supports it can show it.

	* mail/em-filter-editor.c: (em_filter_editor_construct):
	Show Enabled column in the editor, because we support it here.
	* mail/mail-session.c: (main_get_filter_driver): Skip disabled rules.


svn path=/trunk/; revision=35620
2008-06-09 10:50:54 +00:00
4503c052d0 ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
2008-06-06  Matthew Barnes  <mbarnes@redhat.com>

	** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
	   GTK_DISABLE_SINGLE_INCLUDES defined.  (#536637)


svn path=/trunk/; revision=35606
2008-06-06 15:12:53 +00:00
2e763ace9a gtk_window_set_policy -> gtk_window_set_resizable + other cleanups.
2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>

	* filter-part.c: (main): gtk_window_set_policy ->
	gtk_window_set_resizable + other cleanups.

svn path=/trunk/; revision=35590
2008-06-03 20:00:15 +00:00
e99e12428d ** Fixes bug #534360
2008-05-22  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #534360

	Migrate from deprecated GtkObject symbols to GObject equivalents.
	Touches over 150 files in all components; too many to list.


svn path=/trunk/; revision=35526
2008-05-22 17:27:48 +00:00
dd7bad0741 ** Fix for bug #211353
2008-01-10  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #211353

	* po/POTFILES.in: Added new file e-util/e-util-labels.c

	* mail/filtertypes.xml:
	* mail/vfoldertypes.xml:
	* mail/em-folder-view.c:
	* mail/em-folder-browser.c:
	* mail/em-mailer-prefs.h:
	* mail/em-mailer-prefs.c:
	* mail/mail-config.h:
	* mail/mail-config.c:
	* mail/mail-config.glade:
	* mail/message-list.c:
	Label tags are now generated based on label name when creating, except
	of first 5 labels. New menu option "New Label" in popup menu over
	message list and editing of labels has been changed in Preferences.
	Also renaming tab in Preferences for "Labels", not "Colors", and the
	tab label too.
	mail-config-label... functions was moved to e-util/e-util-labels.c/.h.
	* mail/message-list.etspec: Normalized columns has been moved by one
	when label column has been added.

	* filter/filter-option.h:
	* filter/filter-option.c: (filter_option_get_current),
	(filter_option_remove_all): New functions to be able to refill options
	even after initialization of the filter element.
	* filter/filter-label.c: Added support to notify changes on labels in runtime
	and use actual labels.

	* e-util/Makefile.am:
	* e-util/e-util-labels.h:
	* e-util/e-util-labels.c: New files to work with labels.


svn path=/trunk/; revision=34788
2008-01-10 11:19:37 +00:00
4fcb268547 Removing cyclic dependency caused by mail_config_get_labels.
2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>

	* filter-label.c: (filter_label_count), (filter_label_label),
	(filter_label_index), (xml_create): Removing cyclic dependency caused 
	by mail_config_get_labels.



svn path=/trunk/; revision=34717
2007-12-17 08:35:36 +00:00
2093e31002 ** Fix for bug #211353
2007-12-14  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #211353

	* message-list.etspec:
	* message-list.h:
	* message-list.c: Added new column to show labels.
	* filtertypes.xml:
	* vfoldertypes.xml:
	Code for label filters/search folders has been changed.
	* mail-config.glade:
	* em-folder-view.c: (emfv_set_label), (emfv_unset_label),
	(emfv_popup_label_clear), (emfv_popup_label_set),
	(emfv_popup_labels_get_state_for_tag), (emfv_popup):
	Labels popup submenu is now shown with checkboxes so one can set
	more than one label to the message and unset only one label from
	message. There has been added new function, because of this.
	* mail-config.h:
	* mail-config.c: New "interface" functions to work with labels.
	* em-mailer-prefs.h:
	* em-mailer-prefs.c: Editing labels in tree.
	* em-folder-browser.c:
	Labels in show menu reflect changes in preferences.
2007-12-14  Milan Crha  <mcrha@redhat.com>

	** Part of fix for bug #211353

	* filter-label.c: Use global label's setup, not its own copy.
2007-12-14  Milan Crha  <mcrha@redhat.com>

	** Part of fix for bug #211353

	* e-popup.h:
	* e-popup.c: (ep_build_tree):
	Toggles can be in inconsistent state now, and can also contain
	an image, which is a pointer to GtkImage widget.
2007-12-14  Milan Crha  <mcrha@redhat.com>

	** Part of fix for bug #211353

	* e-search-bar.c: (e_search_bar_get_viewitem_id):
	Return -1 if no viewmenu is setup yet.


svn path=/trunk/; revision=34715
2007-12-17 05:40:53 +00:00
800c99fd15 Patch from Bob Mauchin <zebob.m@pengzone.org>: Fix for bug #438769 (UI: Changed label from 'Search name' to 'Rule name' in the add-new-message-filter dialog)
svn path=/trunk/; revision=34666
2007-12-07 15:27:18 +00:00
9e4fcb29cf ** Remove trailing whitespace from source code.
2007-11-14  Matthew Barnes  <mbarnes@redhat.com>

	** Remove trailing whitespace from source code.


svn path=/trunk/; revision=34537
2007-11-14 22:04:21 +00:00
ac2923d34b Warning fixes: - NULL vs 0 - ANSIfication of declarations - mixing code
2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>

	* filter-datespec.c: (set_values):
	* filter-rule.c: (filter_rule_get_type), (filter_rule_new),
	(rule_copy):
	* rule-editor.c: (editor_response), (rule_delete), (rule_move):

	Warning fixes:
	- NULL vs 0
	- ANSIfication of declarations
	- mixing code and declarations

svn path=/trunk/; revision=34429
2007-10-26 08:07:25 +00:00
e8a9d068a1 ** Fix for bug #323977
2007-10-11  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #323977

	* filter/filter-rule.c: (get_widget):
	Use "Add Filter Criteria" instead of plain "Add" for button label.
	* mail/em-filter-rule.c: (get_widget):
	Use "Add Action" instead of plain "Add" for button label.


svn path=/trunk/; revision=34376
2007-10-11 15:18:24 +00:00
b32649a94c ** Fixes bug #437579
2007-10-09  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #437579

	* addressbook/conduit/address-conduit.c:
	* addressbook/gui/component/addressbook-config.c:
	* addressbook/gui/contact-editor/e-contact-editor.c:
	* addressbook/gui/widgets/eab-gui-util.c:
	* calendar/conduits/calendar/calendar-conduit.c:
	* calendar/conduits/memo/memo-conduit.c:
	* calendar/conduits/todo/todo-conduit.c:
	* calendar/gui/dialogs/alarm-dialog.c:
	* calendar/gui/dialogs/event-page.c:
	* calendar/gui/dialogs/memo-page.c:
	* calendar/gui/dialogs/task-page.c:
	* calendar/gui/e-day-view-layout.c:
	* calendar/gui/e-day-view-layout.h:
	* calendar/gui/print.c:
	* e-util/e-pilot-map.c:
	* e-util/e-plugin.c:
	* e-util/e-profile-event.c:
	* e-util/e-signature.c:
	* filter/filter-file.c:
	* mail/e-searching-tokenizer.c:
	* mail/em-folder-browser.c:
	* mail/em-format-html.c:
	* mail/em-format-view.c:
	* mail/em-format.c:
	* mail/em-mailer-prefs.c:
	* mail/em-mailer-prefs.h:
	* mail/mail-session.c:
	* mail/mail-session.h:
	* mail/mail-vfolder.c:
	* mail/message-list.c:
	* plugins/bbdb/bbdb.c:
	* plugins/bbdb/gaimbuddies.c:
	* plugins/calendar-http/calendar-http.c:
	* plugins/exchange-operations/exchange-user-dialog.c:
	* plugins/face/face.c:
	* shell/e-shell-window.c:
	* shell/e-shell.c:
	* smime/lib/e-cert-db.c:
	* tools/killev.c:
	* widgets/misc/e-cursors.c:
	* widgets/misc/e-spinner.c:
	* widgets/misc/e-unicode.c:
	* widgets/table/e-table-field-chooser-item.c:
	* widgets/table/e-table-header-item.c:
	* widgets/table/e-table-header-item.h:
	* widgets/table/e-table-header-utils.c:
	* widgets/table/e-table.c:
	* widgets/text/e-text.c:
	Fix various compiler warnings.  Patch from Milan Crha.


svn path=/trunk/; revision=34368
2007-10-10 04:54:36 +00:00