callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a79f61ba4c36ffdb285ec1d812c83871d22e769e
evolution/shell/Makefile.am
Ettore Perazzoli 1bb3a9f0a8 New. (impl_finalize): New. (destroy): Removed. (class_init): Install 
* evolution-shell-client.c (impl_dispose): New.
(impl_finalize): New.
(destroy): Removed.
(class_init): Install dispose, finalize handlers.

* All: Use evolution_shell_client_corba_objref() or
evolution_shell_component_client_corba_objref() instead of
BONOBO_OBJREF() or bonobo_object_corba_objref() where needed.

* e-folder-type-registry.c (set_handler): Use g_object_ref() for
the handler, not bonobo_object_ref().
(folder_type_free): Likewise for unref.

* evolution-shell-component-client.c
(evolution_shell_component_client_corba_objref): New.
(impl_dispose): Moved from impl_destroy; only unref things.
(impl_finalize) New.
(class_init): Install dispose/finalize.
(evolution_shell_component_client_get_dnd_source_interface): Use
priv->corba_objref instead of bonobo_object_corba_objref() since
we are not a BonoboObject anymore.
(evolution_shell_component_client_get_dnd_destination_interface):
Likewise.
(evolution_shell_component_client_get_offline_interface): Likewise.
(evolution_shell_component_client_set_owner): Likewise.
(evolution_shell_component_client_unset_owner): Likewise.
(evolution_shell_component_client_create_view): Likewise.
(evolution_shell_component_client_handle_external_uri): Likewise.
(evolution_shell_component_client_async_create_folder): Likewise.
(evolution_shell_component_client_async_xfer_folder): Likewise.
(evolution_shell_component_client_populate_folder_context_menu): Likewise.
(evolution_shell_component_client_unpopulate_folder_context_menu): Likewise.

* e-component-registry.c (register_component): Use
evolution_shell_component_client_corba_objref().
(e_component_registry_restart_component): Likewise.
(component_free): Likewise.

* evolution-shell-component-client.c: g_object_new() instead of gtk_type_new().
* e-component-registry.c: Likewise.
* e-corba-config-page.c
* e-folder-list.c: Likewise.
* e-folder-type-registry.c: Likewise.
* e-folder.c: Likewise.
* e-gray-bar.c: Likewise.
* e-history.c: Likewise.
* e-local-folder.c: Likewise.
* e-local-folder.c: Likewise.
* e-local-storage.c: Likewise.
* e-shell-about-box.c: Likewise.
* e-shell-config-default-folders.c: Likewise.
* e-shell-folder-selection-dialog.c: Likewise.
* e-shell-folder-title-bar.c: Likewise.
* e-shell-offline-handler.c: Likewise.
* e-shell-settings-dialog.c: Likewise.
* e-shell-user-creatable-items-handler.c: Likewise.
* e-shell-view.c: Likewise.
* e-shortcuts-view-model.c: Likewise.
* e-shortcuts-view.c: Likewise.
* e-shortcuts.c: Likewise.
* e-splash.c: Likewise.
* e-storage-set-view.c: Likewise.
* e-storage-set.c: Likewise.
* e-storage.c: Likewise.
* e-task-bar.c: Likewise.
* e-task-widget.c: Likewise.
* e-uri-schema-registry.c: Likewise.
* evolution-activity-client.c: Likewise.
* evolution-folder-selector-button.c: Likewise.
* evolution-shell-client.c: Likewise.
* evolution-shell-view.c: Likewise.
* evolution-storage-listener.c: Likewise.
* evolution-storage-set-view-listener.c: Likewise.
* evolution-storage-set-view.c: Likewise.
* evolution-wizard.c: Likewise.

* GNOME_Evolution_TestComponent.server: Renamed from
GNOME_Evolution_TestComponent.oaf.

* evolution-test-component.c (spit_out_shortcuts): Use
BONOBO_EX_REPOID().
(create_new_folder_selector): Ported to use GtkDialog instead of
GnomeDialog.
(storage_cancel_discover_shared_folder_callback): Add missing
G_OBJECT() cast.
(shared_folder_discovery_timeout_callback): Likewise.
(storage_discover_shared_folder_callback): Likewise.
(timeout_callback_2): Likewise.
(timeout_callback_1): Likewise.
(shared_folder_discovery_timeout_callback): Use
g_object_get_data() instead of gtk_object_get_data().
(storage_cancel_discover_shared_folder_callback): Likewise.
(timeout_callback_2): Likewise.
(timeout_callback_2): g_timeout_add() instead of
gtk_timeout_add().
(create_view_fn): Likewise.
(timeout_callback_1): Likewise.
(timeout_callback_1): Pass NULL as the error arg to
gdk_pixbuf_new_from_file().
(register_component): Use bonobo-activation instead of OAF.

