Commit a15fd9f8 authored by Maciej Stachowiak's avatar Maciej Stachowiak

components/history/ntl-history-view.c ->

	* Renamed files as follows, as per RENAMING:
	components/history/ntl-history-view.c -> components/history/nautilus-history-view.c
	components/history/ntl-history-view.oafinfo -> components/history/nautilus-history-view.oafinfo
	components/notes/ntl-notes.c -> components/notes/nautilus-notes.c
	components/notes/ntl-notes.oafinfo -> components/notes/nautilus-notes.oafinfo
	libnautilus-extensions/gtkscrollframe.c -> libnautilus-extensions/nautilus-scroll-frame.c
	libnautilus-extensions/gtkscrollframe.h -> libnautilus-extensions/nautilus-scroll-frame.h
	libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c
	libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h
	src/nautilus-index-tabs.c -> src/nautilus-sidebar-tabs.c
	src/nautilus-index-tabs.h -> src/nautilus-sidebar-tabs.h
	src/nautilus-index-title.c -> src/nautilus-sidebar-title.c
	src/nautilus-index-title.h -> src/nautilus-sidebar-title.h
	src/nautilus-zoomable-frame-svr.c -> src/nautilus-zoomable-frame-corba.c
	src/ntl-app.c -> src/nautilus-application.c
	src/ntl-app.h -> src/nautilus-application.h
	src/ntl-index-panel.c -> src/nautilus-sidebar.c
	src/ntl-index-panel.h -> src/nautilus-sidebar.h
	src/ntl-main.c -> src/nautilus-main.c
	src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c
	src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h
	src/ntl-uri-map.c -> src/nautilus-applicable-views.c
	src/ntl-uri-map.h -> src/nautilus-applicable-views.h
	src/ntl-view-bonobo-control.c -> src/nautilus-view-frame-bonobo-control.c
	src/ntl-view-bonobo-subdoc.c -> src/nautilus-view-frame-bonobo-embeddable.c
	src/ntl-view-frame-svr.c -> src/nautilus-view-frame-corba.c
	src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c
	src/ntl-view-private.h -> src/nautilus-view-frame-private.h
	src/ntl-view.c -> src/nautilus-view-frame.c
	src/ntl-view.h -> src/nautilus-view-frame.h
	src/ntl-window-msgs.c -> src/nautilus-window-manage-views.c
	src/ntl-window-msgs.h -> src/nautilus-window-manage-views.h
	src/ntl-window-private.h -> src/nautilus-window-private.h
	src/ntl-window-state.c -> src/nautilus-window-state.c
	src/ntl-window-state.h -> src/nautilus-window-state.h
	src/ntl-window.c -> src/nautilus-window.c
	src/ntl-window.h -> src/nautilus-window.h

	* components/history/Makefile.am, components/notes/Makefile.am,
	libnautilus-extensions/Makefile.am, libnautilus/Makefile.am,
	po/POTFILES.in, src/Makefile.am,
	components/hardware/nautilus-hardware-view.h,
	components/loser/content/nautilus-content-loser.h,
	components/loser/sidebar/nautilus-sidebar-loser.h,
	components/mozilla/nautilus-mozilla-content-view.h,
	components/music/nautilus-music-view.h,
	components/rpmview/nautilus-rpm-view.h,
	components/sample/nautilus-sample-content-view.h,
	components/services/startup/nautilus-view/nautilus-service-startup-view.h,
	libnautilus/libnautilus.h, src/nautilus-desktop-window.h,
	src/nautilus-window-menus.c, src/nautilus-window-toolbars.c,
	src/file-manager/fm-directory-view.h : Updated for renamings.

	* RENAMING: removed old renamings
