diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rwxr-xr-x | bin/distro-install-file-lists | 1 | ||||
| -rw-r--r-- | shell/Executable_gnome_open_url.mk | 22 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 1 | ||||
| -rw-r--r-- | shell/source/unix/misc/gnome-open-url.c | 117 | ||||
| -rwxr-xr-x | shell/source/unix/misc/gnome-open-url.sh | 4 |
6 files changed, 2 insertions, 144 deletions
diff --git a/Repository.mk b/Repository.mk index 3d3e35af673b..e5fa7eb1be38 100644 --- a/Repository.mk +++ b/Repository.mk @@ -173,7 +173,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,python, \ ifeq ($(GUIBASE),unx) $(eval $(call gb_Helper_register_executables_for_install,OOO,gnome, \ - gnome-open-url.bin \ $(if $(ENABLE_GTK),\ xid-fullscreen-on-all-monitors \ ) \ diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 167d5143783f..73366f4074db 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -351,7 +351,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then done # Put gtk/gnome stuff into gnome package - mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/program/gnome-open-url.bin mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/program/ucpgvfs1lo.so # Ship ooqstart for gnome in gnome package diff --git a/shell/Executable_gnome_open_url.mk b/shell/Executable_gnome_open_url.mk deleted file mode 100644 index a5f810eb7e25..000000000000 --- a/shell/Executable_gnome_open_url.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Executable_Executable,gnome-open-url.bin)) - -ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Executable_add_libs,gnome-open-url.bin,\ - -ldl \ -)) -endif - -$(eval $(call gb_Executable_add_cobjects,gnome-open-url.bin,\ - shell/source/unix/misc/gnome-open-url \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 46f081d5d43c..de906accd710 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -123,7 +123,6 @@ ifneq ($(filter-out MACOSX WNT,$(OS)),) ifneq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Module_add_targets,shell,\ - Executable_gnome_open_url \ Library_recentfile \ Package_scripts \ Package_scripts_gnome \ diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c deleted file mode 100644 index cd275cd3b89e..000000000000 --- a/shell/source/unix/misc/gnome-open-url.c +++ /dev/null @@ -1,117 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <stdlib.h> -#include <stdio.h> -#include <dlfcn.h> -#include <string.h> -#include <unistd.h> - -typedef int gboolean; -typedef char gchar; -typedef struct _GError GError; - -struct _GError -{ - int domain; - int code; - char *message; -}; - -typedef enum { - GNOME_VFS_OK -} GnomeVFSResult; - -/* - * Wrapper function which extracs gnome_url_show from libgnome - */ - -gboolean gnome_url_show (const char *url, GError **error) -{ - void* handle = dlopen("libgnomevfs-2.so.0", RTLD_LAZY); - gboolean ret = 0; - - (void)error; /* avoid warning due to unused parameter */ - - if( NULL != handle ) - { - gboolean (* init) (void) = - (gboolean (*) (void)) dlsym(handle, "gnome_vfs_init"); - - if( NULL != init && init() ) - { - GnomeVFSResult (* func) (const char *url) = - (GnomeVFSResult (*) (const char *)) dlsym(handle, "gnome_vfs_url_show"); - - if( NULL != func ) - ret = (GNOME_VFS_OK == func(url)); - } - - dlclose(handle); - } - - return ret; -} - -/* - * The intended use of this tool is to pass the argument to - * the gnome_show_url function of libgnome2. - */ - -int main(int argc, char *argv[] ) -{ - GError *error = NULL; - char *fallback; - char *idx; - int retcode = -1; - - if( argc != 2 ) - { - fprintf( stderr, "Usage: gnome-open-url <uri>\n" ); - return -1; - } - - if( gnome_url_show(argv[1], &error) ) - { - return 0; - } - - /* - * launch open-url command by replacing gnome-open-url from - * the command line. This is the fallback when running on - * remote machines with no GNOME installed. - */ - - fallback = strdup(argv[0]); - idx = strstr(fallback, "gnome-open-url"); - if ( NULL != idx ) - { - char *args[3]; - strncpy(idx, "open-url", 9); - args[0] = fallback; - args[1] = argv[1]; - args[2] = NULL; - retcode = execv(fallback, args); - } - free(fallback); - - return retcode; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/unix/misc/gnome-open-url.sh b/shell/source/unix/misc/gnome-open-url.sh index ab730d169a49..0bcd7b63fbed 100755 --- a/shell/source/unix/misc/gnome-open-url.sh +++ b/shell/source/unix/misc/gnome-open-url.sh @@ -1,6 +1,6 @@ #!/bin/sh -# use xdg-open or gnome-open if available -xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || "$0.bin" $1 +# use xdg-open or gnome-open if available, falling back to our own open-url +xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null exit 0 |