* e-shell-about-box.c (impl_destroy): Removed.
(impl_finalize): New.
(class_init): Install finalize handler, not destroy.

* e-shell-about-box.c (e_shell_about_box_construct): Removed.

svn path=/trunk/; revision=18554
2002-11-05 17:21:39 +00:00

328 lines
8.2 KiB
Makefile
Raw Blame History

SUBDIRS = glade
# FIXME importer
INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/misc \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
-I$(top_srcdir) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DPREFIX=\"$(prefix)\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-shell\" \
$(SHELL_CFLAGS)
# Shell CORBA stuff
IDLS = \
Evolution-Activity.idl \
Evolution-ConfigControl.idl \
Evolution-Offline.idl \
Evolution-Session.idl \
Evolution-Shell.idl \
Evolution-ShellComponent.idl \
Evolution-ShellComponentDnd.idl \
Evolution-ShellView.idl \
Evolution-Shortcuts.idl \
Evolution-Storage.idl \
Evolution-StorageSetView.idl \
Evolution-Wizard.idl \
Evolution-common.idl \
Evolution.idl
IDL_GENERATED = \
Evolution.h \
Evolution-common.c \
Evolution-skels.c \
Evolution-stubs.c
Evolution-impl.o: Evolution.h
$(IDL_GENERATED): $(IDLS)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/Evolution.idl
# SelectNames CORBA stuff
SELECT_NAMES_IDL = \
$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
SELECT_NAMES_IDL_GENERATED = \
Evolution-Addressbook-SelectNames.h \
Evolution-Addressbook-SelectNames-common.c \
Evolution-Addressbook-SelectNames-skels.c \
Evolution-Addressbook-SelectNames-stubs.c
$(SELECT_NAMES_IDL_GENERATED): $(SELECT_NAMES_IDL)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(SELECT_NAMES_IDL)
# IDL install
idldir = $(datadir)/idl
idl_DATA = $(IDLS)
# Shell library
lib_LTLIBRARIES = \
libeshell.la
eshellincludedir = $(includedir)/evolution/shell
eshellinclude_HEADERS = \
Evolution.h \
e-folder.h \
e-folder-list.h \
e-folder-tree.h \
e-shell-corba-icon-utils.h \
evolution-activity-client.h \
evolution-config-control.h \
evolution-folder-selector-button.h \
evolution-session.h \
evolution-shell-client.h \
evolution-shell-component-client.h \
evolution-shell-component.h \
evolution-shell-component-dnd.h \
evolution-shell-component-utils.h \
evolution-shell-view.h \
evolution-storage-listener.h \
evolution-storage-set-view-listener.h \
evolution-storage.h \
evolution-wizard.h
libeshell_la_SOURCES = \
$(IDL_GENERATED) \
e-folder.c \
e-folder-list.c \
e-folder-tree.c \
e-shell-corba-icon-utils.c \
evolution-activity-client.c \
evolution-config-control.c \
evolution-folder-selector-button.c \
evolution-session.c \
evolution-shell-client.c \
evolution-shell-component-client.c \
evolution-shell-component.c \
evolution-shell-component-dnd.c \
evolution-shell-component-utils.c \
evolution-shell-view.c \
evolution-storage-listener.c \
evolution-storage-set-view-listener.c \
evolution-storage.c \
evolution-wizard.c \
e-shell-marshal.c \
$(eshellinclude_HEADERS)
# Evolution executable
bin_PROGRAMS = evolution
evolution_SOURCES = \
$(SELECT_NAMES_IDL_GENERATED) \
e-activity-handler.c \
e-activity-handler.h \
e-component-info.c \
e-component-info.h \
e-component-registry.c \
e-component-registry.h \
e-corba-config-page.c \
e-corba-config-page.h \
e-corba-shortcuts.c \
e-corba-shortcuts.h \
e-corba-storage-registry.c \
e-corba-storage-registry.h \
e-corba-storage.c \
e-corba-storage.h \
e-folder-dnd-bridge.c \
e-folder-dnd-bridge.h \
e-folder-type-registry.c \
e-folder-type-registry.h \
e-gray-bar.c \
e-gray-bar.h \
e-history.c \
e-history.h \
e-icon-factory.c \
e-icon-factory.h \
e-local-folder.c \
e-local-folder.h \
e-local-storage.c \
e-local-storage.h \
e-setup.c \
e-setup.h \
e-shell-about-box.c \
e-shell-about-box.h \
e-shell-config.c \
e-shell-config.h \
e-shell-config-autocompletion.c \
e-shell-config-autocompletion.h \
e-shell-config-offline.c \
e-shell-config-offline.h \
e-shell-config-default-folders.c \
e-shell-config-default-folders.h \
e-shell-config-folder-settings.c \
e-shell-config-folder-settings.h \
e-shell-constants.h \
e-shell-folder-commands.c \
e-shell-folder-commands.h \
e-shell-folder-creation-dialog.c \
e-shell-folder-creation-dialog.h \
e-shell-folder-selection-dialog.c \
e-shell-folder-selection-dialog.h \
e-shell-folder-title-bar.c \
e-shell-folder-title-bar.h \
e-shell-offline-handler.c \
e-shell-offline-handler.h \
e-shell-offline-sync.c \
e-shell-offline-sync.h \
e-shell-settings-dialog.c \
e-shell-settings-dialog.h \
e-shell-shared-folder-picker-dialog.c \
e-shell-shared-folder-picker-dialog.h \
e-shell-startup-wizard.c \
e-shell-startup-wizard.h \
e-shell-user-creatable-items-handler.c \
e-shell-user-creatable-items-handler.h \
e-shell-utils.c \
e-shell-utils.h \
e-shell-view-menu.c \
e-shell-view-menu.h \
e-shell-view.c \
e-shell-view.h \
e-shell.c \
e-shell.h \
e-shortcuts-view-model.c \
e-shortcuts-view-model.h \
e-shortcuts-view.c \
e-shortcuts-view.h \
e-shortcuts.c \
e-shortcuts.h \
e-splash.c \
e-splash.h \
e-storage-set-view.c \
e-storage-set-view.h \
e-storage-set.c \
e-storage-set.h \
e-storage.c \
e-storage.h \
e-task-bar.c \
e-task-bar.h \
e-task-widget.c \
e-task-widget.h \
e-uri-schema-registry.c \
e-uri-schema-registry.h \
evolution-storage-set-view.c \
evolution-storage-set-view.h \
evolution-storage-set-view-factory.c \
evolution-storage-set-view-factory.h \
main.c
evolution_LDADD = \
libeshell.la \
$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
$(SHELL_LIBS)
# FIXME
# importer/libevolution-importer.la \
# Test component
noinst_PROGRAMS = \
evolution-test-component
evolution_test_component_SOURCES = \
evolution-test-component.c
evolution_test_component_LDADD = \
libeshell.la \
$(SHELL_LIBS)
install-test-component: evolution-test-component
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-test-component $(DESTDIR)$(bindir)/evolution-test-component
$(mkinstalldirs) $(DESTDIR)$(serverdir)
$(INSTALL_DATA) $(srcdir)/GNOME_Evolution_TestComponent.server $(DESTDIR)$(serverdir)/GNOME_Evolution_TestComponent.server
# Misc stuff
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_Evolution_Shell.server.in
server_DATA = $(server_in_files:.server.in=.server)
etspecdir = $(datadir)/evolution/etspec/
etspec_DATA = \
e-storage-set-view.etspec
@INTLTOOL_SERVER_RULE@
icons = \
check-empty.xpm \
check-filled.xpm \
check-missing.xpm
# GLib marshalling cruft
e-shell-marshal.h: e-shell-marshal.list
( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal e-shell-marshal.list --header > e-shell-marshal.tmp \
&& mv e-shell-marshal.tmp e-shell-marshal.h ) \
|| ( rm -f e-shell-marshal.tmp && exit 1 )
e-shell-marshal.c: e-shell-marshal.h
( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal e-shell-marshal.list --body > e-shell-marshal.tmp \
&& mv e-shell-marshal.tmp e-shell-marshal.c ) \
|| ( rm -f e-shell-marshal.tmp && exit 1 )
MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h
# Extra dist stuff
EXTRA_DIST = \
$(IDLS) \
$(server_in_files) \
$(server_DATA) \
$(etspec_DATA) \
$(icons) \
GNOME_Evolution_TestComponent.server \
evolution-nognome.in
# Purify support
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
all-local: evolution.pure
evolution.pure: evolution
@rm -f evolution.pure
$(PLINK) $(evolution_LDFLAGS) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS)
endif
CLEANFILES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED)
BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
if HAVE_DTAPPINTEGRATE
bin_SCRIPTS = evolution-nognome
endif
# FIXME TODO:
# e-shell-importer.c
# e-shell-importer.h
Reference in New Issue View Git Blame Copy Permalink