aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/e-config.c
Commit message (Collapse)AuthorAgeFilesLines
* Whitespace cleanup.Matthew Barnes2012-04-021-1/+1
| | | | | Replace 8-space indentation with tab characters, and various other automated cleanups.
* EConfig: Support custom page skip callbacks.Matthew Barnes2012-03-081-1/+61
| | | | | | | | Add e_config_add_skip_check() to install a callback function to decide whether to skip a particular page in a GtkAssistant, useful if a page may be blank in certain conditions. This feature is not used in Evolution 3.4, but will be used in 3.5.
* EConfig: Miscellaneous cleanups.Matthew Barnes2012-03-071-31/+37
|
* Coding style and whitespace cleanup.Matthew Barnes2012-02-201-3/+8
|
* Don't explicity show the window. We do gtk_widget_show where we'd wantSrinivasa Ragavan2011-12-011-1/+0
| | | | it. The capplet flickrs in Meego. Fixes Meego Bugzilla: #20191
* Bug #665103 - Blank composer/mail/network preferences windowsMilan Crha2011-11-291-1/+0
|
* EConfig: Debugability improvements.Matthew Barnes2011-11-131-5/+22
|
* a small changePunit Jain2011-11-101-1/+1
|
* Coding style and whitespace cleanup.Matthew Barnes2011-09-041-61/+93
|
* EConfig: Broadcast abort/commit events by way of signals.Matthew Barnes2011-08-111-53/+53
| | | | | Remove the clumsy abortfunc and commitfunc callback arguments from e_config_add_items().
* Bug 652958 - Evolution Account Assistant jumps stepsMatthew Barnes2011-07-011-8/+36
| | | | | | | The GTK+ patch in bug 653705 is also required for the Account Assistant to work properly under the new GtkAssistant design in GTK+ 3.1. This commit only deals with sidebar ordering issues.
* EConfig: Minor cleanups.Matthew Barnes2011-06-301-2/+2
|
* Bug 537691 - Account editor window HIGMatthew Barnes2011-05-231-18/+25
| | | | | | Change the OK button to Apply, and fix the padding around the window edges. People already bitching about the window being too tall are just gonna bitch louder now, but it does look better on normal size screens.
* Coding style cleanups.Matthew Barnes2011-05-091-29/+29
|
* Coding style and whitespace cleanup.Matthew Barnes2011-03-061-1/+2
|
* Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedlyMilan Crha2011-02-251-5/+1
|
* Bug #641011 - Ugly appointment editing windowsMilan Crha2011-02-031-0/+1
|
* Dialogs no longer have separators.Matthew Barnes2011-01-251-2/+1
|
* Replace EBinding with GBinding.Matthew Barnes2010-10-141-2/+4
| | | | | | GObject now does property bindings itself. Requires GLib >= 2.26.
* Coding style and whitespace cleanup.Matthew Barnes2010-08-291-134/+134
|
* GObject boilerplate cleanup.Matthew Barnes2010-08-251-73/+29
| | | | | | | Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over manual GType registration. This is just a start... lots more to do.
* Bug 622535 - Account assistant loops on first runMatthew Barnes2010-06-261-62/+104
| | | | | | | | | | | The issue was EConfig's GtkAssistantPageFunc callback assumed the pages in the GtkAssistant were sorted, but that assumption breaks as EPlugins with custom EConfigItemFactoryFunc callbacks are introduced and EConfig has to rebuild its assistant pages. It's an unnecessary requirement anyway, since EConfig already keeps a sorted list of widgets internally. After correcting that assumption a number of hacks addressing previous page ordering bugs fell out.
* Convert "startup-wizard" to an EExtension.Matthew Barnes2010-06-031-12/+25
| | | | | | | | | | | | | | Convert the "startup-wizard" EPlugin to an EExtension, and fix up the importing UI a bit (but it still needs a lot more love). Importing progress is now shown directly in the GtkAssistant window. Define a new EConfigItem type (E_CONFIG_PAGE_PROGRESS) for creating progress pages in a GtkAssistant. Also, change EMAccountEditor semantics slightly: you now have to call e_config_create_window() manually after creating a new EMAccountEditor instance. This allows extra EConfigItems (specifications for the window content) to be added manually before the window is created.
* Hide EConfig sections that have no visible widgetsFederico Mena Quintero2010-04-141-15/+77
| | | | | | | | | | | | | | | | | | | | The EConfig code that creates widgets based on .eplug descriptions will already hide sections that end up containing no child widgets. Here we also make that code hide sections that end up containing only invisible child widgets. We will use this from the actual plugins, so that if they decide not to show any widgets in Express mode, then the corresponding configuration sections will not show up in the preferences dialog. EConfig types 'section' and 'section-table' have an internal factory function, which doesn't return the actual GtkFrame that they create. Instead, they return a GtkContainer which is the actual vbox or table used to insert child widgets. Here we modify the internal factory function to also return the actual GtkFrame that it creates, so that the calling code can hide *that* frame properly. Signed-off-by: Federico Mena Quintero <federico@novell.com>
* Update API documentation.Matthew Barnes2010-02-101-6/+7
| | | | Also, start fixing some Gtk-Doc warnings. There's a lot.
* Coding style and whitespace cleanup.Matthew Barnes2010-01-311-4/+4
|
* Fix a potential uninitialized argument in ech_config_section_factory().Matthew Barnes2010-01-161-1/+1
| | | | Caught by the Clang Static Analyzer.
* Bug 600014 - Remove warnings from ech_config_widget_factory()Matthew Barnes2009-10-291-15/+1
|
* BugĀ 599842 - EConfig does not respond to disabling/enabling EPluginsMatthew Barnes2009-10-281-11/+99
| | | | | | Requires eplug files to supply <item type="section"> or <item type="section_table"> for this to work. The container widget's "visible" property gets bound to the plugin's "enabled" property.
* EConfig cleanup.Matthew Barnes2009-10-271-179/+284
|
* Bug #596720 - Account assistance repeats itself after finishingMilan Crha2009-10-121-4/+9
|
* Bug 597108 - E_CONFIG_SECTION headers not properly escapedMatthew Barnes2009-10-021-1/+1
|
* Bug 595812 - Crash after finishing account set upMatthew Barnes2009-09-291-34/+19
|
* Bug 596186 - New Mail account setup Assistant window is blankMatthew Barnes2009-09-291-1/+0
|
* Get EConfig and EEvent hooks working again.Matthew Barnes2009-09-011-1/+3
| | | | | | | | | | | | | There were a number of problems: - Walk the GType tree to find EPluginHook subclasses, instead of just registering the immediate children. - Some EConfig and EEvent subclasses were not being configured properly (particularly the mail and calendar subclasses). - Add preference window pages after the main loop starts to make sure all plugins and plugin hooks are installed first.
* BugĀ 567260 - Migrate from GnomeDruid to GtkAssistantMilan Crha2009-08-181-168/+290
|
* Stop abusing forward declarations.Matthew Barnes2009-06-191-5/+5
|
* More code cleanup.Matthew Barnes2009-06-021-3/+3
|
* Whitespace cleanup.Matthew Barnes2009-05-291-2/+2
|
* Prefer GLib basic types over C types.Matthew Barnes2009-05-271-39/+39
|
* Remove trailing whitespace, again.Matthew Barnes2009-05-271-1/+1
|
* Fix EConfig bugs for Anjal's account setup.Srinivasa Ragavan2009-05-221-9/+12
|
* GN-bug #572348 - Removed deprecated Gtk+ symbolsMilan Crha2009-04-241-3/+3
| | | | Some still left, because those gone in kill-bonobo branch.
* Use the translated the EConfigItem label when building the UI.Matthew Barnes2009-01-021-5/+10
| | | | | | | | | | 2009-01-01 Matthew Barnes <mbarnes@redhat.com> * e-util/e-config.c (ec_rebuild): Use the translated the EConfigItem label when building the UI. svn path=/trunk/; revision=36961
* ** Fix for bug #332729Milan Crha2008-11-271-0/+4
| | | | | | | | | | | | 2008-11-27 Milan Crha <mcrha@redhat.com> ** Fix for bug #332729 * e-config.c: (ep_finalise): Disconnect handlers on the widget before freeing the structure it is using. svn path=/trunk/; revision=36816
* Change License from GPL to LGPL. 2nd batch.Sankarasivasubramanian Pasupathilingam2008-09-031-14/+14
| | | | | | More changes to come. svn path=/trunk/; revision=36247
* ** Fixes bug #546892Matthew Barnes2008-08-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2008-08-11 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #546892 * e-util/e-icon-factory.c (e_icon_factory_get_image): Kill this function. Use gtk_image_new_from_icon_name(). * e-util/e-icon-factory.c (e_icon_factory_get_icon_list): Kill this function. Use gtk_window_set_icon_name(). * widgets/misc/e-activity-handler.c: * widgets/misc/e-task-widget.c: Purge the GdkPixbuf arguments from the API. We've been ignoring them since the spinner icon was added. * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * calendar/gui/alarm-notify/alarm-notify-dialog.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/alarm-list-dialog.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/changed-comp.c: * calendar/gui/dialogs/delete-error.c: * calendar/gui/dialogs/select-source-dialog.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: * widgets/misc/e-combo-button.c: * widgets/misc/e-info-label.c: * widgets/misc/e-url-entry.c: * widgets/misc/e-task-widget.c: Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). * addressbook/gui/contact-editor/e-contact-editor-im.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/e-timezone-entry.c: * e-util/e-gui-utils.c: * e-util/e-popup.c: * plugins/import-ics-attachments/icsimporter.c: * plugins/itip-formatter/itip-view.c: * mail/em-folder-browser.c: * mail/em-format-html-display.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). * calendar/gui/alarm-notify/alarm-queue.c: * plugins/mail-notification/mail-notification.c: Prefer gtk_status_icon_set_from_icon_name() over gtk_status_icon_set_from_pixbuf(). * addressbook/gui/component/addressbook-view.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-memo-table.c: * mail/mail-mt.c: e_activity_handler_operation_started() no longer takes a GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a spinner icon. svn path=/trunk/; revision=35958
* updated novell copyright notices (left others alone)Jeffrey Stedfast2008-06-211-1/+1
| | | | svn path=/trunk/; revision=35665
* ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES andMatthew Barnes2008-06-061-9/+1
| | | | | | | | | | 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
* ** Part of fix for bug #515744Milan Crha2008-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2008-02-18 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #515744 * addressbook/gui/component/addressbook-migrate.c: (get_source_name): * plugins/groupwise-features/send-options.c: (get_source): * plugins/groupwise-features/share-folder-common.c: (get_container_id): * plugins/groupwise-features/install-shared.c: (install_folder_response): * plugins/external-editor/external-editor.c: (convert_to_camel_internet_address), (org_gnome_external_editor): * plugins/itip-formatter/itip-formatter.c: (idle_open_cb): * mail/em-folder-view.c: (emfv_setup_view_instance): * mail/mail-component.c: (impl_finalize): * mail/message-list.c: (ml_tree_value_at): * composer/e-msg-composer.c: (drop_action): * e-util/e-config.c: (ep_finalise): Use proper member to free. * widgets/misc/e-cursors.c: (e_cursors_init): * widgets/misc/e-calendar-item.c: (e_calendar_item_draw_month): * calendar/gui/dialogs/comp-editor.c: (drop_action): * calendar/gui/calendar-config.c: (calendar_config_get_hide_completed_tasks_sexp): * calendar/gui/comp-editor-factory.c: (edit_existing): * calendar/gui/e-day-view.c: (e_day_view_reshape_long_event), (e_day_view_on_top_canvas_drag_data_received): * calendar/gui/e-day-view-main-item.c: (e_day_view_main_item_draw_events_in_vbars), (e_day_view_main_item_draw_long_events_in_vbars): * calendar/gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event): * calendar/gui/e-cal-model.c: (redo_queries): * calendar/gui/e-calendar-table.c: (e_calendar_table_open_task): * calendar/gui/e-memo-table.c: (open_memo): * calendar/gui/print.c: (print_todo_details): * calendar/gui/migration.c: (get_source_name): Memory leak fix. * calendar/gui/e-week-view.c: (e_week_view_reshape_events): Simplifies things. svn path=/trunk/; revision=35044
* ** Remove trailing whitespace from source code.Matthew Barnes2007-11-151-44/+44
| | | | | | | | | 2007-11-14 Matthew Barnes <mbarnes@redhat.com> ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537
* Warning fixes. - NULL vs 0 - ANSIfication of declarations - missingKjartan Maraas2007-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 2007-10-26 Kjartan Maraas <kmaraas@gnome.org> * e-config.c: * e-event.c: * e-gui-utils.c: * e-import.c: * e-menu.c: * e-mktemp.c: (get_dir): * e-popup.c: * e-profile-event.c: (e_profile_event_peek): * e-util.c: (get_font_options): * e-xml-utils.c: (e_xml_get_string_prop_by_name), (e_xml_get_string_prop_by_name_with_default), (e_xml_get_translated_string_prop_by_name): Warning fixes. - NULL vs 0 - ANSIfication of declarations - missing include svn path=/trunk/; revision=34428
* ** Fix for bug #471791 Srinivasa Ragavan2007-09-101-4/+7
| | | | svn path=/trunk/; revision=34214
* Update FSF address in header comments (#469886). Patch from TobiasMatthew Barnes2007-09-021-1/+1
| | | | | | | | | | 2007-09-02 Matthew Barnes <mbarnes@redhat.com> * Update FSF address in header comments (#469886). Patch from Tobias Mueller. svn path=/trunk/; revision=34151
* Clean up compiler warnings in e-util directory (#438467).Matthew Barnes2007-06-031-3/+3
| | | | svn path=/trunk/; revision=33623
* ** Fixes bug #419524Matthew Barnes2007-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 2007-03-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #419524 * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. * e-util/e-xml-utils.c (e_xml_get_child_by_name_by_lang_list): * mail/em-migrate.c (emm_setup_initial): * shell/e-component-registry.c (query_components): * shell/e-shell-settings-dialog.c (load_pages): * shell/e-shell-window-commands.c (command_quick_reference): * tools/killev.c (main): Use g_get_language_names() instead of gnome_i18n_get_language_list(). * e-util/e-util.c: Remove e_gettext(). * e-util/Makefile.am: Remove e-i18n.h. svn path=/trunk/; revision=33319
* Use guint for 1-bit bitfield. Remove unused var Remove unused vars RenameKjartan Maraas2006-02-081-1/+1
| | | | | | | | | | | | | | | | | 2006-02-08 Kjartan Maraas <kmaraas@gnome.org> * e-config.c: Use guint for 1-bit bitfield. * e-icon-factory.c: (load_icon): Remove unused var * e-import.c: (ep_init), (ep_finalise): Remove unused vars * e-plugin.c: (e_plugin_register_type): Rename a var * e-plugin.h: guint for 1-bit bitfield * e-popup.c: (ep_finalise): Add comment. * e-profile-event.c: Remove unused prototype * e-text-event-processor-emacs-like.c: (e_text_event_processor_emacs_like_event): Add comment about a compiler warning from the Intel compiler. svn path=/trunk/; revision=31446
* added a idle handler that calls ec_rebuild after callback operations areVivek Jain2005-07-111-2/+27
| | | | | | | | | | | 2005-07-11 Vivek Jain <jvivek@novell.com> * e-config.c: (e_config_target_changed): added a idle handler that calls ec_rebuild after callback operations are completed. **Fixes #307794 svn path=/trunk/; revision=29721
* We should set the title of the window.Mengjie Yu2005-04-281-0/+1
| | | | | | | | | | | 2005-04-27 Mengjie Yu <meng-jie.yu@sun.com> * e-config.c: (e_config_create_window): We should set the title of the window. Fixes #300477 svn path=/trunk/; revision=29236
* ** See bug #73550 (related for config pages)Not Zed2005-03-161-10/+15
| | | | | | | | | | | | 2005-03-14 Not Zed <NotZed@Ximian.com> ** See bug #73550 (related for config pages) * e-config.c (ech_config_widget_factory): if we are disabled, then noop. (ech_config_factory, ech_commit, ech_abort): same. svn path=/trunk/; revision=29031
* ** See bug #61363 & mail/ChangeLogNot Zed2005-02-211-9/+26
| | | | | | | | | | | | | | | | 2005-02-10 Not Zed <NotZed@Ximian.com> ** See bug #61363 & mail/ChangeLog * e-config.c (ec_rebuild): work properly if the page factory returns NULL, so the code can selectivly turn off pages. (ec_druid_next, ec_druid_prev): skip non-created pages. * e-config.c (ec_rebuild): re-order notebook child properly. Connect to destroy events so we update the widget-node widget pointer properly for linked ui reconfigures. svn path=/trunk/; revision=28827
* Don't let the 'id' field, which identifies the target menu/whatever, to beNot Zed2005-02-071-0/+5
| | | | | | | | | | | | 2005-02-07 Not Zed <NotZed@Ximian.com> * e-popup.c (emph_construct_menu): * e-menu.c (emph_construct_menu): * e-config.c (emph_construct_menu): Don't let the 'id' field, which identifies the target menu/whatever, to be NULL, otherwise it gets added to all. svn path=/trunk/; revision=28728
* If the plugin isn't enabled, return TRUE so that the suer doesn't getJeffrey Stedfast2005-01-271-1/+4
| | | | | | | | | | 2005-01-26 Jeffrey Stedfast <fejj@novell.com> * e-config.c (ech_check): If the plugin isn't enabled, return TRUE so that the suer doesn't get locked in one of the account druid pages. svn path=/trunk/; revision=28565
* Add the GTK_DIALOG_NOSEPARATOR flag, and set appropriate border widthsRodney Dawes2005-01-071-1/+8
| | | | | | | | | | 2005-01-06 Rodney Dawes <dobey@novell.com> * e-config.c (e_config_create_window): Add the GTK_DIALOG_NOSEPARATOR flag, and set appropriate border widths around the main dialog vbox, and action area, to be more HIG compliant svn path=/trunk/; revision=28262
* Fixes #30992JP Rosevear2004-12-221-1/+1
| | | | | | | | | | | 2004-12-21 JP Rosevear <jpr@novell.com> Fixes #30992 * e-config.c (e_config_create_window): use cancel rather than close button svn path=/trunk/; revision=28171
* set the table spacings to 6 for generated tables.Not Zed2004-12-061-7/+22
| | | | | | | | | | | | | | 2004-12-06 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): set the table spacings to 6 for generated tables. 2004-11-22 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): if the table existed before and we have no factory, destroy it always. svn path=/trunk/; revision=28069
* revert the patch from chenthill, this wont work yet.Not Zed2004-12-031-4/+1
| | | | | | | | | 2004-12-03 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): revert the patch from chenthill, this wont work yet. svn path=/trunk/; revision=28057
* add mnemonic for label. add description for password dialog.Mengjie Yu2004-12-011-1/+1
| | | | | | | | | 2004-12-01 Mengjie Yu <meng-jie.yu@sun.com> * e-config.c: (ec_rebuild):add mnemonic for label. * e-passwords.c: (ep_ask_password):add description for password dialog. svn path=/trunk/; revision=28028
* get the image directly from the icon factoryJP Rosevear2004-11-261-27/+29
| | | | | | | | | | | | | | | | | | | | | | 2004-11-26 JP Rosevear <jpr@novell.com> * e-gui-utils.c (e_create_image_widget): get the image directly from the icon factory * e-config.c: insert debug defines so we can turn spew on and off * e-event.c: insert debug defines so we can turn spew on and off * e-menu.c: insert debug defines so we can turn spew on and off * e-plugin.c: insert debug defines and set to off for now * e-popup.c: insert debug defines so we can turn spew on and off (e_popup_create_menu): get the image directly from the icon factory svn path=/trunk/; revision=27997
* Set the row and column spacings as tweleve while creating the table toChenthill Palanisamy2004-11-251-1/+4
| | | | | | | | | 2004-11-25 Chenthill Palanisamy <pchenthill@novell.com> * e-config.c (ec_rebuild): Set the row and column spacings as tweleve while creating the table to make it HIG compliant. svn path=/trunk/; revision=27985
* revert the last change.Not Zed2004-10-281-5/+2
| | | | | | | | 2004-10-28 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): revert the last change. svn path=/trunk/; revision=27748
* set the default row/col spacings of the table.Not Zed2004-10-281-1/+4
| | | | | | | | | 2004-10-28 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): set the default row/col spacings of the table. svn path=/trunk/; revision=27747
* check for empty trailing sections/pages after we exit the main loop.Not Zed2004-10-201-0/+20
| | | | | | | | | | | | | | | | 2004-10-20 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): check for empty trailing sections/pages after we exit the main loop. * e-plugin.c (e_plugin_get_type): make ~/.eplugins the default eplugin location, not ~/.eplug. 2004-10-18 Not Zed <NotZed@Ximian.com> * e-config.h: fix some forward decls. svn path=/trunk/; revision=27644
* convert to org.gnome hook namesJP Rosevear2004-10-201-4/+4
| | | | | | | | | 2004-10-19 JP Rosevear <jpr@novell.com> * e-config.c, e-event.c, e-menu.c, e-plugin.c, e-plugin.h, e-popup.c: convert to org.gnome hook names svn path=/trunk/; revision=27633
* (untested, it compiles!).Not Zed2004-10-121-0/+17
| | | | | | | | | 2004-10-12 Not Zed <NotZed@Ximian.com> * e-config.c (ech_check, ech_config_factory, emph_construct_menu): setup a "check" handler, page-check/validation callback. svn path=/trunk/; revision=27551
* show the toplevel notebook if we had to create one, always.Not Zed2004-10-071-0/+1
| | | | | | | | | | | | | | | | | | 2004-10-07 Not Zed <NotZed@Ximian.com> * e-config.c (ec_rebuild): show the toplevel notebook if we had to create one, always. * e-menu.c (e_menu_add_items): initialise node->menu properly. * e-plugin.c (ep_load): read/initialise a unique id for all plugins and track them in a hashtable. (ep_construct): refactor so we have more control over what happens. if the hook handling class isn't registered yet, just note it and keep going. (e_plugin_hook_new): remove this, its handled internally by above. svn path=/trunk/; revision=27490
* Merged notzed-eplugin-2-branch to head.Michael Zucci2004-09-201-0/+1415
svn path=/trunk/; revision=27300