[totem/wip/hadess/nautilus-properties-removal: 3/3] properties: Remove nautilus properties page



commit 10c452c42c22654f0ac7f121b0036334c178b6b7
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Feb 11 16:01:07 2019 +0100

    properties: Remove nautilus properties page
    
    It's now in nautilus itself. See:
    https://gitlab.gnome.org/GNOME/nautilus/issues/887
    https://gitlab.gnome.org/GNOME/nautilus/merge_requests/411

 .gitlab-ci.yml              |   2 +-
 docs/reference/meson.build  |   1 -
 meson.build                 |  29 ----
 meson_options.txt           |   2 -
 po/POTFILES.in              |   2 -
 src/meson.build             |  45 -----
 src/test-properties-page.c  |  87 ----------
 src/totem-properties-main.c | 160 ------------------
 src/totem-properties-view.c | 395 --------------------------------------------
 src/totem-properties-view.h |  57 -------
 10 files changed, 1 insertion(+), 779 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce6035db2..2b89a1fcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ build-fedora:
   image: fedora:latest
   stage: test
   before_script:
-    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel 
clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel 
gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool 
libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint 
python3-devel totem-pl-parser-devel flatpak-builder
+    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel 
clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel 
gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool 
libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson pygobject3-devel pylint python3-devel 
totem-pl-parser-devel flatpak-builder
   script:
     - meson _build
     - ninja -C _build test
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 8ec9db342..1776eaa0c 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -40,7 +40,6 @@ private_headers = [
   'totem-preferences.h',
   'totem-private.h',
   'totem-profile.h',
-  'totem-properties-view.h',
   'totem-python-plugin.h',
   'totem-resources.h',
   'totem-screenshot-plugin.h',
diff --git a/meson.build b/meson.build
index e7c878652..1a2ef09b6 100644
--- a/meson.build
+++ b/meson.build
@@ -216,28 +216,6 @@ if python_option != 'no'
   endif
 endif
 
-# nautilus support
-have_nautilus = false
-
-if get_option('enable-nautilus') != 'no'
-  libnautilus_ext_dep = dependency('libnautilus-extension', version: '>= 2.91.3', required: false)
-  if libnautilus_ext_dep.found()
-    nautilusdir = get_option('with-nautilusdir')
-    if nautilusdir == ''
-      nautilusdir = libnautilus_ext_dep.get_pkgconfig_variable('extensiondir')
-    endif
-
-    have_nautilus = true
-    message('installing nautilus plugin in ' + nautilusdir)
-  else
-    if get_option('enable-nautilus') == 'yes'
-      error('nautilus support enabled but libnautilus-extension missing')
-    else
-      message('libnautilus-extension missing so disabling nautilus supportt')
-    endif
-  endif
-endif
-
 configure_file(
   output: 'config.h',
   configuration: config_h
@@ -287,11 +265,4 @@ foreach plugin: allowed_plugins
   endif
 endforeach
 
-str = 'Nautilus properties page'
-if have_nautilus
-  message('** ' + str + ' enabled')
-else
-  message('   ' + str + ' disabled')
-endif
-
 message('End options')
diff --git a/meson_options.txt b/meson_options.txt
index bcce94676..e1c590968 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,5 @@
 option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', 
description: 'Whether to enable easy codec installation support for GStreamer')
 option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable 
python support')
 option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which 
Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
-option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 
'compile the nautilus plugin')
-option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus 
extension')
 option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
 option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 
'Enable GObject Introspection (depends on GObject)')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29cdec3bd..8676b6f49 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,8 +28,6 @@ src/totem-open-location.c
 src/totem-options.c
 src/totem-playlist.c
 src/totem-preferences.c
-src/totem-properties-main.c
-src/totem-properties-view.c
 src/totemselectiontoolbar.ui
 src/totem-subtitle-encoding.c
 src/totem-time-label.c
diff --git a/src/meson.build b/src/meson.build
index 478798384..c5e04bf97 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -24,7 +24,6 @@ enum_headers = files(
   'totem-preferences.h',
   'totem-private.h',
   'totem-profile.h',
-  'totem-properties-view.h',
   'totem-resources.h',
   'totem-search-entry.h',
   'totem-selection-toolbar.h',
@@ -250,50 +249,6 @@ executable(
   install_dir: totem_libexecdir
 )
 
-if have_nautilus
-  libtotem_properties_page_sources = files(
-    'totem-properties-main.c',
-    'totem-properties-view.c'
-  )
-
-  libtotem_properties_page_deps = missing_plugins_deps + [
-    gtk_dep,
-    dependency('gthread-2.0'),
-    libnautilus_ext_dep,
-    gst_tag_dep,
-    libbacon_video_widget_properties_dep
-  ]
-
-  libtotem_properties_page = shared_module(
-    'totem-properties-page',
-    sources: libtotem_properties_page_sources + gen_sources,
-    include_directories: top_inc,
-    dependencies: libtotem_properties_page_deps,
-    c_args: totem_common_cflags + [
-      '-DG_LOG_DOMAIN="TotemPropertiesPage"'
-    ],
-    install: true,
-    install_dir: nautilusdir
-  )
-
-  test_properties_page_sources = files(
-    'totem-properties-main.c',
-    'totem-properties-view.c',
-    'test-properties-page.c'
-  )
-
-  executable(
-    'test-properties-page',
-    test_properties_page_sources + gen_sources,
-    include_directories: top_inc,
-    dependencies: libtotem_properties_page_deps + [
-      libtotem_player_dep,
-      libbacon_video_widget_dep
-    ],
-    c_args: totem_common_cflags
-  )
-endif
-
 test_icons_sources = files(
   'icon-helpers.c',
   'test-icons.c'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]