Commit 1d6a8600 authored by Maciej Stachowiak's avatar Maciej Stachowiak

Made the file manager component statically linked in again. Removed.

	* src/Makefile.am, src/nautilus.goad, src/ntl-app.c,
	src/file-manager/Makefile.am: Made the file manager component
	statically linked in again.
	* src/file-manager/ntl-file-manager.goad: Removed.
parent 6f9294ee
2000-01-27 Maciej Stachowiak <mjs@eazel.com>
* src/Makefile.am, src/nautilus.goad, src/ntl-app.c,
src/file-manager/Makefile.am: Made the file manager component
statically linked in again.
* src/file-manager/ntl-file-manager.goad: Removed.
2000-01-27 Elliot Lee <sopwith@redhat.com>
* configure.in: Add components/help/converters/* makefiles.
......
......@@ -10,7 +10,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
-DVERSION="\"$(VERSION)\"" \
$(WERROR)
LDADD= ../libnautilus/libnautilus.la \
LDADD= file-manager/libntl-file-manager.la \
../libnautilus/libnautilus.la \
$(BONOBO_LIBS) \
$(GNORBA_LIBS) \
$(GNOMEUI_LIBS) \
......@@ -63,3 +64,9 @@ nautilus_SOURCES= \
ntl-window-state.h
TESTS=check-nautilus
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
nautilus.goad
EXTRA_DIST = nautilus.goad
# FIXME should be a shared library component or compiled in.
bin_PROGRAMS = ntl-file-manager
noinst_LTLIBRARIES=libntl-file-manager.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
$(GNOMEUI_CFLAGS) -DVERSION="\"$(VERSION)\"" \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(WERROR)
LDADD= ../../libnautilus/libnautilus.la \
$(BONOBO_LIBS) \
$(GNORBA_LIBS) \
$(GNOMEUI_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS)
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
ntl-file-manager.goad
dfos_corba_srcs= \
GNOME_Desktop_FileOperationService.h \
GNOME_Desktop_FileOperationService-stubs.c \
GNOME_Desktop_FileOperationService-skels.c \
GNOME_Desktop_FileOperationService-common.c
ntl_file_manager_SOURCES= \
libntl_file_manager_la_SOURCES= \
$(dfos_corba_srcs) \
dfos-corba.c \
dfos-corba.h \
......@@ -47,8 +33,8 @@ ntl_file_manager_SOURCES= \
fm-icon-cache.c \
fm-icon-cache.h \
fm-icons-controller.c \
fm-icons-controller.h \
fm-main.c
fm-icons-controller.h
# noinst_PROGRAMS=gnome-desktop
......@@ -87,5 +73,3 @@ dfos_corba_stamp: $(top_srcdir)/idl/GNOME_Desktop_FileOperationService.idl
BUILT_SOURCES=$(dfos_corba_srcs)
CLEAN_FILES=$(dfos_corba_srcs) dfos_corba_stamp
EXTRA_DIST = ntl-file-manager.goad
#ifndef FM_PUBLIC_API_H
#define FM_PUBLIC_API_H 1
#include "fm-directory-view.h"
GtkType fm_directory_view_icons_get_type(void);
GtkType fm_directory_view_list_get_type(void);
#endif
......@@ -25,9 +25,39 @@
*/
#include "nautilus.h"
#include <libnautilus/libnautilus.h>
#include <file-manager/fm-public-api.h>
static int window_count = 0;
static BonoboObject *
nautilus_make_object(BonoboGenericFactory *gfact, const char *goad_id, gpointer closure)
{
FMDirectoryView *dir_view;
NautilusContentViewFrame *view_frame;
g_return_val_if_fail (strcmp (goad_id, "ntl_file_manager_icon_view") == 0 ||
strcmp (goad_id, "ntl_file_manager_list_view") == 0, NULL);
if (strcmp (goad_id, "ntl_file_manager_icon_view") == 0)
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_directory_view_icons_get_type (), NULL));
else
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_directory_view_list_get_type (), NULL));
g_return_val_if_fail(dir_view, NULL);
view_frame = fm_directory_view_get_view_frame (dir_view);
if (BONOBO_IS_OBJECT (view_frame))
return BONOBO_OBJECT (view_frame);
gtk_widget_show (GTK_WIDGET (view_frame));
return nautilus_view_frame_get_bonobo_object (NAUTILUS_VIEW_FRAME (view_frame));
}
/**
* nautilus_app_exiting:
*
......@@ -50,6 +80,9 @@ nautilus_app_init(const char *initial_url)
nautilus_navinfo_init();
nautilus_prefs_load();
/* Create our CORBA objects */
bonobo_generic_factory_new_multi("ntl_file_manager_factory", nautilus_make_object, NULL);
/* Set default configuration */
mainwin = nautilus_app_create_window();
bonobo_activate();
......
......@@ -2,7 +2,7 @@
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=File manager component's factory
location_info=ntl-file-manager
location_info=nautilus
[ntl_file_manager_icon_view]
type=factory
......
......@@ -25,9 +25,39 @@
*/
#include "nautilus.h"
#include <libnautilus/libnautilus.h>
#include <file-manager/fm-public-api.h>
static int window_count = 0;
static BonoboObject *
nautilus_make_object(BonoboGenericFactory *gfact, const char *goad_id, gpointer closure)
{
FMDirectoryView *dir_view;
NautilusContentViewFrame *view_frame;
g_return_val_if_fail (strcmp (goad_id, "ntl_file_manager_icon_view") == 0 ||
strcmp (goad_id, "ntl_file_manager_list_view") == 0, NULL);
if (strcmp (goad_id, "ntl_file_manager_icon_view") == 0)
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_directory_view_icons_get_type (), NULL));
else
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_directory_view_list_get_type (), NULL));
g_return_val_if_fail(dir_view, NULL);
view_frame = fm_directory_view_get_view_frame (dir_view);
if (BONOBO_IS_OBJECT (view_frame))
return BONOBO_OBJECT (view_frame);
gtk_widget_show (GTK_WIDGET (view_frame));
return nautilus_view_frame_get_bonobo_object (NAUTILUS_VIEW_FRAME (view_frame));
}
/**
* nautilus_app_exiting:
*
......@@ -50,6 +80,9 @@ nautilus_app_init(const char *initial_url)
nautilus_navinfo_init();
nautilus_prefs_load();
/* Create our CORBA objects */
bonobo_generic_factory_new_multi("ntl_file_manager_factory", nautilus_make_object, NULL);
/* Set default configuration */
mainwin = nautilus_app_create_window();
bonobo_activate();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment