Commit Graph

13290 Commits

Author SHA1 Message Date
3e70bbe666 unregister ETableHeaderItem widget as a drag target when unrealizing it.
2001-12-11  Gustavo Giráldez  <gustavo.giraldez@gmx.net>

	* gal/e-table/e-table-header-item.c (ethi_unrealize): unregister
	ETableHeaderItem widget as a drag target when unrealizing it.

svn path=/trunk/; revision=14996
2001-12-11 22:20:31 +00:00
12b70e06ff use UTF-8 as the char set when testing pilot link
2001-12-10  JP Rosevear  <jpr@ximian.com>

 	* configure.in: use UTF-8 as the char set when testing pilot link

2001-12-10  JP Rosevear  <jpr@ximian.com>

	* e-pilot-util.c (e_pilot_utf8_to_pchar): use UTF-8 instead of
	UTF8 as the source char set
	(e_pilot_utf8_from_pchar): use UTF-8 instead of UTF8 as the
	destination char set

svn path=/trunk/; revision=14995
2001-12-11 22:00:12 +00:00
17957b8297 If multiple-selection is enabled but nothing is slected, fall back to
2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer-select-file.c (confirm): If multiple-selection is
	enabled but nothing is slected, fall back to using the filename in
	the entry box as the "selected" file.

svn path=/trunk/; revision=14994
2001-12-11 21:55:55 +00:00
84cc28032c If the widget is non-NULL, then gtk_widget_destroy that bad boy...
2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer-select-file.c
	(file_selection_info_destroy_notify): If the widget is non-NULL,
	then gtk_widget_destroy that bad boy...

svn path=/trunk/; revision=14984
2001-12-11 19:37:30 +00:00
8a954d0448 Fix typo.
svn path=/trunk/; revision=14983
2001-12-11 18:06:11 +00:00
a80cc021c1 A new icon that sucks less. We still need stoem Tuomas-love.
2001-12-11  Jon Trowbridge  <trow@ximian.com>

	* mail-need-reply.xpm: A new icon that sucks less.  We still need
	stoem Tuomas-love.