parent 97fabc0a
2000-05-27 Maciej Stachowiak <set EMAIL_ADDRESS environment variable>
* Renamed files as follows, as per RENAMING:
components/history/ntl-history-view.c -> components/history/nautilus-history-view.c
components/history/ntl-history-view.oafinfo -> components/history/nautilus-history-view.oafinfo
components/notes/ntl-notes.c -> components/notes/nautilus-notes.c
components/notes/ntl-notes.oafinfo -> components/notes/nautilus-notes.oafinfo
libnautilus-extensions/gtkscrollframe.c -> libnautilus-extensions/nautilus-scroll-frame.c
libnautilus-extensions/gtkscrollframe.h -> libnautilus-extensions/nautilus-scroll-frame.h
libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c
libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h
src/nautilus-index-tabs.c -> src/nautilus-sidebar-tabs.c
src/nautilus-index-tabs.h -> src/nautilus-sidebar-tabs.h
src/nautilus-index-title.c -> src/nautilus-sidebar-title.c
src/nautilus-index-title.h -> src/nautilus-sidebar-title.h
src/nautilus-zoomable-frame-svr.c -> src/nautilus-zoomable-frame-corba.c
src/ntl-app.c -> src/nautilus-application.c
src/ntl-app.h -> src/nautilus-application.h
src/ntl-index-panel.c -> src/nautilus-sidebar.c
src/ntl-index-panel.h -> src/nautilus-sidebar.h
src/ntl-main.c -> src/nautilus-main.c
src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c
src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h
src/ntl-uri-map.c -> src/nautilus-applicable-views.c
src/ntl-uri-map.h -> src/nautilus-applicable-views.h
src/ntl-view-bonobo-control.c -> src/nautilus-view-frame-bonobo-control.c
src/ntl-view-bonobo-subdoc.c -> src/nautilus-view-frame-bonobo-embeddable.c
src/ntl-view-frame-svr.c -> src/nautilus-view-frame-corba.c
src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c
src/ntl-view-private.h -> src/nautilus-view-frame-private.h
src/ntl-view.c -> src/nautilus-view-frame.c
src/ntl-view.h -> src/nautilus-view-frame.h
src/ntl-window-msgs.c -> src/nautilus-window-manage-views.c
src/ntl-window-msgs.h -> src/nautilus-window-manage-views.h
src/ntl-window-private.h -> src/nautilus-window-private.h
src/ntl-window-state.c -> src/nautilus-window-state.c
src/ntl-window-state.h -> src/nautilus-window-state.h
src/ntl-window.c -> src/nautilus-window.c
src/ntl-window.h -> src/nautilus-window.h
* components/history/Makefile.am, components/notes/Makefile.am,
libnautilus-extensions/Makefile.am, libnautilus/Makefile.am,
po/POTFILES.in, src/Makefile.am,
components/hardware/nautilus-hardware-view.h,
components/loser/content/nautilus-content-loser.h,
components/loser/sidebar/nautilus-sidebar-loser.h,
components/mozilla/nautilus-mozilla-content-view.h,
components/music/nautilus-music-view.h,
components/rpmview/nautilus-rpm-view.h,
components/sample/nautilus-sample-content-view.h,
components/services/startup/nautilus-view/nautilus-service-startup-view.h,
libnautilus/libnautilus.h, src/nautilus-desktop-window.h,
src/nautilus-window-menus.c, src/nautilus-window-toolbars.c,
src/file-manager/fm-directory-view.h : Updated for renamings.
* RENAMING: removed old renamings
2000-05-26 Eskil Heyn Olsen <eskil@eazel.com>
* nautilus-installer/Makefile:
......
......@@ -5,43 +5,9 @@ some functions and files too.
----------
file names
----------
components/history/ntl-history-view.c -> components/history/nautilus-history-view.c
components/notes/ntl-notes.c -> components/notes/nautilus-notes.c
libnautilus-extensions/gtkscrollframe.c -> libnautilus-extensions/nautilus-scroll-frame.c
libnautilus-extensions/gtkscrollframe.h -> libnautilus-extensions/nautilus-scroll-frame.h
libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c
libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h
src/nautilus-index-tabs.c -> src/nautilus-sidebar-tabs.c
src/nautilus-index-tabs.h -> src/nautilus-sidebar-tabs.h
src/nautilus-index-title.c -> src/nautilus-sidebar-title.c
src/nautilus-index-title.h -> src/nautilus-sidebar-title.h
src/nautilus-zoomable-frame-svr.c -> src/nautilus-zoomable-frame-corba.c
src/ntl-app.c -> src/nautilus-application.c
src/ntl-app.h -> src/nautilus-application.h
src/ntl-index-panel.c -> src/nautilus-sidebar.c
src/ntl-index-panel.h -> src/nautilus-sidebar.h
src/ntl-main.c -> src/nautilus-main.c
src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c
src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h
src/ntl-uri-map.c -> src/nautilus-applicable-views.c
src/ntl-uri-map.h -> src/nautilus-applicable-views.h
src/ntl-view-bonobo-control.c -> src/nautilus-view-frame-bonobo-control.c
src/ntl-view-bonobo-subdoc.c -> src/nautilus-view-frame-bonobo-embeddable.c
src/ntl-view-frame-svr.c -> src/nautilus-view-frame-corba.c
src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c
src/ntl-view-private.h -> src/nautilus-view-frame-private.h
src/ntl-view.c -> src/nautilus-view-frame.c
src/ntl-view.h -> src/nautilus-view-frame.h
src/ntl-window-msgs.c -> src/nautilus-window-manage-views.c
src/ntl-window-msgs.h -> src/nautilus-window-manage-views.h
src/ntl-window-private.h -> src/nautilus-window-private.h
src/ntl-window-state.c -> src/nautilus-window-state.c
src/ntl-window-state.h -> src/nautilus-window-state.h
src/ntl-window.c -> src/nautilus-window.c
src/ntl-window.h -> src/nautilus-window.h
components/html/ntl-web-browser.c -> ?
components/websearch/ntl-web-search.c -> ?
components/websearch/ntl-web-search.c -> nautilus-web-search.c
----------------------------
classes and other data types
......@@ -58,5 +24,6 @@ NautilusApp -> NautilusApplication
--------------
function names
--------------
nautilus_index_panel_add_meta_view -> nautilus_sidebar_add_panel
nautilus_index_panel_remove_meta_view -> nautilus_sidebar_remove_panel
......@@ -25,7 +25,7 @@
#ifndef NAUTILUS_HARDWARE_VIEW_H
#define NAUTILUS_HARDWARE_VIEW_H
#include <libnautilus/nautilus-view-frame.h>
#include <libnautilus/nautilus-view.h>
#include <gtk/gtkeventbox.h>
......
bin_PROGRAMS=ntl-history-view
bin_PROGRAMS=nautilus-history-view
INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(GCONF_CFLAGS) $(BONOBO_CFLAGS) $(WERROR)
......@@ -11,8 +11,8 @@ LDADD=\
$(GCONF_LIBS) \
$(GNOMEUI_LIBS)
ntl_history_view_SOURCES=ntl-history-view.c
nautilus_history_view_SOURCES=nautilus-history-view.c
oafdir=$(datadir)/oaf
oaf_DATA=ntl-history-view.oafinfo
oaf_DATA=nautilus-history-view.oafinfo
EXTRA_DIST=$(oaf_DATA)
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
......
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
......
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
......
......@@ -216,7 +216,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
GtkCList *clist;
HistoryView *hview;
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"), NULL);
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"), NULL);
hview = g_new0(HistoryView, 1);
......@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
BonoboGenericFactory *factory;
CORBA_ORB orb;
gnome_init_with_popt_table("ntl-history-view", VERSION,
gnome_init_with_popt_table("nautilus-history-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
......@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi("OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e", make_obj, NULL);
factory = bonobo_generic_factory_new_multi("OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e", make_obj, NULL);
do {
bonobo_main();
......
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
......
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* Nautilus
*
* Copyright (C) 1999, 2000 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
#include <config.h>
#include <gnome.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <nautilus-widgets/nautilus-preferences.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <liboaf/liboaf.h>
typedef struct {
NautilusView *view;
GtkCList *clist;
gint notify_count;
BonoboUIHandler *uih;
} HistoryView;
#define HISTORY_VIEW_COLUMN_ICON 0
#define HISTORY_VIEW_COLUMN_NAME 1
#define HISTORY_VIEW_COLUMN_COUNT 2
static const NautilusBookmark *
get_bookmark_from_row (GtkCList *clist, int row)
{
g_assert (NAUTILUS_IS_BOOKMARK (gtk_clist_get_row_data (clist, row)));
return NAUTILUS_BOOKMARK (gtk_clist_get_row_data (clist, row));
}
static const char *
get_uri_from_row (GtkCList *clist, int row)
{
return nautilus_bookmark_get_uri (get_bookmark_from_row (clist, row));
}
static void
install_icon (GtkCList *clist, gint row)
{
GdkPixmap *pixmap;
GdkBitmap *bitmap;
const NautilusBookmark *bookmark;
bookmark = get_bookmark_from_row (clist, row);
if (!nautilus_bookmark_get_pixmap_and_mask (bookmark,
NAUTILUS_ICON_SIZE_SMALLER,
&pixmap,
&bitmap))
{
return;
}
gtk_clist_set_pixmap (clist,
row,
HISTORY_VIEW_COLUMN_ICON,
pixmap,
bitmap);
}
static void
history_view_update_icons (GtkCList *clist)
{
int row;
for (row = 0; row < clist->rows; ++row)
{
install_icon (clist, row);
}
}
static void
hyperbola_navigation_history_notify_location_change (NautilusView *view,
Nautilus_NavigationInfo *loci,
HistoryView *hview)
{
char *cols[HISTORY_VIEW_COLUMN_COUNT];
int new_rownum;
GtkCList *clist;
NautilusBookmark *bookmark;
int i;
GnomeVFSURI *vfs_uri;
char *short_name;
hview->notify_count++;
clist = hview->clist;
gtk_clist_freeze(clist);
/* FIXME bugzilla.eazel.com 206:
* Get the bookmark info from the Nautilus window instead of
* keeping a parallel mechanism here. That will get us the right
* short name for different locations.
*/
vfs_uri = gnome_vfs_uri_new (loci->requested_uri);
if (vfs_uri == NULL) {
short_name = g_strdup (loci->requested_uri);
} else {
short_name = gnome_vfs_uri_extract_short_name (vfs_uri);
gnome_vfs_uri_unref (vfs_uri);
}
bookmark = nautilus_bookmark_new (loci->requested_uri, short_name);
g_free (short_name);
/* If a bookmark for this location was already in list, remove it
* (no duplicates in list, new one goes at top)
*/
for (i = 0; i < clist->rows; ++i)
{
if (nautilus_bookmark_compare_with (get_bookmark_from_row (clist, i),
bookmark)
== 0)
{
gtk_clist_remove (clist, i);
/* Since we check with each insertion, no need to check further */
break;
}
}
cols[HISTORY_VIEW_COLUMN_ICON] = NULL;
/* Ugh. Gotta cast away the const */
cols[HISTORY_VIEW_COLUMN_NAME] = (char *)nautilus_bookmark_get_name (bookmark);
new_rownum = gtk_clist_prepend(clist, cols);
gtk_clist_set_row_data_full (clist,
new_rownum,
bookmark,
(GtkDestroyNotify)gtk_object_unref);
install_icon (clist, new_rownum);
gtk_clist_columns_autosize(clist);
if(gtk_clist_row_is_visible(clist, new_rownum) != GTK_VISIBILITY_FULL)
gtk_clist_moveto(clist, new_rownum, -1, 0.5, 0.0);
gtk_clist_select_row(clist, new_rownum, 0);
gtk_clist_thaw(clist);
hview->notify_count--;
}
static void
hyperbola_navigation_history_select_row(GtkCList *clist, gint row, gint column, GdkEvent *event,
HistoryView *hview)
{
Nautilus_NavigationRequestInfo reqi;
if(hview->notify_count > 0)
return;
/* First row is always current location, by definition, so don't activate */
if (row == 0)
return;
/* FIXME bugzilla.eazel.com 702: There are bugs here if you drag up & down */
gtk_clist_freeze(clist);
if(gtk_clist_row_is_visible(clist, row) != GTK_VISIBILITY_FULL)
gtk_clist_moveto(clist, row, -1, 0.5, 0.0);
/* FIXME bugzilla.eazel.com 706:
* gotta cast away const because requested_uri isn't defined correctly */
reqi.requested_uri = (char *)get_uri_from_row (clist, row);
reqi.new_window_requested = FALSE;
nautilus_view_request_location_change(hview->view, &reqi);
gtk_clist_thaw(clist);
}
static int object_count = 0;
static void
do_destroy(GtkObject *obj, HistoryView *hview)
{
object_count--;
if(object_count <= 0)
gtk_main_quit();
}
static BonoboObject *
make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
{
GtkWidget *wtmp;
GtkCList *clist;
HistoryView *hview;
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"), NULL);
hview = g_new0(HistoryView, 1);
/* create interface */
clist = GTK_CLIST (gtk_clist_new (HISTORY_VIEW_COLUMN_COUNT));
gtk_clist_column_titles_hide (clist);
gtk_clist_set_row_height (clist, NAUTILUS_ICON_SIZE_SMALLER);
gtk_clist_set_selection_mode(clist, GTK_SELECTION_BROWSE);
gtk_clist_columns_autosize(clist);
wtmp = gtk_scrolled_window_new(gtk_clist_get_hadjustment(clist),
gtk_clist_get_vadjustment(clist));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(wtmp), GTK_WIDGET (clist));
gtk_widget_show_all(wtmp);
/* create object */
hview->view = nautilus_view_new (wtmp);
gtk_signal_connect (GTK_OBJECT (hview->view), "destroy", do_destroy, hview);
object_count++;
hview->clist = (GtkCList *)clist;
/* handle events */
gtk_signal_connect(GTK_OBJECT(hview->view), "notify_location_change", hyperbola_navigation_history_notify_location_change, hview);
gtk_signal_connect(GTK_OBJECT(clist), "select_row", hyperbola_navigation_history_select_row, hview);
gtk_signal_connect_object_while_alive (nautilus_icon_factory_get (),
"icons_changed",
history_view_update_icons,
GTK_OBJECT (hview->clist));
return BONOBO_OBJECT (hview->view);
}
int main(int argc, char *argv[])
{
gboolean preferences_succeeded;
BonoboGenericFactory *factory;
CORBA_ORB orb;
gnome_init_with_popt_table("ntl-history-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
/* FIXME bugzilla.eazel.com 672: Need better error reporting if this
* fails. But is it too early to post a dialog here? Does every user
* of NautilusPreferences have to deal with this;
*/
preferences_succeeded = nautilus_preferences_initialize (argc, argv);
g_assert (preferences_succeeded);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi("OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e", make_obj, NULL);
do {
bonobo_main();
} while(object_count > 0);
return 0;
}
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="History sidebar panel for Nautilus"/>
<oaf_attribute name="name" type="string" value="History sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="History"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="*"/>
</oaf_attribute>
</oaf_server>
</oaf_info>
......@@ -28,7 +28,7 @@
#ifndef NAUTILUS_CONTENT_LOSER_H
#define NAUTILUS_CONTENT_LOSER_H
#include <libnautilus/nautilus-view-frame.h>
#include <libnautilus/nautilus-view.h>
#include <gtk/gtklabel.h>
typedef struct NautilusContentLoser NautilusContentLoser;
......
......@@ -28,7 +28,7 @@
#ifndef NAUTILUS_SIDEBAR_LOSER_H
#define NAUTILUS_SIDEBAR_LOSER_H
#include <libnautilus/nautilus-view-frame.h>
#include <libnautilus/nautilus-view.h>
#include <gtk/gtklabel.h>
typedef struct NautilusSidebarLoser NautilusSidebarLoser;
......
......@@ -26,7 +26,7 @@
#ifndef NAUTILUS_MOZILLA_CONTENT_VIEW_H
#define NAUTILUS_MOZILLA_CONTENT_VIEW_H
#include <libnautilus/nautilus-view-frame.h>
#include <libnautilus/nautilus-view.h>
#include <gtk/gtkvbox.h>
typedef struct NautilusMozillaContentView NautilusMozillaContentView;
......
......@@ -25,7 +25,7 @@
#ifndef NAUTILUS_MUSIC_VIEW_H
#define NAUTILUS_MUSIC_VIEW_H
#include <libnautilus/nautilus-view-frame.h>
#include <libnautilus/nautilus-view.h>
#include <gtk/gtkeventbox.h>
......
bin_PROGRAMS=ntl-notes
bin_PROGRAMS=nautilus-notes
INCLUDES=\
-I$(top_srcdir) \
......@@ -19,9 +19,9 @@ LDADD=\
$(GCONF_LIBS) \