[galeon] Remove old Nautilus View.
- From: Fabio Bonelli <fabiob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [galeon] Remove old Nautilus View.
- Date: Wed, 12 May 2010 16:47:28 +0000 (UTC)
commit 38145e5bb954980b23c0ce74a024796609100f23
Author: Fabio Bonelli <fabiob src gnome org>
Date: Tue May 4 18:41:44 2010 +0200
Remove old Nautilus View.
No one uses it anymore AFAIK. I don't even know if it still works.
GNOME_Galeon_NautilusView.server.in | 30 -
Makefile.am | 4 +-
configure.in | 37 --
embed/Makefile.am | 19 +-
embed/galeon-embed-helper-list.c | 120 -----
embed/galeon-embed-helper-list.h | 9 -
embed/galeon-embed-popup-control.c | 189 -------
embed/galeon-embed-popup-control.h | 61 ---
embed/galeon-embed-popup.c | 761 ---------------------------
embed/galeon-embed-popup.h | 76 ---
galeon.spec.in | 11 +-
mkinstalldirs | 8 +-
slackware/galeon.build | 1 -
slackware/prototype | 1 -
src/Makefile.am | 12 +-
src/galeon-main.c | 7 -
src/galeon-nautilus-view.c | 993 -----------------------------------
src/galeon-nautilus-view.h | 75 ---
src/galeon-shell.c | 50 --
ui/Makefile.am | 3 +-
ui/nautilus-galeon-view-ui.xml.in | 127 -----
utils/Makefile.am | 20 +-
utils/gul-bonobo-extensions.c | 262 ---------
utils/gul-bonobo-extensions.h | 69 ---
24 files changed, 14 insertions(+), 2931 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 05ad5aa..813fb6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,8 @@ Application_in_files = galeon.desktop.in
Application_DATA = $(Application_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-server_in_files = GNOME_Galeon_Automation.server.in GNOME_Galeon_NautilusView.server.in
-server_DATA = GNOME_Galeon_Automation.server GNOME_Galeon_NautilusView.server
+server_in_files = GNOME_Galeon_Automation.server.in
+server_DATA = GNOME_Galeon_Automation.server
serverdir = $(libdir)/bonobo/servers
@INTLTOOL_SERVER_RULE@
diff --git a/configure.in b/configure.in
index 892c4e1..0de87cc 100644
--- a/configure.in
+++ b/configure.in
@@ -77,41 +77,6 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
GNOME_DEBUG_CHECK
dnl ******************************
-dnl Nautilus View checking
-dnl ******************************
-
-build_nautilus_view=no
-AC_ARG_ENABLE(nautilus-view, [ --enable-nautilus-view (auto,yes,no)
- Enable Nautilus View Galeon Component])
-
-AC_MSG_CHECKING(if NautilusView Galeon component is wanted)
-if test "x$enable_nautilus_view" = "x" ; then
- enable_nautilus_view=auto
-fi
-if test "x$enable_nautilus_view" = "xauto"; then
- temptest=`pkg-config --cflags libnautilus 2> /dev/null`
- if test "x$temptest" = "x" ; then
- enable_nautilus_view=no
- else
- enable_nautilus_view=yes
- fi
-fi
-
-AC_MSG_RESULT($enable_nautilus_view)
-
-if test "x$enable_nautilus_view" = "xyes"; then
- AC_DEFINE(ENABLE_NAUTILUS_VIEW, 1, [Define to 1 if you wish to enable the nautilus view.])
- nautilusview_pkgs=libnautilus
-
- dnl See if nautilus has the "nautilus_view_open_location" function (2.5+)
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS `pkg-config --libs libnautilus`"
- AC_CHECK_FUNCS(nautilus_view_open_location)
- LDFLAGS=$_SAVE_LDFLAGS
-fi
-AM_CONDITIONAL(ENABLE_NAUTILUS_VIEW, test "x$enable_nautilus_view" = "xyes")
-
-dnl ******************************
dnl Core dependancy checking
dnl ******************************
@@ -144,7 +109,6 @@ PKG_CHECK_MODULES(GALEON_DEPENDENCY, \
gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED\
gnome-vfs-module-2.0 >= $GNOME_VFS_REQUIRED\
gconf-2.0 >= $GCONF_REQUIRED \
- $nautilusview_pkgs \
$gnomedesktop_pkgs
)
AC_SUBST(GALEON_DEPENDENCY_CFLAGS)
@@ -991,7 +955,6 @@ bookmarks/Makefile
po/Makefile.in
ui/Makefile
ui/galeon-bookmarks-editor-ui.xml
-ui/nautilus-galeon-view-ui.xml
doc/Makefile
doc/C/Makefile
doc/es/Makefile
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 3b99338..3b567e9 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -6,19 +6,6 @@ INCLUDES = \
noinst_LTLIBRARIES = libembed.la
-
-nautilus_view_extra_dist = \
- galeon-embed-popup-control.c \
- galeon-embed-popup-control.h \
- galeon-embed-popup.c \
- galeon-embed-popup.h
-
-if ENABLE_NAUTILUS_VIEW
-nautilus_view_sources = $(nautilus_view_extra_dist)
-else
-nautilus_view_sources =
-endif
-
libembed_la_SOURCES = \
galeon-embed-types.h \
js-console.c \
@@ -47,11 +34,7 @@ libembed_la_SOURCES = \
galeon-encodings.c \
galeon-embed-prefs.h \
galeon-embed-helper-list.c \
- galeon-embed-helper-list.h \
- $(nautilus_view_sources)
-
-
-EXTRA_DIST = $(nautilus_view_extra_dist)
+ galeon-embed-helper-list.h
# Quiet compilation
LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
diff --git a/embed/galeon-embed-helper-list.c b/embed/galeon-embed-helper-list.c
index e7d91bb..d8a55b9 100644
--- a/embed/galeon-embed-helper-list.c
+++ b/embed/galeon-embed-helper-list.c
@@ -21,9 +21,6 @@
#include "galeon-embed-helper-list.h"
#include "galeon-embed-persist.h"
-#ifdef ENABLE_NAUTILUS_VIEW
-#include "gul-bonobo-extensions.h"
-#endif
#include "gul-string.h"
#include "gul-general.h"
@@ -393,89 +390,6 @@ open_directly (const char *location,
return result;
}
-#ifdef ENABLE_NAUTILUS_VIEW
-static void
-bonobo_launch_application_callback (BonoboUIComponent *component, gpointer callback_data, const char *path)
-{
- ApplicationLaunchParameters *launch_parameters;
-
- launch_parameters = (ApplicationLaunchParameters *) callback_data;
-
- if (!open_directly (launch_parameters->url,
- launch_parameters->application))
- {
- open_with_temp (launch_parameters->hl,
- launch_parameters->url,
- launch_parameters->application);
- }
-}
-
-static void
-add_numbered_menu_item (BonoboUIComponent *ui,
- const char *parent_path,
- const char *label,
- const char *tip,
- int index,
- GdkPixbuf *pixbuf,
- gpointer callback,
- gpointer callback_data,
- GDestroyNotify destroy_notify)
-{
- char *escaped_parent_path, *escaped_label, *verb_name, *item_path;
-
- escaped_parent_path = gul_string_double_underscores (parent_path);
-
- escaped_label = gul_string_double_underscores (label);
- gul_bonobo_add_numbered_menu_item
- (ui,
- escaped_parent_path,
- index,
- escaped_label,
- pixbuf);
- g_free (escaped_label);
- item_path = gul_bonobo_get_numbered_menu_item_path
- (ui, escaped_parent_path, index);
- gul_bonobo_set_tip (ui, item_path, tip);
- g_free (item_path);
-
- verb_name = gul_bonobo_get_numbered_menu_item_command
- (ui, escaped_parent_path, index);
- bonobo_ui_component_add_verb_full (ui, verb_name,
- g_cclosure_new (callback, callback_data,
- (GClosureNotify) destroy_notify));
- g_free (verb_name);
-
- g_free (escaped_parent_path);
-}
-
-static void
-add_application_to_bonobo_menu (GaleonEmbedHelperList *hl,
- BonoboUIComponent *ui_component,
- GnomeVFSMimeApplication *application,
- const char *path,
- const char *url,
- int index)
-{
- ApplicationLaunchParameters *launch_parameters;
- char *tip;
-
- launch_parameters = application_launch_parameters_new
- (application, url, hl);
- tip = g_strdup_printf (_("Use \"%s\" to open the selected item"), application->name);
-
- add_numbered_menu_item (ui_component,
- path,
- application->name,
- tip,
- index,
- NULL,
- bonobo_launch_application_callback,
- launch_parameters,
- (GDestroyNotify) application_launch_parameters_free);
- g_free (tip);
-}
-#endif
-
static void
activate_cb (GtkMenuItem *mi, ApplicationLaunchParameters *launch_parameters)
{
@@ -678,40 +592,6 @@ get_all_applications (GList *mime_types)
return all_apps;
}
-#ifdef ENABLE_NAUTILUS_VIEW
-static void
-setup_openwith_list_bonoboui (GaleonEmbedHelperList *hl,
- BonoboUIComponent *ui_component,
- const char *path)
-{
- int index = 0;
- GList *apps;
- GList *l;
-
- apps = get_all_applications (hl->priv->mime_types);
-
- for (l = apps; l != NULL; l = l->next)
- {
- add_application_to_bonobo_menu
- (hl, ui_component,
- (GnomeVFSMimeApplication *)l->data,
- path, hl->priv->uri, index);
- index ++;
- }
-
- gnome_vfs_mime_application_list_free (apps);
-}
-
-void
-galeon_embed_helper_list_add_to_bonoboui_menu (GaleonEmbedHelperList *hl,
- BonoboUIComponent *ui_component,
- const char *path)
-{
- setup_openwith_list_bonoboui (hl, ui_component, path);
-}
-#endif
-
-
void
galeon_embed_helper_list_add_to_gtk_menu (GaleonEmbedHelperList *hl,
GtkMenuShell *ms)
diff --git a/embed/galeon-embed-helper-list.h b/embed/galeon-embed-helper-list.h
index ba6dbba..d5258dc 100644
--- a/embed/galeon-embed-helper-list.h
+++ b/embed/galeon-embed-helper-list.h
@@ -21,9 +21,6 @@
#include "galeon-embed.h"
-#ifdef ENABLE_NAUTILUS_VIEW
-#include <bonobo/bonobo-ui-component.h>
-#endif
#include <glib-object.h>
#include <glib.h>
#include <gtk/gtkmenushell.h>
@@ -66,12 +63,6 @@ gboolean galeon_embed_helper_list_set_uri (GaleonEmbedHelperList *hl,
void galeon_embed_helper_list_add_mime_type (GaleonEmbedHelperList *hl,
const char *mime_type);
-#ifdef ENABLE_NAUTILUS_VIEW
-void galeon_embed_helper_list_add_to_bonoboui_menu (GaleonEmbedHelperList *hl,
- BonoboUIComponent *ui_component,
- const char *path);
-#endif
-
void galeon_embed_helper_list_add_to_gtk_menu (GaleonEmbedHelperList *hl,
GtkMenuShell *ms);
diff --git a/galeon.spec.in b/galeon.spec.in
index 6905b6c..1da106c 100644
--- a/galeon.spec.in
+++ b/galeon.spec.in
@@ -21,16 +21,7 @@ Galeon was written to do just one thing - browse the web.
%setup
%build
-# if you set the DONT_BUILD_NAUTILUS_VIEW environment variable to something
-# else than "" the view won't be built. Otherwise, it will e built if
-# libnautilus is detected by configure.
-if [ "$DONT_BUILD_NAUTILUS_VIEW" != "" ] ; then
- NAUTILUS_VIEW_OPTION="--enable-nautilus-view=no"
- echo Warning: The nautilius view will not be built.
-else
- NAUTILUS_VIEW_OPTION=""
-fi
-%configure $NAUTILUS_VIEW_OPTION --disable-werror --disable-schemas-install
+%configure --disable-werror --disable-schemas-install
make
%install
diff --git a/mkinstalldirs b/mkinstalldirs
index 259dbfc..4191a45 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-06-29.22
+scriptversion=2009-04-28.21; # UTC
# Original author: Noah Friedman <friedman prep ai mit edu>
# Created: 1993-05-16
@@ -11,6 +11,9 @@ scriptversion=2005-06-29.22
# bugs to <bug-automake gnu org> or send patches to
# <automake-patches gnu org>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
dirmode=
@@ -154,5 +157,6 @@ exit $errstatus
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/slackware/galeon.build b/slackware/galeon.build
index 34f3ba4..3c0a2cd 100644
--- a/slackware/galeon.build
+++ b/slackware/galeon.build
@@ -10,7 +10,6 @@ CFLAGS=-O2 CXXFLAGS=-O2 ./configure --prefix=/opt/gnome \
--with-mozilla-libs=/opt/gnome/lib \
--with-mozilla-home=/opt/gnome/lib/mozilla \
--with-mozilla-includes=/opt/gnome/include/mozilla \
- --enable-nautilus-view \
--disable-install-schemas \
$ARCH-slackware-linux
make
diff --git a/slackware/prototype b/slackware/prototype
index f7a5de7..34c6691 100644
--- a/slackware/prototype
+++ b/slackware/prototype
@@ -23,7 +23,6 @@ compile() {
--with-mozilla-libs=/opt/gnome/lib \
--with-mozilla-home=/opt/gnome/lib/mozilla \
--with-mozilla-includes=/opt/gnome/include/mozilla \
- --enable-nautilus-view \
--disable-install-schemas \
$ARCH-slackware-linux
make
diff --git a/src/Makefile.am b/src/Makefile.am
index afc40cc..2aeb89a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,20 +23,10 @@ galeon_automation_interface_idl_sources = \
GaleonAutomation-skels.c \
GaleonAutomation.h
-nautilus_view_extra_dist = \
- galeon-nautilus-view.c \
- galeon-nautilus-view.h
-if ENABLE_NAUTILUS_VIEW
-nautilus_view_sources = $(nautilus_view_extra_dist)
-else
-nautilus_view_sources =
-endif
-
nodist_galeon_SOURCES = \
$(galeon_automation_interface_idl_sources)
galeon_SOURCES = \
- $(nautilus_view_sources) \
statusbar.c \
statusbar.h \
galeon-main.c \
@@ -165,7 +155,7 @@ CLEANFILES = $(BUILT_SOURCES)
GaleonAutomation-common.c GaleonAutomation-stubs.c GaleonAutomation-skels.c GaleonAutomation.h: $(top_srcdir)/idl/GaleonAutomation.idl
$(ORBIT_IDL) -I $(LIBBONOBO_IDL) -I $(BONOBO_ACTIVATION_IDL) $(top_srcdir)/idl/GaleonAutomation.idl
-EXTRA_DIST = $(top_srcdir)/idl/GaleonAutomation.idl $(nautilus_view_extra_dist)
+EXTRA_DIST = $(top_srcdir)/idl/GaleonAutomation.idl
# Quiet compilation
LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
diff --git a/src/galeon-main.c b/src/galeon-main.c
index cff2313..f4ff922 100644
--- a/src/galeon-main.c
+++ b/src/galeon-main.c
@@ -64,7 +64,6 @@ static gchar *bookmark_url = NULL; /* the temp bookmark to add
static gboolean close_option = FALSE; /* --close */
static gboolean quit_option = FALSE; /* --quit */
static gboolean galeon_server_mode = FALSE;
-static gboolean open_as_nautilus_view = FALSE;
static gint n_urls;
static gchar **url;
@@ -109,11 +108,6 @@ static struct poptOption popt_options[] =
{ "quit", 'q', POPT_ARG_NONE, &quit_option, 0,
N_("Same as --close, but exits server mode too"),
NULL },
-#ifdef ENABLE_NAUTILUS_VIEW
- { "nautilus-view", 'v', POPT_ARG_NONE, &open_as_nautilus_view, 0,
- N_("Used internally by the nautilus view"),
- NULL },
-#endif
/* terminator, must be last */
{ NULL, 0, 0, NULL, 0, NULL, NULL }
@@ -357,7 +351,6 @@ galeon_main_start (guint32 user_time)
}
/* provided with urls? */
else if (n_urls == 0 &&
- !open_as_nautilus_view &&
!galeon_server_mode)
{
/* no, open a default window */
diff --git a/src/galeon-shell.c b/src/galeon-shell.c
index ce64330..b1e8321 100644
--- a/src/galeon-shell.c
+++ b/src/galeon-shell.c
@@ -47,15 +47,6 @@
#include <gtk/gtkversion.h>
#include <gconf/gconf-client.h>
-#ifdef ENABLE_NAUTILUS_VIEW
-
-#include <bonobo/bonobo-generic-factory.h>
-#include "galeon-nautilus-view.h"
-
-#define GALEON_NAUTILUS_VIEW_OAFIID "OAFIID:GNOME_Galeon_NautilusViewFactory"
-
-#endif
-
#define GALEON_SHELL_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
GALEON_TYPE_SHELL, GaleonShellPrivate))
@@ -90,17 +81,6 @@ galeon_shell_finalize (GObject *object);
static void
galeon_init_services (GaleonShell *gs);
-#ifdef ENABLE_NAUTILUS_VIEW
-
-static void
-galeon_nautilus_view_init_factory (GaleonShell *gs);
-static BonoboObject *
-galeon_nautilus_view_new (BonoboGenericFactory *factory,
- const char *id,
- GaleonShell *gs);
-
-#endif
-
static void bookmarks_init (GaleonShell *gs);
static GObjectClass *parent_class = NULL;
@@ -397,13 +377,6 @@ galeon_init_services (GaleonShell *gs)
eel_gconf_monitor_add ("/system/proxy");
bookmarks_init (gs);
-
-#ifdef ENABLE_NAUTILUS_VIEW
-
- galeon_nautilus_view_init_factory (gs);
-
-#endif
-
}
static void
@@ -718,29 +691,6 @@ galeon_shell_new_tab_from_embed_full (GaleonShell *shell,
return tab;
}
-#ifdef ENABLE_NAUTILUS_VIEW
-
-static void
-galeon_nautilus_view_init_factory (GaleonShell *gs)
-{
- BonoboGenericFactory *galeon_nautilusview_factory;
- galeon_nautilusview_factory = bonobo_generic_factory_new
- (GALEON_NAUTILUS_VIEW_OAFIID,
- (BonoboFactoryCallback) galeon_nautilus_view_new, gs);
- if (!BONOBO_IS_GENERIC_FACTORY (galeon_nautilusview_factory))
- g_warning ("Couldn't create the factory!");
-
-}
-
-static BonoboObject *
-galeon_nautilus_view_new (BonoboGenericFactory *factory, const char *id,
- GaleonShell *gs)
-{
- return galeon_nautilus_view_new_component (gs);
-}
-
-#endif
-
static void
bookmarks_init (GaleonShell *gs)
{
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 4289697..ba67fb0 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -58,8 +58,7 @@ ui_DATA = prefs-dialog.glade \
uidir = $(pkgdatadir)
uixmldir = $(datadir)/gnome-2.0/ui
-uixml_in_files = galeon-bookmarks-editor-ui.xml.in \
- nautilus-galeon-view-ui.xml.in
+uixml_in_files = galeon-bookmarks-editor-ui.xml.in
uixml_DATA = $(uixml_in_files:.xml.in=.xml)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 9ef2265..80b3697 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -21,20 +21,6 @@ nodist_libutils_la_SOURCES = \
galeon-marshal.c \
galeon-marshal.h
-
-
-nautilus_view_extra_dist = \
- gul-bonobo-extensions.h \
- gul-bonobo-extensions.c
-
-if ENABLE_NAUTILUS_VIEW
-nautilus_view_sources = $(nautilus_view_extra_dist)
-else
-nautilus_view_sources =
-endif
-
-
-
libutils_la_SOURCES = \
eel-gconf-extensions.c \
eel-gconf-extensions.h \
@@ -99,9 +85,7 @@ libutils_la_SOURCES = \
gul-toolbutton.c \
gul-toolbutton.h \
galeon-auto-bookmarks-source.c \
- galeon-auto-bookmarks-source.h \
- $(nautilus_view_sources)
-
+ galeon-auto-bookmarks-source.h
# FIXME: someone with better automake knowledge may de this better:
BUILT_SOURCES=galeon-marshal.c galeon-marshal.h Gtm.h Gtm-common.c Gtm-stubs.c
@@ -117,7 +101,7 @@ galeon-marshal.h: galeon-marshal.list
Gtm-common.c Gtm-stubs.c Gtm.h: $(top_srcdir)/idl/Gtm.idl
$(ORBIT_IDL) --noskels $(top_srcdir)/idl/Gtm.idl
-EXTRA_DIST = galeon-marshal.list $(top_srcdir)/idl/Gtm.idl $(nautilus_view_extra_dist)
+EXTRA_DIST = galeon-marshal.list $(top_srcdir)/idl/Gtm.idl
# Quiet compilation
LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
