[gedit] App: remove the GeditMetadataManager



commit d6b158ca6cda29aa0f80fb84460f3f53f955ed0d
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Nov 14 09:52:17 2019 +0100

    App: remove the GeditMetadataManager
    
    See the previous commits.

 gedit/gedit-app-private.h |  3 ---
 gedit/gedit-app.c         | 41 -----------------------------------------
 2 files changed, 44 deletions(-)
---
diff --git a/gedit/gedit-app-private.h b/gedit/gedit-app-private.h
index 693fa5c43..f5f1d7f34 100644
--- a/gedit/gedit-app-private.h
+++ b/gedit/gedit-app-private.h
@@ -22,7 +22,6 @@
 #define GEDIT_APP_PRIVATE_H
 
 #include "gedit-app.h"
-#include "gedit-metadata-manager.h"
 #include "gedit-settings.h"
 #include "gedit-menu-extension.h"
 
@@ -49,8 +48,6 @@ GtkPrintSettings      *_gedit_app_get_default_print_settings  (GeditApp         *app);
 void                    _gedit_app_set_default_print_settings  (GeditApp         *app,
                                                                 GtkPrintSettings *settings);
 
-GeditMetadataManager   *_gedit_app_get_metadata_manager        (GeditApp  *app);
-
 GeditSettings          *_gedit_app_get_settings                (GeditApp  *app);
 
 GMenuModel             *_gedit_app_get_hamburger_menu          (GeditApp  *app);
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index e63b09289..fd61fc857 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -50,10 +50,6 @@
 #include "gedit-tab.h"
 #include "gedit-tab-private.h"
 
-#ifndef ENABLE_GVFS_METADATA
-#include "gedit-metadata-manager.h"
-#endif
-
 #define GEDIT_PAGE_SETUP_FILE          "gedit-page-setup"
 #define GEDIT_PRINT_SETTINGS_FILE      "gedit-print-settings"
 
@@ -61,10 +57,6 @@ typedef struct
 {
        GeditPluginsEngine *engine;
 
-#ifndef ENABLE_GVFS_METADATA
-       GeditMetadataManager *metadata_manager;
-#endif
-
        GtkCssProvider     *theme_provider;
 
        GeditLockdownMask  lockdown;
@@ -172,10 +164,6 @@ gedit_app_dispose (GObject *object)
 
        priv = gedit_app_get_instance_private (GEDIT_APP (object));
 
-#ifndef ENABLE_GVFS_METADATA
-       g_clear_object (&priv->metadata_manager);
-#endif
-
        g_clear_object (&priv->ui_settings);
        g_clear_object (&priv->window_settings);
        g_clear_object (&priv->settings);
@@ -757,10 +745,6 @@ gedit_app_startup (GApplication *application)
        GeditAppPrivate *priv;
        GtkCssProvider *css_provider;
        GtkSourceStyleSchemeManager *manager;
-#ifndef ENABLE_GVFS_METADATA
-       const gchar *cache_dir;
-       gchar *metadata_filename;
-#endif
 
        priv = gedit_app_get_instance_private (GEDIT_APP (application));
 
@@ -772,13 +756,6 @@ gedit_app_startup (GApplication *application)
 
        setup_theme_extensions (GEDIT_APP (application));
 
-#ifndef ENABLE_GVFS_METADATA
-       cache_dir = gedit_dirs_get_user_cache_dir ();
-       metadata_filename = g_build_filename (cache_dir, "gedit-metadata.xml", NULL);
-       priv->metadata_manager = gedit_metadata_manager_new (metadata_filename);
-       g_free (metadata_filename);
-#endif
-
        /* Load settings */
        priv->settings = gedit_settings_new ();
        priv->ui_settings = g_settings_new ("org.gnome.gedit.preferences.ui");
@@ -1868,24 +1845,6 @@ _gedit_app_get_settings (GeditApp *app)
        return priv->settings;
 }
 
-GeditMetadataManager *
-_gedit_app_get_metadata_manager (GeditApp *app)
-{
-#ifndef ENABLE_GVFS_METADATA
-       GeditAppPrivate *priv;
-
-       g_return_val_if_fail (GEDIT_IS_APP (app), NULL);
-
-       priv = gedit_app_get_instance_private (app);
-
-       return priv->metadata_manager;
-#else
-       g_assert_not_reached ();
-       return NULL;
-#endif
-}
-
-
 GMenuModel *
 _gedit_app_get_hamburger_menu (GeditApp *app)
 {


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