svn path=/trunk/; revision=14982
2001-12-11 18:05:55 +00:00
6642d01f14 Add ETable magic for our new "Needs Reply" column. (The next few entries
2001-12-11  Jon Trowbridge  <trow@ximian.com>

	* message-list.etspec: Add ETable magic for our new "Needs Reply"
	column.  (The next few entries are for bug #90)

	* message-list.h: Add COL_NEED_REPLY.

	* message-list.c: Move mail_need_reply_xpm to the end of
	states_pixmaps.
	(ml_duplicate_value): Handle COL_NEED_REPLY.
	(ml_free_value): Handle COL_NEED_REPLY.
	(ml_initialize_value): Handle COL_NEED_REPLY.
	(ml_value_is_empty): Handle COL_NEED_REPLY.  Added
	needs_reply_map[] array.
	(ml_value_to_string): Handle COL_NEED_REPLY.
	(ml_tree_value_at): Fix magic numbers, undoing my changes from the
	otehr day.  Add handler for COL_NEED_REPLY.
	(message_list_create_extras): Attach icons for COL_NEED_REPLY.
	(on_click): Undo my previous changes to display need-reply status
	in COL_MESSAGE_STATUS.  Add handing for COL_NEED_REPLY.

	* mail.h: Change mail_format_mime_message, mail_format_raw_message
	and the MailMimeHandlerFn typedef to take GtkHTML and
	GtkHTMLStream args, as per our changes in mail-format.c.

	* mail-format.c: Giant refactoring.  Remove the assumption
	throughout that we will always want to render into the GtkHTML
	object contained in the MailDisplay.  Instead, always pass in the
	GtkHTML and GtkHTMLStream that we want to write to.  Also, ignore
	theme work-arounds if the printing flag is set.  (This and what
	follows fixes bug #82)

	* mail-display.h: Remove GtkHTMLStream *stream from MailDisplay.
	We don't need it anymore.

	* mail-display.c (mail_display_render): Added.  Breaks the code
	that renders the message into the GtkHTML object out of
	mail_display_redisplay.
	(mail_display_redisplay): Call mail_display_render.
	(mail_display_init): Remove reference to ->stream.
	(mail_display_new): Remove reference to ->stream.

	* mail-callbacks.c (do_mail_print): Create a new GtkHTML to render
	our printed version into (via the new function
	mail_display_render.  Set the MailDisplay's printing flag to TRUE
	before we render, and set it back to FALSE afterwards.
	(do_mail_fetch_and_print): If the preview pane isn't open when we
	try to print, fetch the message before printing.
	(print_msg): Call do_mail_fetch_and_print.
	(print_preview_msg): Call do_mail_fetch_and_print.

	* folder-browser-ui.c: Remove "PrintMessage" and
	"PrintPreviewMessage" from message_pane_enables... these now work
	when the preview pane is closed.  Disable printing if multiple
	messages are selected.

svn path=/trunk/; revision=14981
2001-12-11 18:03:44 +00:00
0bdb17a8e3 "Ximian Evolution", not "Evolution".
* data/evolution.desktop.in (_Name): "Ximian Evolution", not
"Evolution".

svn path=/trunk/; revision=14980
2001-12-11 17:35:48 +00:00
3248591df9 Up VERSION to 1.1.0.99.
* configure.in: Up VERSION to 1.1.0.99.

(Also, fix the ChangeLog a bit, as Jeff committed some ChangeLog
entries that were not supposed to be committed.)

svn path=/trunk/; revision=14979
2001-12-11 17:35:09 +00:00
8a78eadaa6 Updated Slovak translation.
2001-12-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>

        * sk.po: Updated Slovak translation.

svn path=/trunk/; revision=14978
2001-12-11 14:34:16 +00:00
4c5bb9d903 Updated Ukrainian Translation
svn path=/trunk/; revision=14977
2001-12-11 14:08:38 +00:00
a014ee4309 Merging files:
2001-12-06  Christopher James Lahey  <clahey@ximian.com>

	* e-table-config.c, e-table-config.h (setup_gui): Set the title of
	the window here.

	* e-table-header-item.c (ethi_popup_customize_view): Use a useful
	string for the header here.

svn path=/trunk/; revision=14975
2001-12-11 10:10:02 +00:00
dc83cb0331 Merging changes:
2001-12-06  Christopher James Lahey  <clahey@ximian.com>

	* e-table-subset.c (etss_get_view_row): Removed incorrect calls to
	e_table_model_row_changed here.

svn path=/trunk/; revision=14973
2001-12-11 10:02:27 +00:00
ef46478b1c Merging changes:
2001-12-05  Christopher James Lahey  <clahey@ximian.com>

	* e-table-header-item.c (ethi_find_col_by_x,
	ethi_find_col_by_x_nearest): Made these return 0 to the left of
	all columns and ethi_find_col_by_x return cols - 1 if to the right
	of all columns.  Fixes Ximian bug #14414.

svn path=/trunk/; revision=14971
2001-12-11 09:56:14 +00:00
b9cdb00a64 Don't expunge when we sync anymore, this fixes bug #4472.
2001-12-10  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-ops.c (filter_folder_filter): Don't expunge when we sync
	anymore, this fixes bug #4472.

svn path=/trunk/; revision=14969
2001-12-11 03:24:59 +00:00
19339ece30 select_file_attachments now returns a GPtrArray so handle that and loop
2001-12-10  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer-attachment-bar.c (add_from_user):
	select_file_attachments now returns a GPtrArray so handle that and
	loop until we've added all the attachment files.

	* e-msg-composer-select-file.c (confirm): Add an evil kludge to
	get a list of filenames from the GtkFileSelection widget based on
	the label in the history option menu item and the base filenames
	of the selected items in the filename clist.
	(create_file_selection): Setup the clist to allow multiple
	selection.
	(file_selection_info_destroy_notify): Destroy the GPtrArray
	containing the list of xselected files.
	(select_file_internal): Return a GPtrArray of files instead of a
	char *.

svn path=/trunk/; revision=14968
2001-12-11 01:01:05 +00:00
63ce54907c Make sure that the message subject is non-NULL beforetrying to base a
2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-autofilter.c (rule_from_message): Make sure that the
	message subject is non-NULL beforetrying to base a vfolder rule
	off it. Fixes bug #16284.

2001-12-07  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-accounts.c (construct): Connect to the dialog's "destroy"
	event and close any druids/editors that may be open when that
	signal is caught. Fixes bug #16501.

	* mail-vfolder.c (vfolder_edit): Set the window title to "Virtual
	Folders". Fixes bug #16695.

svn path=/trunk/; revision=14966
2001-12-10 20:09:37 +00:00
4996c32075 Only execute an executable sig file if a magic environment variable is
2001-12-10  Jon Trowbridge  <trow@ximian.com>

	* e-msg-composer.c (get_file_content): Only execute an executable
	sig file if a magic environment variable is set.

svn path=/trunk/; revision=14962
2001-12-10 19:30:24 +00:00
68f8ea5429 removed code that connects to GnomeCalendar's "dates_shown_changed"
2001-12-10  Damon Chaplin  <damon@ximian.com>

	* gui/control-factory.c (control_factory_new_control): removed code
	that connects to GnomeCalendar's "dates_shown_changed" signal.

	* gui/calendar-commands.c (gcal_calendar_dates_change_cb):
	(calendar_control_activate): moved it here, so it gets reconnected
	whenever the control is activated. Fixes bug #15798.

svn path=/trunk/; revision=14960
2001-12-10 19:24:42 +00:00
9786b8ab7d if all we have is the TZID, see if it is one of our TZIDs and if so get
2001-12-10  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_display_name): if all
	we have is the TZID, see if it is one of our TZIDs and if so get the
	city name out of it. Fixes bug #16571.

svn path=/trunk/; revision=14957
2001-12-10 19:15:40 +00:00
081f6dbb1b Protect against either of the types being NULL.
2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-mime-utils.c (header_content_type_simple): Protect against
	either of the types being NULL.

2001-12-05  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-mime-filter-basic.c (filter): If complete() allocates
	len+2 bytes for the out buffer, so should this. See bug #16371 for
	an example case.

2001-12-05  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-sasl-digest-md5.c: iconv() returns a size_t, not an int.

	* camel-pgp-context.c: The return value of iconv() is a size_t,
	not an int.

	* camel-mime-part-utils.c (convert_buffer): Always use size_t args
	for iconv().

	* camel-mime-filter-charset.c (complete): Always use size_t args
	for iconv().
	(filter): Same.

	* camel-mime-utils.c (header_address_fold): Make headerlen a
	size_t instead of an int.
	(header_fold): Same.
	(base64_encode_close): We should be returning a size_t and inlen
	should also be a size_t.
	(base64_encode_step): Same here.
	(base64_decode_step): Here too.
	(base64_encode_simple): And here...
	(base64_decode_simple): Same.
	(uuencode_close): We should also use size_t's here...
	(uuencode_step): And here too.
	(uudecode_step): And also here.
	(quoted_encode_close): Same idea here.
	(quoted_encode_step): Again here.
	(quoted_decode_step): Here too.
	(quoted_encode): Input length should be a size_t.
	(rfc2047_decode_word): Same.
	(g_string_append_len): Here too.
	(append_8bit): "
	(rfc2047_encode_word): "
	(quote_word): "
	(hex_decode): "
	(rfc2184_decode): Use size_t's with iconv().
	(header_decode_param): Same.

svn path=/trunk/; revision=14956
2001-12-10 19:14:32 +00:00
bc9bb5281b fixed executable name. Fixes bug #16880.
2001-12-10  Damon Chaplin  <damon@ximian.com>

	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: fixed executable
	name. Fixes bug #16880.

svn path=/trunk/; revision=14955
2001-12-10 19:09:38 +00:00
5f447101dd Don't crash if the text string is NULL. (text_draw_with_objects): Don't
2001-12-10  Jon Trowbridge  <trow@ximian.com>

        * gal/e-text/e-text.c (text_width_with_objects): Don't crash if
        the text string is NULL.
        (text_draw_with_objects): Don't crash if the text string is NULL.
        (Fixes #16359)

svn path=/trunk/; revision=14954
2001-12-10 17:50:14 +00:00
edf6873ade set paper size to _("US-Letter"), use gtk_html_print_set_master
2001-12-05  Radek Doulik  <rodo@ximian.com>

	* mail-callbacks.c (do_mail_print): set paper size to
	_("US-Letter"), use gtk_html_print_set_master

svn path=/trunk/; revision=14953
2001-12-10 17:29:56 +00:00
7cdf441965 Don't just assume all of the GtkHTMLEmbedded's fields are filled in, since
* mail-display.c (on_object_requested): Don't just assume all of
	the GtkHTMLEmbedded's fields are filled in, since HTML messages
	may have <object>s in them that we're not expecting.

	* mail-send-recv.c (mail_send_receive): Add a "current_folder"
	arg.
	(build_dialogue): Remember the current_folder
	(free_send_data): If current_folder is set, refresh it so it's
	guaranteed to be synced with the folder tree. Fixes #14770.

	* mail-callbacks.c (send_receive_mail): Pass current_folder to
	mail_send_receive().

svn path=/trunk/; revision=14950
2001-12-10 14:34:45 +00:00
4e5542ad28 Fix the tm_gmtoff case (its sign is the opposite of "timezone"). Fixes
* camel-mime-message.c (camel_mime_message_set_date): Fix the
	tm_gmtoff case (its sign is the opposite of "timezone"). Fixes
	#14678

svn path=/trunk/; revision=14948
2001-12-10 14:28:55 +00:00
78e97ea838 Oops... this didn't get committed before.
svn path=/trunk/; revision=14947
2001-12-10 03:55:08 +00:00
b5e7713c8e Implements marking messages as "Need Reply".
Implements marking messages as "Need Reply".

2001-12-09  Jon Trowbridge  <trow@ximian.com>

	* mail-need-reply.xpm: Added a really, really ugly and
	awful icon to symbolize "message needs a reply".

	* Makefile.am (EXTRA_DIST): Added mail-need-reply.xpm.

2001-12-09  Jon Trowbridge  <trow@ximian.com>

	* camel-folder-summary.c: Add "NeedsReply" to the flag_names array
	for CAMEL_MESSAGE_NEEDS_REPLY.

	* camel-folder-summary.h: Added CAMEL_MESSAGE_NEEDS_REPLY flag.

2001-12-09  Jon Trowbridge  <trow@ximian.com>

	* vfoldertypes.xml: Add "Needs Reply" option to different status
	types.

	* filtertypes.xml: Add "Needs Reply" option to different status
	types.

2001-12-09  Jon Trowbridge  <trow@ximian.com>

	* message-list.c: #include "art/mail-need-reply.xpm".
	(ml_tree_value_at): Adjust magic numbers, show "Need Reply" icon
	if the message needs reply.
	(message_list_create_extras): Adjust magic numbers to add new
	icon.
	(on_click): Changed to toggle between unread, read, and need reply
	when the status icon is clicked.

	* mail-callbacks.c (mark_as_needing_reply): Added.
	(mark_as_not_needing_reply): Added.  Add "set" value to struct
	post_send_data.
	(composer_sent_cb): Use both "flags" and "set" elements of
	post_send_data when setting message flags.
	(mail_reply): Clear "Needs Reply" flag when we actually reply to a
	message.

	* folder-browser.c: Changed flag values to be given by
	bit-shifting (1<<5) vs. base-ten (32).  Added
	CAN_MARK_DOESNT_NEED_REPLY flag.  Added "Mark as Needing Reply"
	and "Mark as Not Needing Reply" elements to context menu.
	(on_right_click): Hide "Mark as (Not) Needing Reply" context menu
	elements as appropriate.

svn path=/trunk/; revision=14946
2001-12-10 03:50:36 +00:00
098db6b2ad Added vfolders.xml containing default initial vfolders - important vfolder
2001-12-10  Not Zed  <NotZed@Ximian.com>

        * Makefile.am: Added vfolders.xml containing default initial
        vfolders - important vfolder and unread vfolder, #1040.

svn path=/trunk/; revision=14945
2001-12-09 22:41:52 +00:00
9ec0935136 *** empty log message ***
svn path=/trunk/; revision=14944
2001-12-09 15:17:44 +00:00
d1ddbc231d if we have an alarm that can be represented on the pilot, set the
2001-12-08  JP Rosevear  <jpr@ximian.com>

  	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
  	if we have an alarm that can be represented on the pilot, set the
  	appointment fields appropriately, if the duration has values for
  	minutes and/or hours and/or days, use the lowest common
  	denominator
  	(comp_from_remote_record): if the appointment on the pilot has an
  	alarm, find the first alarm an item currently had that is relative
  	to the start and with a negative duration and update it (or create
  	a new one if no valid ones exist)

 	* cal-util/cal-component.c (cal_component_get_alarm_uids): build
  	list in the order they appear in the component so we get
  	consisting order for the gui and for the pilot

svn path=/trunk/; revision=14943
2001-12-08 23:18:37 +00:00
9cb9cf06c9 s/%/%s
2001-12-08  Rodrigo Moya <rodrigo@ximian.com>

	* gui/calendar-config.c (calendar_config_get_default_uri):
	(calendar_config_get_default_tasks_uri): s/%/%s

svn path=/trunk/; revision=14942
2001-12-08 12:37:49 +00:00
5bc3165d3b (committed by Damon)
2001-11-09  Federico Mena Quintero  <federico@ximian.com>

	(committed by Damon)

	Fix bug #14699.

	* pcs/query.c (QueryState): Added a state QUERY_WAIT_FOR_BACKEND
	to indicate that the query is not populated as we are waiting for
	the backend to be opened.
	(query_init): Start in the QUERY_WAIT_FOR_BACKEND state.
	(query_destroy): Only disconnect from the backend if we are in a
	state that implies that we are connected to its signals.
	(query_construct): If the backend is already loaded, immediately
	set the state to QUERY_START_PENDING.
	(backend_opened_cb): Disconnect from the backend's "opened"
	signal.  Set the state to QUERY_START_PENDING.
	(match_component): We can now only match components if the query
	is in progress or if it is done.  Assert to that effect, and do
	not ensure_sexp().
	(match_component): Do not check for a nonexistent component using
	g_return_if_fail().  Also, there is no need to ref/unref the
	component.
	(backend_obj_updated_cb): Assert to the effect of our state.
	(backend_obj_removed_cb): Likewise.
	(parse_sexp): Renamed from ensure_sexp().  Assert that the query
	has not started.  Do not disconnect from the backend's signals
	here, since we have no connections.
	(start_query_cb): Set the state to QUERY_IN_PROGRESS here instead
	of in populate_query().

svn path=/trunk/; revision=14941
2001-12-08 03:30:30 +00:00
2292afbc44 apparently a merge removed the openssl checks - ugh.
svn path=/trunk/; revision=14940
2001-12-07 21:41:18 +00:00
d0053fd3c7 Check that the mail-display hasn't been destroyed.
2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-display.c (stream_write_or_redisplay_when_loaded): Check
	that the mail-display hasn't been destroyed.
	(mail_display_redisplay): Same here.

2001-12-07  Dan Winship  <danw@ximian.com>

	* mail-send-recv.c (receive_update_got_store): If updating a store
	that we don't have an associated storage for, just request a
	folder tree and then free it. (For the Connector)

	* mail-callbacks.h: Add missing part of Jeff's 12-03 patch so this
	actually compiles.

svn path=/trunk/; revision=14938
2001-12-07 20:25:04 +00:00
18912c528b Remove a reference to code I don't want to commit yet. :-)
2001-12-07  Jon Trowbridge  <trow@ximian.com>

        * gui/component/select-names/e-select-names-manager.c
        (e_select_names_manager_entry_new): Remove a reference to code
        I don't want to commit yet. :-)

svn path=/trunk/; revision=14935
2001-12-07 17:01:17 +00:00
a3b92fe138 Extensively refactored -- this code had gotten _really_ ugly. Untangle
2001-12-07  Jon Trowbridge  <trow@ximian.com>

        * gui/component/select-names/e-select-names-manager.c: Extensively
        refactored -- this code had gotten _really_ ugly.  Untangle things
        to the point where our reference counting problems are fixable.

        * gui/component/select-names/e-select-names-bonobo.c
        (impl_destroy): Remove all of the ugly hacks to work around our
        memory management problems, and just unref the manager.
	(Fixes #14412)

svn path=/trunk/; revision=14934
2001-12-07 16:43:44 +00:00
3be029c79a Remove perl.com
svn path=/trunk/; revision=14933
2001-12-07 16:42:31 +00:00
4c6cdbb2ad if the key in the config database does not exist, just return the local
2001-12-07  Rodrigo Moya <rodrigo@ximian.com>

	* gui/calendar-config.c (calendar_config_get_default_uri):
	(calendar_config_get_default_tasks_uri): if the key in the config
	database does not exist, just return the local URIs, but never
	return NULL

svn path=/trunk/; revision=14930
2001-12-07 15:40:06 +00:00
b48a32253b default component classification to PUBLIC
2001-12-06  Rodrigo Moya <rodrigo@ximian.com>

	* gui/dialogs/event-page.c (event_page_fill_widgets): default
	component classification to PUBLIC

svn path=/trunk/; revision=14927
2001-12-07 15:25:52 +00:00
1452edcf17 Updated Swedish translation.
2001-12-07  Christian Rose  <menthos@menthos.com>

	* sv.po: Updated Swedish translation.

svn path=/trunk/; revision=14925
2001-12-07 03:23:04 +00:00
7ac457c031 s/PREVIEW_RELEASE/VERSION_COMMENT
2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-ops.c (mail_send_message): s/PREVIEW_RELEASE/VERSION_COMMENT

svn path=/trunk/; revision=14924
2001-12-07 03:14:30 +00:00
cdf035a464 s/PREVIEW_VERSION/VERSION_COMMENT
2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>

	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT

svn path=/trunk/; revision=14923
2001-12-07 03:13:31 +00:00
a86bcdd036 Explicitly destroy the EMeetingModel. This is a hack to work around
2001-12-06  Jon Trowbridge  <trow@ximian.com>

        * gui/dialogs/event-editor.c (event_editor_destroy): Explicitly
        destroy the EMeetingModel.  This is a hack to work around problems
        with the reference counting; we are still leaking the
        EMeetingModels.

        * gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
        Ref our EMeetingModel.
        (e_meeting_time_selector_destroy): Unref the model.

        * gui/e-meeting-model.c (destroy): Properly destroy
        corba_select_names with a call to bonobo_object_release_unref.
        (Fixes 14002)

svn path=/trunk/; revision=14919
2001-12-07 00:17:04 +00:00
92b2a3c90a Added. Executes the given file and returns its output as a string.
2001-12-06  Jon Trowbridge  <trow@ximian.com>

	* e-msg-composer.c (executed_file_output): Added.  Executes the
	given file and returns its output as a string.
	(get_file_content): Stats the file to see if it is executable.
	If it is, execute it and return the string.  If not, just read
	the file and return the contents.

svn path=/trunk/; revision=14917
2001-12-06 23:13:56 +00:00
159dc73e63 ack, forgot about this piece of the patch
svn path=/trunk/; revision=14916
2001-12-06 22:02:21 +00:00
53304a8b76 Add a AC_DEFINE for PREVIEW_RELEASE which is a string that will be
2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>

	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
	string that will be appended to the X-Mailer header.

svn path=/trunk/; revision=14914
2001-12-06 21:53:56 +00:00
9b46a3eda4 Don't append "(Preview Version)" at the end of the version string. Use the
2001-12-03  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-ops.c (mail_send_message): Don't append "(Preview Version)"
	at the end of the version string. Use the PREVIEW_RELEASE #define
	instead.

svn path=/trunk/; revision=14913
2001-12-06 21:51:58 +00:00
a1725df2bb Merging changes:
2001-12-04  Christopher James Lahey  <clahey@ximian.com>

	* e-tree-selection-model.c (e_tree_selection_model_change_cursor):
	Unset selection->old_selection here.

svn path=/trunk/; revision=14912
2001-12-06 20:21:51 +00:00
1c0e0acdad move search_for_dn's contents here, and add an "existing_objectclasses"
2001-12-05  Chris Toshok  <toshok@ximian.com>

	* backend/pas/pas-backend-ldap.c
	(search_for_dn_with_objectclasses): move search_for_dn's contents
	here, and add an "existing_objectclasses" parameter that we pass
	on to build_card_from_entry.
	(search_for_dn): call search_for_dn_with_objectclasses with NULL
	for existing_objectclasses.
	(build_card_from_entry): if existing_objectclasses is non-NULL,
	fill it in with the list of existing objectclass values for this
	entry.
	(add_objectclass_mod): if existing_objectclasses is non-NULL,
	meaning we're modifying an entry, search in the existing
	objectclasses for the ones we want to be there, and only add
	what's missing.  If none are missing, don't add objectclass_mod to
	the list of mods.
	(create_card_handler): track change to add_objectclass_mod (pass
	NULL).
	(modify_card_handler): use search_for_dn_with_objectclasses
	instead of search_for_dn, and pass the existing objectclasses to
	add_objectclass_mod.  also, free the list when we're done.
	(poll_ldap): track change to build_card_from_entry (pass NULL).

svn path=/trunk/; revision=14909
2001-12-06 20:01:48 +00:00