[totem/wip/hadess/remove-plugin-interface: 5/5] main: Remove TOTEM_RUN_IN_SOURCE_TREE ifdef's
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/wip/hadess/remove-plugin-interface: 5/5] main: Remove TOTEM_RUN_IN_SOURCE_TREE ifdef's
- Date: Tue, 11 May 2021 12:42:17 +0000 (UTC)
commit 3cb2ab9072832e2a47e189d495d530af79bc090e
Author: Bastien Nocera <hadess hadess net>
Date: Tue May 11 14:37:52 2021 +0200
main: Remove TOTEM_RUN_IN_SOURCE_TREE ifdef's
This ifdef has been unset and unused since we moved to meson from
autotools.
src/plugins/totem-dirs.c | 16 ++--------------
src/totem-interface.c | 18 ------------------
2 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/src/plugins/totem-dirs.c b/src/plugins/totem-dirs.c
index 252f38a13..dd0dcffa4 100644
--- a/src/plugins/totem-dirs.c
+++ b/src/plugins/totem-dirs.c
@@ -65,18 +65,8 @@ totem_get_plugin_paths (void)
GPtrArray *paths;
char *path;
GSettings *settings;
- gboolean uninstalled;
paths = g_ptr_array_new ();
- uninstalled = FALSE;
-
-#ifdef TOTEM_RUN_IN_SOURCE_TREE
- path = g_build_filename (UNINSTALLED_PLUGINS_LOCATION, NULL);
- if (g_file_test (path, G_FILE_TEST_IS_DIR) != FALSE) {
- uninstalled = TRUE;
- g_ptr_array_add (paths, path);
- }
-#endif
settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
if (g_settings_get_boolean (settings, "disable-user-plugins") == FALSE) {
@@ -86,10 +76,8 @@ totem_get_plugin_paths (void)
g_object_unref (settings);
- if (uninstalled == FALSE) {
- path = g_strdup (TOTEM_PLUGIN_DIR);
- g_ptr_array_add (paths, path);
- }
+ path = g_strdup (TOTEM_PLUGIN_DIR);
+ g_ptr_array_add (paths, path);
/* And null-terminate the array */
g_ptr_array_add (paths, NULL);
diff --git a/src/totem-interface.c b/src/totem-interface.c
index 1b1c8a959..1c6feea43 100644
--- a/src/totem-interface.c
+++ b/src/totem-interface.c
@@ -241,26 +241,8 @@ totem_interface_get_full_path (const char *name)
{
char *filename;
-#ifdef TOTEM_RUN_IN_SOURCE_TREE
- /* Try the GtkBuilder file in the source tree first */
- filename = g_build_filename ("..", "data", name, NULL);
- if (g_file_test (filename, G_FILE_TEST_EXISTS) == FALSE)
- {
- g_free (filename);
- /* Try the local file */
- filename = g_build_filename (DATADIR,
- "totem", name, NULL);
-
- if (g_file_test (filename, G_FILE_TEST_EXISTS) == FALSE)
- {
- g_free (filename);
- return NULL;
- }
- }
-#else
filename = g_build_filename (DATADIR,
"totem", name, NULL);
-#endif
return filename;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]