From 70a9fcdf9c61c09fcac72ddf99e73cb57ed99017 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 26 May 2013 15:41:29 -0400 Subject: Rename libeshell to libevolution-shell. To make Evolution's shared libraries more consistent. Also rename the documentation module to evolution-shell. --- addressbook/gui/contact-list-editor/Makefile.am | 2 +- addressbook/gui/widgets/Makefile.am | 2 +- addressbook/importers/Makefile.am | 2 +- addressbook/printing/Makefile.am | 2 +- addressbook/util/Makefile.am | 2 +- calendar/gui/Makefile.am | 2 +- calendar/importers/Makefile.am | 2 +- composer/Makefile.am | 2 +- configure.ac | 2 +- doc/reference/Makefile.am | 2 +- doc/reference/evolution-shell/Makefile.am | 43 +++ .../evolution-shell/evolution-shell-docs.sgml | 46 +++ .../evolution-shell/evolution-shell-overrides.txt | 0 .../evolution-shell/evolution-shell-sections.txt | 376 +++++++++++++++++++++ .../evolution-shell/evolution-shell.types | 19 ++ .../tmpl/e-mail-account-manager.sgml | 72 ++++ .../tmpl/e-mail-account-tree-view.sgml | 90 +++++ .../tmpl/e-mail-identity-combo-box.sgml | 56 +++ doc/reference/libeshell/Makefile.am | 43 --- doc/reference/libeshell/libeshell-docs.sgml | 43 --- doc/reference/libeshell/libeshell-overrides.txt | 0 doc/reference/libeshell/libeshell-sections.txt | 376 --------------------- doc/reference/libeshell/libeshell.types | 19 -- .../libeshell/tmpl/e-mail-account-manager.sgml | 72 ---- .../libeshell/tmpl/e-mail-account-tree-view.sgml | 90 ----- .../libeshell/tmpl/e-mail-identity-combo-box.sgml | 56 --- em-format/Makefile.am | 2 +- evolution-shell.pc.in | 2 +- mail/Makefile.am | 2 +- mail/importers/Makefile.am | 5 +- modules/addressbook/Makefile.am | 2 +- modules/backup-restore/Makefile.am | 2 +- modules/calendar/Makefile.am | 2 +- modules/composer-autosave/Makefile.am | 2 +- modules/itip-formatter/Makefile.am | 2 +- modules/itip-formatter/plugin/Makefile.am | 2 +- modules/mail/Makefile.am | 2 +- modules/mailto-handler/Makefile.am | 2 +- modules/mdn/Makefile.am | 2 +- modules/offline-alert/Makefile.am | 2 +- modules/plugin-manager/Makefile.am | 2 +- modules/prefer-plain/Makefile.am | 2 +- modules/settings/Makefile.am | 2 +- modules/spamassassin/Makefile.am | 2 +- modules/startup-wizard/Makefile.am | 2 +- modules/text-highlight/Makefile.am | 2 +- plugins/attachment-reminder/Makefile.am | 2 +- plugins/bbdb/Makefile.am | 2 +- plugins/dbx-import/Makefile.am | 2 +- plugins/external-editor/Makefile.am | 2 +- plugins/mail-notification/Makefile.am | 2 +- plugins/mail-to-task/Makefile.am | 2 +- plugins/mailing-list-actions/Makefile.am | 2 +- plugins/pst-import/Makefile.am | 2 +- plugins/publish-calendar/Makefile.am | 2 +- plugins/save-calendar/Makefile.am | 2 +- plugins/templates/Makefile.am | 2 +- shell/Makefile.am | 18 +- smime/gui/Makefile.am | 2 +- 59 files changed, 754 insertions(+), 752 deletions(-) create mode 100644 doc/reference/evolution-shell/Makefile.am create mode 100644 doc/reference/evolution-shell/evolution-shell-docs.sgml create mode 100644 doc/reference/evolution-shell/evolution-shell-overrides.txt create mode 100644 doc/reference/evolution-shell/evolution-shell-sections.txt create mode 100644 doc/reference/evolution-shell/evolution-shell.types create mode 100644 doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml create mode 100644 doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml create mode 100644 doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml delete mode 100644 doc/reference/libeshell/Makefile.am delete mode 100644 doc/reference/libeshell/libeshell-docs.sgml delete mode 100644 doc/reference/libeshell/libeshell-overrides.txt delete mode 100644 doc/reference/libeshell/libeshell-sections.txt delete mode 100644 doc/reference/libeshell/libeshell.types delete mode 100644 doc/reference/libeshell/tmpl/e-mail-account-manager.sgml delete mode 100644 doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml delete mode 100644 doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 8ccbdc69b0..6f38f09160 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -25,7 +25,7 @@ libecontactlisteditor_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 0c54ae55e0..b73bedac9c 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -73,7 +73,7 @@ libeabwidgets_la_SOURCES = \ ea-addressbook.h libeabwidgets_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index ccaa202c6e..cce02a07d1 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -22,7 +22,7 @@ libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_addressbook_importers_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index eeb80af58b..c51eb14d3b 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -45,7 +45,7 @@ contact_print_test_SOURCES = test-print.c contact_print_test_LDADD = \ libecontactprint.la \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 98e9fe1b35..f11c618da6 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -23,7 +23,7 @@ libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libeabutil_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(CAMEL_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GTKHTML_LIBS) \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 591444a1b4..6d19691d72 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -203,7 +203,7 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/e-util/libevolution-util.la \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index ae4ae68fcd..686827c7f1 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -19,7 +19,7 @@ libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/composer/Makefile.am b/composer/Makefile.am index 69d4260ae1..1e846b91ff 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -56,7 +56,7 @@ libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libcomposer_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/configure.ac b/configure.ac index 6f1bb56ae1..9dbc2cec85 100644 --- a/configure.ac +++ b/configure.ac @@ -1429,7 +1429,7 @@ data/evolution-alarm-notify.desktop.in data/icons/Makefile doc/Makefile doc/reference/Makefile -doc/reference/libeshell/Makefile +doc/reference/evolution-shell/Makefile doc/reference/evolution-util/Makefile e-util/Makefile em-format/Makefile diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 7e04e1253d..bfa5808884 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = evolution-util libeshell +SUBDIRS = evolution-util evolution-shell -include $(top_srcdir)/git.mk diff --git a/doc/reference/evolution-shell/Makefile.am b/doc/reference/evolution-shell/Makefile.am new file mode 100644 index 0000000000..5ff5a0af32 --- /dev/null +++ b/doc/reference/evolution-shell/Makefile.am @@ -0,0 +1,43 @@ +# The name of the module. +DOC_MODULE=evolution-shell + +# The top-level SGML file. +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml + +# The directory containing the source code. Relative to $(srcdir). +DOC_SOURCE_DIR=$(top_srcdir)/shell + +# Used for dependencies. The docs will be rebuilt if any of these change. +HFILE_GLOB=$(top_srcdir)/shell/*.h +CFILE_GLOB=$(top_srcdir)/shell/*.c + +# Header files to ignore when scanning. +IGNORE_HFILES= \ + evo-version.h \ + e-shell-window-private.h \ + es-event.h \ + $(NULL) + +GTKDOC_CFLAGS= \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) \ + $(NULL) + +GTKDOC_LIBS= \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/shell/libevolution-shell.la \ + $(top_builddir)/e-util/libevolution-util.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ + $(NULL) + +# This includes the standard gtk-doc make rules, copied by gtkdocize. +include $(top_srcdir)/gtk-doc.make + +#TESTS = $(GTKDOC_CHECK) + +-include $(top_srcdir)/git.mk diff --git a/doc/reference/evolution-shell/evolution-shell-docs.sgml b/doc/reference/evolution-shell/evolution-shell-docs.sgml new file mode 100644 index 0000000000..ba1305eaf5 --- /dev/null +++ b/doc/reference/evolution-shell/evolution-shell-docs.sgml @@ -0,0 +1,46 @@ + + +]> + + + Evolution Shell Reference Manual + + The latest version of this documentation can be found on-line at + http://developer.gnome.org/evolution-shell/. + + + + + The Shell + + + + + + + + + + + + + + Actions + + + + + + Object Hierarchy + + + + + Index + + + + diff --git a/doc/reference/evolution-shell/evolution-shell-overrides.txt b/doc/reference/evolution-shell/evolution-shell-overrides.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/doc/reference/evolution-shell/evolution-shell-sections.txt b/doc/reference/evolution-shell/evolution-shell-sections.txt new file mode 100644 index 0000000000..5798533fd6 --- /dev/null +++ b/doc/reference/evolution-shell/evolution-shell-sections.txt @@ -0,0 +1,376 @@ +
+e-shell +EShell +EShell +e_shell_get_default +e_shell_load_modules +e_shell_get_shell_backends +e_shell_get_canonical_name +e_shell_get_backend_by_name +e_shell_get_backend_by_scheme +e_shell_get_client_cache +e_shell_get_registry +e_shell_create_shell_window +e_shell_handle_uris +e_shell_submit_alert +e_shell_get_active_window +e_shell_get_express_mode +e_shell_get_module_directory +e_shell_get_network_available +e_shell_set_network_available +e_shell_lock_network_available +e_shell_get_online +e_shell_set_online +e_shell_get_preferences_window +e_shell_event +EShellQuitReason +e_shell_quit +e_shell_cancel_quit +e_shell_migrate_attempt + +E_SHELL +E_IS_SHELL +E_TYPE_SHELL +E_SHELL_CLASS +E_IS_SHELL_CLASS +E_SHELL_GET_CLASS +E_TYPE_SHELL_QUIT_REASON +EShellClass +e_shell_get_type +e_shell_quit_reason_get_type + +EShellPrivate +e_shell_migrate_error_quark +
+ +
+e-shell-backend +EShellBackend +EShellBackend +e_shell_backend_compare +e_shell_backend_get_config_dir +e_shell_backend_get_data_dir +e_shell_backend_get_shell +e_shell_backend_add_activity +e_shell_backend_cancel_all +e_shell_backend_is_busy +e_shell_backend_get_prefer_new_item +e_shell_backend_set_prefer_new_item +e_shell_backend_start +e_shell_backend_is_started +e_shell_backend_migrate + +E_SHELL_BACKEND +E_IS_SHELL_BACKEND +E_TYPE_SHELL_BACKEND +E_SHELL_BACKEND_CLASS +E_IS_SHELL_BACKEND_CLASS +E_SHELL_BACKEND_GET_CLASS +EShellBackendClass +e_shell_backend_get_type + +EShellBackendPrivate +
+ +
+e-shell-content +EShellContent +EShellContent +e_shell_content_new +e_shell_content_set_searchbar +e_shell_content_check_state +e_shell_content_focus_search_results +e_shell_content_get_alert_bar +e_shell_content_get_shell_view +e_shell_content_get_view_id +e_shell_content_set_view_id +e_shell_content_run_advanced_search_dialog +e_shell_content_run_edit_searches_dialog +e_shell_content_run_save_search_dialog + +E_SHELL_CONTENT +E_IS_SHELL_CONTENT +E_TYPE_SHELL_CONTENT +E_SHELL_CONTENT_CLASS +E_IS_SHELL_CONTENT_CLASS +E_SHELL_CONTENT_GET_CLASS +EShellContentClass +e_shell_content_get_type + +EShellContentPrivate +
+ +
+e-shell-searchbar +EShellSearchbar +EShellSearchbar +e_shell_searchbar_new +e_shell_searchbar_get_shell_view +e_shell_searchbar_get_filter_combo_box +e_shell_searchbar_get_search_hint +e_shell_searchbar_set_search_hint +e_shell_searchbar_get_search_option +e_shell_searchbar_set_search_option +e_shell_searchbar_get_search_text +e_shell_searchbar_set_search_text +e_shell_searchbar_get_search_box +e_shell_searchbar_get_scope_combo_box +e_shell_searchbar_get_scope_visible +e_shell_searchbar_set_scope_visible +e_shell_searchbar_set_state_dirty +e_shell_searchbar_get_state_group +e_shell_searchbar_set_state_group +e_shell_searchbar_load_state +e_shell_searchbar_save_state + +E_SHELL_SEARCHBAR +E_IS_SHELL_SEARCHBAR +E_TYPE_SHELL_SEARCHBAR +E_SHELL_SEARCHBAR_CLASS +E_IS_SHELL_SEARCHBAR_CLASS +E_SHELL_SEARCHBAR_GET_CLASS +EShellSearchbarClass +e_shell_searchbar_get_type + +EShellSearchbarPrivate +
+ +
+e-shell-sidebar +EShellSidebar +EShellSidebar +e_shell_sidebar_new +e_shell_sidebar_check_state +e_shell_sidebar_get_shell_view +e_shell_sidebar_get_icon_name +e_shell_sidebar_set_icon_name +e_shell_sidebar_get_primary_text +e_shell_sidebar_set_primary_text +e_shell_sidebar_get_secondary_text +e_shell_sidebar_set_secondary_text + +E_SHELL_SIDEBAR +E_IS_SHELL_SIDEBAR +E_TYPE_SHELL_SIDEBAR +E_SHELL_SIDEBAR_CLASS +E_IS_SHELL_SIDEBAR_CLASS +E_SHELL_SIDEBAR_GET_CLASS +EShellSidebarClass +e_shell_sidebar_get_type + +EShellSidebarPrivate +
+ +
+e-shell-switcher +EShellSwitcher +EShellSwitcher +e_shell_switcher_new +e_shell_switcher_add_action +e_shell_switcher_get_style +e_shell_switcher_set_style +e_shell_switcher_unset_style +e_shell_switcher_get_visible +e_shell_switcher_set_visible + +E_SHELL_SWITCHER +E_IS_SHELL_SWITCHER +E_TYPE_SHELL_SWITCHER +E_SHELL_SWITCHER_CLASS +E_IS_SHELL_SWITCHER_CLASS +E_SHELL_SWITCHER_GET_CLASS +EShellSwitcherClass +e_shell_switcher_get_type + +EShellSwitcherPrivate +E_SHELL_SWITCHER_DEFAULT_TOOLBAR_STYLE +
+ +
+e-shell-taskbar +EShellTaskbar +EShellTaskbar +e_shell_taskbar_new +e_shell_taskbar_get_shell_view +e_shell_taskbar_get_message +e_shell_taskbar_set_message +e_shell_taskbar_unset_message +e_shell_taskbar_get_activity_count + +E_SHELL_TASKBAR +E_IS_SHELL_TASKBAR +E_TYPE_SHELL_TASKBAR +E_SHELL_TASKBAR_CLASS +E_IS_SHELL_TASKBAR_CLASS +E_SHELL_TASKBAR_GET_CLASS +EShellTaskbarClass +e_shell_taskbar_get_type + +EShellTaskbarPrivate +
+ +
+e-shell-utils +Shell Utilities +e_shell_run_open_dialog +e_shell_run_save_dialog +e_shell_utils_import_uris +
+ +
+e-shell-view +EShellView +EShellView +EShellViewClass +e_shell_view_get_name +e_shell_view_get_action +e_shell_view_get_title +e_shell_view_set_title +e_shell_view_get_view_id +e_shell_view_set_view_id +e_shell_view_is_active +e_shell_view_get_page_num +e_shell_view_set_page_num +e_shell_view_get_searchbar +e_shell_view_get_search_name +e_shell_view_get_search_rule +e_shell_view_set_search_rule +e_shell_view_get_search_query +e_shell_view_get_size_group +e_shell_view_get_shell_backend +e_shell_view_get_shell_content +e_shell_view_get_shell_sidebar +e_shell_view_get_shell_taskbar +e_shell_view_get_shell_window +e_shell_view_get_state_key_file +e_shell_view_set_state_dirty +e_shell_view_clear_search +e_shell_view_custom_search +e_shell_view_execute_search +e_shell_view_block_execute_search +e_shell_view_unblock_execute_search +e_shell_view_is_execute_search_blocked +e_shell_view_update_actions +e_shell_view_block_update_actions +e_shell_view_unblock_update_actions +e_shell_view_show_popup_menu +e_shell_view_new_view_instance +e_shell_view_write_source +e_shell_view_remove_source +e_shell_view_remote_delete_source + +E_SHELL_VIEW +E_IS_SHELL_VIEW +E_TYPE_SHELL_VIEW +E_SHELL_VIEW_CLASS +E_IS_SHELL_VIEW_CLASS +E_SHELL_VIEW_GET_CLASS +e_shell_view_get_type + +EShellViewPrivate +
+ +
+e-shell-window +EShellWindow +EShellWindow +e_shell_window_new +e_shell_window_get_shell +e_shell_window_get_shell_view +e_shell_window_peek_shell_view +e_shell_window_get_shell_view_action +e_shell_window_get_alert_bar +e_shell_window_get_focus_tracker +e_shell_window_get_ui_manager +e_shell_window_get_action +e_shell_window_get_action_group +e_shell_window_get_managed_widget +e_shell_window_get_active_view +e_shell_window_set_active_view +e_shell_window_get_safe_mode +e_shell_window_set_safe_mode +e_shell_window_add_action_group +e_shell_window_get_sidebar_visible +e_shell_window_set_sidebar_visible +e_shell_window_get_switcher_visible +e_shell_window_set_switcher_visible +e_shell_window_get_taskbar_visible +e_shell_window_set_taskbar_visible +e_shell_window_get_toolbar_visible +e_shell_window_set_toolbar_visible +e_shell_window_get_toolbar_new_prefer_item +e_shell_window_set_toolbar_new_prefer_item +e_shell_window_register_new_item_actions +e_shell_window_register_new_source_actions +e_shell_window_get_menu_bar_box + +E_SHELL_WINDOW +E_IS_SHELL_WINDOW +E_TYPE_SHELL_WINDOW +E_SHELL_WINDOW_CLASS +E_IS_SHELL_WINDOW_CLASS +E_SHELL_WINDOW_GET_CLASS +EShellWindowClass +e_shell_window_get_type + +EShellWindowPrivate +E_SHELL_WINDOW_ACTION +E_SHELL_WINDOW_ACTION_GROUP +
+ +
+shell-actions +Shell Actions +E_SHELL_WINDOW_ACTION_ABOUT +E_SHELL_WINDOW_ACTION_CLOSE +E_SHELL_WINDOW_ACTION_CONTENTS +E_SHELL_WINDOW_ACTION_COPY_CLIPBOARD +E_SHELL_WINDOW_ACTION_CUT_CLIPBOARD +E_SHELL_WINDOW_ACTION_DELETE_SELECTION +E_SHELL_WINDOW_ACTION_GAL_CUSTOM_VIEW +E_SHELL_WINDOW_ACTION_GAL_DEFINE_VIEWS +E_SHELL_WINDOW_ACTION_GAL_SAVE_CUSTOM_VIEW +E_SHELL_WINDOW_ACTION_GROUP_NEW_WINDOW +E_SHELL_WINDOW_ACTION_IMPORT +E_SHELL_WINDOW_ACTION_NEW_WINDOW +E_SHELL_WINDOW_ACTION_PAGE_SETUP +E_SHELL_WINDOW_ACTION_PASTE_CLIPBOARD +E_SHELL_WINDOW_ACTION_PREFERENCES +E_SHELL_WINDOW_ACTION_QUICK_REFERENCE +E_SHELL_WINDOW_ACTION_QUIT +E_SHELL_WINDOW_ACTION_SEARCH_ADVANCED +E_SHELL_WINDOW_ACTION_SEARCH_CLEAR +E_SHELL_WINDOW_ACTION_SEARCH_EDIT +E_SHELL_WINDOW_ACTION_SEARCH_OPTIONS +E_SHELL_WINDOW_ACTION_SEARCH_QUICK +E_SHELL_WINDOW_ACTION_SEARCH_SAVE +E_SHELL_WINDOW_ACTION_SELECT_ALL +E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR +E_SHELL_WINDOW_ACTION_SHOW_SWITCHER +E_SHELL_WINDOW_ACTION_SHOW_TASKBAR +E_SHELL_WINDOW_ACTION_SHOW_TOOLBAR +E_SHELL_WINDOW_ACTION_SUBMIT_BUG +E_SHELL_WINDOW_ACTION_SWITCHER_INITIAL +E_SHELL_WINDOW_ACTION_SWITCHER_MENU +E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_BOTH +E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_ICONS +E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_TEXT +E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_USER +E_SHELL_WINDOW_ACTION_WORK_OFFLINE +E_SHELL_WINDOW_ACTION_WORK_ONLINE +
+ +
+action-groups +Action Groups +E_SHELL_WINDOW_ACTION_GROUP_SHELL +E_SHELL_WINDOW_ACTION_GROUP_SWITCHER +E_SHELL_WINDOW_ACTION_GROUP_NEW_ITEM +E_SHELL_WINDOW_ACTION_GROUP_NEW_SOURCE +E_SHELL_WINDOW_ACTION_GROUP_CUSTOM_RULES +E_SHELL_WINDOW_ACTION_GROUP_GAL_VIEW +E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_APPLICATION_HANDLERS +E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_PRINTING +E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_PRINT_SETUP +E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_SAVE_TO_DISK +
diff --git a/doc/reference/evolution-shell/evolution-shell.types b/doc/reference/evolution-shell/evolution-shell.types new file mode 100644 index 0000000000..2bc9a71963 --- /dev/null +++ b/doc/reference/evolution-shell/evolution-shell.types @@ -0,0 +1,19 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +e_shell_get_type +e_shell_backend_get_type +e_shell_content_get_type +e_shell_searchbar_get_type +e_shell_sidebar_get_type +e_shell_switcher_get_type +e_shell_taskbar_get_type +e_shell_view_get_type +e_shell_window_get_type diff --git a/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml b/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml new file mode 100644 index 0000000000..49fe04bdf2 --- /dev/null +++ b/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml @@ -0,0 +1,72 @@ + +e-mail-account-manager + + + + + + + + + + + + + + + + + + + + + + + + + +@parent: +@priv: + + + + + + +@registry: +@Returns: + + + + + + + +@manager: + + + + + + + +@manager: + + + + + + + +@manager: + + + + + + + +@manager: +@Returns: + + diff --git a/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml b/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml new file mode 100644 index 0000000000..eaee2f12c5 --- /dev/null +++ b/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml @@ -0,0 +1,90 @@ + +e-mail-account-tree-view + + + + + + + + + + + + + + + + + + + + + + + + + +@parent: +@priv: + + + + + + +@registry: +@Returns: + + + + + + + +@tree_view: + + + + + + + +@tree_view: + + + + + + + +@tree_view: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@source: + + diff --git a/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml b/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml new file mode 100644 index 0000000000..fec8130b21 --- /dev/null +++ b/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml @@ -0,0 +1,56 @@ + +e-mail-identity-combo-box + + + + + + + + + + + + + + + + + + + + + + + + + +@parent: +@priv: + + + + + + +@registry: +@Returns: + + + + + + + +@combo_box: + + + + + + + +@combo_box: +@Returns: + + diff --git a/doc/reference/libeshell/Makefile.am b/doc/reference/libeshell/Makefile.am deleted file mode 100644 index 90260b593c..0000000000 --- a/doc/reference/libeshell/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -# The name of the module. -DOC_MODULE=libeshell - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml - -# The directory containing the source code. Relative to $(srcdir). -DOC_SOURCE_DIR=$(top_srcdir)/shell - -# Used for dependencies. The docs will be rebuilt if any of these change. -HFILE_GLOB=$(top_srcdir)/shell/*.h -CFILE_GLOB=$(top_srcdir)/shell/*.c - -# Header files to ignore when scanning. -IGNORE_HFILES= \ - evo-version.h \ - e-shell-window-private.h \ - es-event.h \ - $(NULL) - -GTKDOC_CFLAGS= \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(NULL) - -GTKDOC_LIBS= \ - $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/e-util/libevolution-util.la \ - $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(NULL) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -#TESTS = $(GTKDOC_CHECK) - --include $(top_srcdir)/git.mk diff --git a/doc/reference/libeshell/libeshell-docs.sgml b/doc/reference/libeshell/libeshell-docs.sgml deleted file mode 100644 index 992e0b25b1..0000000000 --- a/doc/reference/libeshell/libeshell-docs.sgml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Evolution Shell Reference Manual - - The latest version of this documentation can be found on-line at - http://library.gnome.org/devel/libeshell/. - - - - - The Shell - - - - - - - - - - - - - - Actions - - - - - - Object Hierarchy - - - - - Index - - - - diff --git a/doc/reference/libeshell/libeshell-overrides.txt b/doc/reference/libeshell/libeshell-overrides.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/reference/libeshell/libeshell-sections.txt b/doc/reference/libeshell/libeshell-sections.txt deleted file mode 100644 index 5798533fd6..0000000000 --- a/doc/reference/libeshell/libeshell-sections.txt +++ /dev/null @@ -1,376 +0,0 @@ -
-e-shell -EShell -EShell -e_shell_get_default -e_shell_load_modules -e_shell_get_shell_backends -e_shell_get_canonical_name -e_shell_get_backend_by_name -e_shell_get_backend_by_scheme -e_shell_get_client_cache -e_shell_get_registry -e_shell_create_shell_window -e_shell_handle_uris -e_shell_submit_alert -e_shell_get_active_window -e_shell_get_express_mode -e_shell_get_module_directory -e_shell_get_network_available -e_shell_set_network_available -e_shell_lock_network_available -e_shell_get_online -e_shell_set_online -e_shell_get_preferences_window -e_shell_event -EShellQuitReason -e_shell_quit -e_shell_cancel_quit -e_shell_migrate_attempt - -E_SHELL -E_IS_SHELL -E_TYPE_SHELL -E_SHELL_CLASS -E_IS_SHELL_CLASS -E_SHELL_GET_CLASS -E_TYPE_SHELL_QUIT_REASON -EShellClass -e_shell_get_type -e_shell_quit_reason_get_type - -EShellPrivate -e_shell_migrate_error_quark -
- -
-e-shell-backend -EShellBackend -EShellBackend -e_shell_backend_compare -e_shell_backend_get_config_dir -e_shell_backend_get_data_dir -e_shell_backend_get_shell -e_shell_backend_add_activity -e_shell_backend_cancel_all -e_shell_backend_is_busy -e_shell_backend_get_prefer_new_item -e_shell_backend_set_prefer_new_item -e_shell_backend_start -e_shell_backend_is_started -e_shell_backend_migrate - -E_SHELL_BACKEND -E_IS_SHELL_BACKEND -E_TYPE_SHELL_BACKEND -E_SHELL_BACKEND_CLASS -E_IS_SHELL_BACKEND_CLASS -E_SHELL_BACKEND_GET_CLASS -EShellBackendClass -e_shell_backend_get_type - -EShellBackendPrivate -
- -
-e-shell-content -EShellContent -EShellContent -e_shell_content_new -e_shell_content_set_searchbar -e_shell_content_check_state -e_shell_content_focus_search_results -e_shell_content_get_alert_bar -e_shell_content_get_shell_view -e_shell_content_get_view_id -e_shell_content_set_view_id -e_shell_content_run_advanced_search_dialog -e_shell_content_run_edit_searches_dialog -e_shell_content_run_save_search_dialog - -E_SHELL_CONTENT -E_IS_SHELL_CONTENT -E_TYPE_SHELL_CONTENT -E_SHELL_CONTENT_CLASS -E_IS_SHELL_CONTENT_CLASS -E_SHELL_CONTENT_GET_CLASS -EShellContentClass -e_shell_content_get_type - -EShellContentPrivate -
- -
-e-shell-searchbar -EShellSearchbar -EShellSearchbar -e_shell_searchbar_new -e_shell_searchbar_get_shell_view -e_shell_searchbar_get_filter_combo_box -e_shell_searchbar_get_search_hint -e_shell_searchbar_set_search_hint -e_shell_searchbar_get_search_option -e_shell_searchbar_set_search_option -e_shell_searchbar_get_search_text -e_shell_searchbar_set_search_text -e_shell_searchbar_get_search_box -e_shell_searchbar_get_scope_combo_box -e_shell_searchbar_get_scope_visible -e_shell_searchbar_set_scope_visible -e_shell_searchbar_set_state_dirty -e_shell_searchbar_get_state_group -e_shell_searchbar_set_state_group -e_shell_searchbar_load_state -e_shell_searchbar_save_state - -E_SHELL_SEARCHBAR -E_IS_SHELL_SEARCHBAR -E_TYPE_SHELL_SEARCHBAR -E_SHELL_SEARCHBAR_CLASS -E_IS_SHELL_SEARCHBAR_CLASS -E_SHELL_SEARCHBAR_GET_CLASS -EShellSearchbarClass -e_shell_searchbar_get_type - -EShellSearchbarPrivate -
- -
-e-shell-sidebar -EShellSidebar -EShellSidebar -e_shell_sidebar_new -e_shell_sidebar_check_state -e_shell_sidebar_get_shell_view -e_shell_sidebar_get_icon_name -e_shell_sidebar_set_icon_name -e_shell_sidebar_get_primary_text -e_shell_sidebar_set_primary_text -e_shell_sidebar_get_secondary_text -e_shell_sidebar_set_secondary_text - -E_SHELL_SIDEBAR -E_IS_SHELL_SIDEBAR -E_TYPE_SHELL_SIDEBAR -E_SHELL_SIDEBAR_CLASS -E_IS_SHELL_SIDEBAR_CLASS -E_SHELL_SIDEBAR_GET_CLASS -EShellSidebarClass -e_shell_sidebar_get_type - -EShellSidebarPrivate -
- -
-e-shell-switcher -EShellSwitcher -EShellSwitcher -e_shell_switcher_new -e_shell_switcher_add_action -e_shell_switcher_get_style -e_shell_switcher_set_style -e_shell_switcher_unset_style -e_shell_switcher_get_visible -e_shell_switcher_set_visible - -E_SHELL_SWITCHER -E_IS_SHELL_SWITCHER -E_TYPE_SHELL_SWITCHER -E_SHELL_SWITCHER_CLASS -E_IS_SHELL_SWITCHER_CLASS -E_SHELL_SWITCHER_GET_CLASS -EShellSwitcherClass -e_shell_switcher_get_type - -EShellSwitcherPrivate -E_SHELL_SWITCHER_DEFAULT_TOOLBAR_STYLE -
- -
-e-shell-taskbar -EShellTaskbar -EShellTaskbar -e_shell_taskbar_new -e_shell_taskbar_get_shell_view -e_shell_taskbar_get_message -e_shell_taskbar_set_message -e_shell_taskbar_unset_message -e_shell_taskbar_get_activity_count - -E_SHELL_TASKBAR -E_IS_SHELL_TASKBAR -E_TYPE_SHELL_TASKBAR -E_SHELL_TASKBAR_CLASS -E_IS_SHELL_TASKBAR_CLASS -E_SHELL_TASKBAR_GET_CLASS -EShellTaskbarClass -e_shell_taskbar_get_type - -EShellTaskbarPrivate -
- -
-e-shell-utils -Shell Utilities -e_shell_run_open_dialog -e_shell_run_save_dialog -e_shell_utils_import_uris -
- -
-e-shell-view -EShellView -EShellView -EShellViewClass -e_shell_view_get_name -e_shell_view_get_action -e_shell_view_get_title -e_shell_view_set_title -e_shell_view_get_view_id -e_shell_view_set_view_id -e_shell_view_is_active -e_shell_view_get_page_num -e_shell_view_set_page_num -e_shell_view_get_searchbar -e_shell_view_get_search_name -e_shell_view_get_search_rule -e_shell_view_set_search_rule -e_shell_view_get_search_query -e_shell_view_get_size_group -e_shell_view_get_shell_backend -e_shell_view_get_shell_content -e_shell_view_get_shell_sidebar -e_shell_view_get_shell_taskbar -e_shell_view_get_shell_window -e_shell_view_get_state_key_file -e_shell_view_set_state_dirty -e_shell_view_clear_search -e_shell_view_custom_search -e_shell_view_execute_search -e_shell_view_block_execute_search -e_shell_view_unblock_execute_search -e_shell_view_is_execute_search_blocked -e_shell_view_update_actions -e_shell_view_block_update_actions -e_shell_view_unblock_update_actions -e_shell_view_show_popup_menu -e_shell_view_new_view_instance -e_shell_view_write_source -e_shell_view_remove_source -e_shell_view_remote_delete_source - -E_SHELL_VIEW -E_IS_SHELL_VIEW -E_TYPE_SHELL_VIEW -E_SHELL_VIEW_CLASS -E_IS_SHELL_VIEW_CLASS -E_SHELL_VIEW_GET_CLASS -e_shell_view_get_type - -EShellViewPrivate -
- -
-e-shell-window -EShellWindow -EShellWindow -e_shell_window_new -e_shell_window_get_shell -e_shell_window_get_shell_view -e_shell_window_peek_shell_view -e_shell_window_get_shell_view_action -e_shell_window_get_alert_bar -e_shell_window_get_focus_tracker -e_shell_window_get_ui_manager -e_shell_window_get_action -e_shell_window_get_action_group -e_shell_window_get_managed_widget -e_shell_window_get_active_view -e_shell_window_set_active_view -e_shell_window_get_safe_mode -e_shell_window_set_safe_mode -e_shell_window_add_action_group -e_shell_window_get_sidebar_visible -e_shell_window_set_sidebar_visible -e_shell_window_get_switcher_visible -e_shell_window_set_switcher_visible -e_shell_window_get_taskbar_visible -e_shell_window_set_taskbar_visible -e_shell_window_get_toolbar_visible -e_shell_window_set_toolbar_visible -e_shell_window_get_toolbar_new_prefer_item -e_shell_window_set_toolbar_new_prefer_item -e_shell_window_register_new_item_actions -e_shell_window_register_new_source_actions -e_shell_window_get_menu_bar_box - -E_SHELL_WINDOW -E_IS_SHELL_WINDOW -E_TYPE_SHELL_WINDOW -E_SHELL_WINDOW_CLASS -E_IS_SHELL_WINDOW_CLASS -E_SHELL_WINDOW_GET_CLASS -EShellWindowClass -e_shell_window_get_type - -EShellWindowPrivate -E_SHELL_WINDOW_ACTION -E_SHELL_WINDOW_ACTION_GROUP -
- -
-shell-actions -Shell Actions -E_SHELL_WINDOW_ACTION_ABOUT -E_SHELL_WINDOW_ACTION_CLOSE -E_SHELL_WINDOW_ACTION_CONTENTS -E_SHELL_WINDOW_ACTION_COPY_CLIPBOARD -E_SHELL_WINDOW_ACTION_CUT_CLIPBOARD -E_SHELL_WINDOW_ACTION_DELETE_SELECTION -E_SHELL_WINDOW_ACTION_GAL_CUSTOM_VIEW -E_SHELL_WINDOW_ACTION_GAL_DEFINE_VIEWS -E_SHELL_WINDOW_ACTION_GAL_SAVE_CUSTOM_VIEW -E_SHELL_WINDOW_ACTION_GROUP_NEW_WINDOW -E_SHELL_WINDOW_ACTION_IMPORT -E_SHELL_WINDOW_ACTION_NEW_WINDOW -E_SHELL_WINDOW_ACTION_PAGE_SETUP -E_SHELL_WINDOW_ACTION_PASTE_CLIPBOARD -E_SHELL_WINDOW_ACTION_PREFERENCES -E_SHELL_WINDOW_ACTION_QUICK_REFERENCE -E_SHELL_WINDOW_ACTION_QUIT -E_SHELL_WINDOW_ACTION_SEARCH_ADVANCED -E_SHELL_WINDOW_ACTION_SEARCH_CLEAR -E_SHELL_WINDOW_ACTION_SEARCH_EDIT -E_SHELL_WINDOW_ACTION_SEARCH_OPTIONS -E_SHELL_WINDOW_ACTION_SEARCH_QUICK -E_SHELL_WINDOW_ACTION_SEARCH_SAVE -E_SHELL_WINDOW_ACTION_SELECT_ALL -E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR -E_SHELL_WINDOW_ACTION_SHOW_SWITCHER -E_SHELL_WINDOW_ACTION_SHOW_TASKBAR -E_SHELL_WINDOW_ACTION_SHOW_TOOLBAR -E_SHELL_WINDOW_ACTION_SUBMIT_BUG -E_SHELL_WINDOW_ACTION_SWITCHER_INITIAL -E_SHELL_WINDOW_ACTION_SWITCHER_MENU -E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_BOTH -E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_ICONS -E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_TEXT -E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_USER -E_SHELL_WINDOW_ACTION_WORK_OFFLINE -E_SHELL_WINDOW_ACTION_WORK_ONLINE -
- -
-action-groups -Action Groups -E_SHELL_WINDOW_ACTION_GROUP_SHELL -E_SHELL_WINDOW_ACTION_GROUP_SWITCHER -E_SHELL_WINDOW_ACTION_GROUP_NEW_ITEM -E_SHELL_WINDOW_ACTION_GROUP_NEW_SOURCE -E_SHELL_WINDOW_ACTION_GROUP_CUSTOM_RULES -E_SHELL_WINDOW_ACTION_GROUP_GAL_VIEW -E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_APPLICATION_HANDLERS -E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_PRINTING -E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_PRINT_SETUP -E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_SAVE_TO_DISK -
diff --git a/doc/reference/libeshell/libeshell.types b/doc/reference/libeshell/libeshell.types deleted file mode 100644 index 2bc9a71963..0000000000 --- a/doc/reference/libeshell/libeshell.types +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -e_shell_get_type -e_shell_backend_get_type -e_shell_content_get_type -e_shell_searchbar_get_type -e_shell_sidebar_get_type -e_shell_switcher_get_type -e_shell_taskbar_get_type -e_shell_view_get_type -e_shell_window_get_type diff --git a/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml b/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml deleted file mode 100644 index 49fe04bdf2..0000000000 --- a/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml +++ /dev/null @@ -1,72 +0,0 @@ - -e-mail-account-manager - - - - - - - - - - - - - - - - - - - - - - - - - -@parent: -@priv: - - - - - - -@registry: -@Returns: - - - - - - - -@manager: - - - - - - - -@manager: - - - - - - - -@manager: - - - - - - - -@manager: -@Returns: - - diff --git a/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml b/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml deleted file mode 100644 index eaee2f12c5..0000000000 --- a/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml +++ /dev/null @@ -1,90 +0,0 @@ - -e-mail-account-tree-view - - - - - - - - - - - - - - - - - - - - - - - - - -@parent: -@priv: - - - - - - -@registry: -@Returns: - - - - - - - -@tree_view: - - - - - - - -@tree_view: - - - - - - - -@tree_view: - - - - - - - -@tree_view: -@Returns: - - - - - - - -@tree_view: -@Returns: - - - - - - - -@tree_view: -@source: - - diff --git a/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml b/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml deleted file mode 100644 index fec8130b21..0000000000 --- a/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml +++ /dev/null @@ -1,56 +0,0 @@ - -e-mail-identity-combo-box - - - - - - - - - - - - - - - - - - - - - - - - - -@parent: -@priv: - - - - - - -@registry: -@Returns: - - - - - - - -@combo_box: - - - - - - - -@combo_box: -@Returns: - - diff --git a/em-format/Makefile.am b/em-format/Makefile.am index 36a747d62b..45e96fd0f4 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -110,7 +110,7 @@ endif libemformat_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in index b987baf75d..8cc57e91fe 100644 --- a/evolution-shell.pc.in +++ b/evolution-shell.pc.in @@ -19,5 +19,5 @@ Description: libraries needed for Evolution shell components Version: @VERSION@ Requires: gtk+-3.0 libebackend-1.2 webkitgtk-3.0 libgtkhtml-4.0 gtkhtml-editor-4.0 Requires.private: gnome-desktop-3.0 -Libs: -L${privlibdir} -leshell -levolution-util -Wl,-R${privlibdir} +Libs: -L${privlibdir} -levolution-shell -levolution-util -Wl,-R${privlibdir} Cflags: -I${privincludedir} diff --git a/mail/Makefile.am b/mail/Makefile.am index 77ab040d3f..19e7932b8e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -192,7 +192,7 @@ endif libevolution_mail_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 69a42779ca..540a7f889d 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -22,10 +22,9 @@ libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_mail_importers_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/shell/libevolution-shell.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 1438b50ac2..179fb78928 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -54,7 +54,7 @@ module_addressbook_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ $(top_builddir)/addressbook/util/libeabutil.la \ diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am index 4ddfff3890..12f331b3ce 100644 --- a/modules/backup-restore/Makefile.am +++ b/modules/backup-restore/Makefile.am @@ -27,7 +27,7 @@ module_backup_restore_la_SOURCES = \ module_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index ad38b1211f..8422fb1e7f 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -67,7 +67,7 @@ module_calendar_la_SOURCES = \ e-task-shell-view-private.h module_calendar_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 08b263a9a3..08f3c480e7 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -16,7 +16,7 @@ module_composer_autosave_la_SOURCES = \ e-composer-registry.c module_composer_autosave_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am index 0b4d7e9144..7078fc352e 100644 --- a/modules/itip-formatter/Makefile.am +++ b/modules/itip-formatter/Makefile.am @@ -32,7 +32,7 @@ module_itip_formatter_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am index 648d3f3be2..f6840f1fc0 100644 --- a/modules/itip-formatter/plugin/Makefile.am +++ b/modules/itip-formatter/plugin/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 14bbf9b219..232e0de6ee 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -44,7 +44,7 @@ module_mail_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/mail/importers/libevolution-mail-importers.la \ diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index 92ccb91849..be4289402a 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -13,7 +13,7 @@ module_mailto_handler_la_SOURCES = \ module_mailto_handler_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am index 51fc488b05..4934992f8c 100644 --- a/modules/mdn/Makefile.am +++ b/modules/mdn/Makefile.am @@ -15,7 +15,7 @@ module_mdn_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index 5c7b42e00b..cc8c1e7b84 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -13,7 +13,7 @@ module_offline_alert_la_SOURCES = \ module_offline_alert_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 121480b5ca..3a594bbff8 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -13,7 +13,7 @@ module_plugin_manager_la_SOURCES = \ module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am index 2b241e4ebd..ebfa509b77 100644 --- a/modules/prefer-plain/Makefile.am +++ b/modules/prefer-plain/Makefile.am @@ -22,7 +22,7 @@ module_prefer_plain_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am index 523c4c38d9..9d0b214c59 100644 --- a/modules/settings/Makefile.am +++ b/modules/settings/Makefile.am @@ -50,7 +50,7 @@ module_settings_la_SOURCES = \ module_settings_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index 5dd66d8138..5cd36bb39f 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -14,7 +14,7 @@ module_spamassassin_la_SOURCES = \ module_spamassassin_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 728ab863f0..7700fb8380 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -23,7 +23,7 @@ module_startup_wizard_la_SOURCES = \ module_startup_wizard_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am index 44d32244f1..f5b33d64c5 100644 --- a/modules/text-highlight/Makefile.am +++ b/modules/text-highlight/Makefile.am @@ -24,7 +24,7 @@ module_text_highlight_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 1b66828aab..36f15a011d 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -24,7 +24,7 @@ liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/e-util/libevolution-util.la \ diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 38cfe0a752..958c6436e9 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index e44d2162f2..3f0d5cf648 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_dbx_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 5fe2b09966..dab9c0412c 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -38,7 +38,7 @@ liborg_gnome_external_editor_la_LDFLAGS = \ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index fbb2cd0873..2b5fef0123 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -27,7 +27,7 @@ liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINE liborg_gnome_mail_notification_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 3ef65c6762..ddd23400e3 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -17,7 +17,7 @@ liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index ba32b5aa85..4914ed7a05 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -19,7 +19,7 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index b8a5770a3a..675968e8df 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_pst_import_la_SOURCES = pst-importer.c liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_pst_import_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 22d760bcfb..cb7540b2f2 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -34,7 +34,7 @@ liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED liborg_gnome_publish_calendar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 3aee9fc403..3bb958ad27 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -21,7 +21,7 @@ liborg_gnome_save_calendar_la_SOURCES = \ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_save_calendar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 5e6c5ad756..6848aa887b 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -20,7 +20,7 @@ liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/shell/Makefile.am b/shell/Makefile.am index f24e88fd8b..a39558b153 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -2,9 +2,9 @@ bin_PROGRAMS = evolution # Shell library -privsolib_LTLIBRARIES = libeshell.la +privsolib_LTLIBRARIES = libevolution-shell.la -eshellincludedir = $(privincludedir)/shell +evolution_shell_includedir = $(privincludedir)/shell ENUM_TYPES = e-shell.h @@ -21,7 +21,7 @@ e-shell-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES) ENUM_GENERATED = e-shell-enumtypes.h e-shell-enumtypes.c -eshellinclude_HEADERS = \ +evolution_shell_include_HEADERS = \ e-shell.h \ e-shell-backend.h \ e-shell-common.h \ @@ -37,7 +37,7 @@ eshellinclude_HEADERS = \ e-shell-window-actions.h \ es-event.h -libeshell_la_CPPFLAGS = \ +libevolution_shell_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(NM_CPPFLAGS) \ -I$(top_srcdir) \ @@ -64,8 +64,8 @@ libeshell_la_CPPFLAGS = \ $(GTKHTML_CFLAGS) \ $(CLUTTER_GTK_CFLAGS) -libeshell_la_SOURCES = \ - $(eshellinclude_HEADERS) \ +libevolution_shell_la_SOURCES = \ + $(evolution_shell_include_HEADERS) \ e-shell.c \ e-shell-backend.c \ e-shell-content.c \ @@ -85,9 +85,9 @@ libeshell_la_SOURCES = \ evo-version.h \ es-event.c -libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) +libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) -libeshell_la_LIBADD = \ +libevolution_shell_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ @@ -130,7 +130,7 @@ evolution_SOURCES = \ e-migrate-base-dirs.c evolution_LDADD = \ - libeshell.la \ + libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 5d35218038..09c9fa8924 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -37,7 +37,7 @@ libevolution_smime_la_SOURCES = \ libevolution_smime_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/smime/lib/libessmime.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ -- cgit v1.2.3