[libdazzle] theme: no need to duplicate icon loading



commit f15a92bcebced5dc2f5af52d56850aad01ae9ffc
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jun 6 03:47:43 2017 -0700

    theme: no need to duplicate icon loading
    
    This was actually handled by the theme manager.

 src/app/dzl-application.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/src/app/dzl-application.c b/src/app/dzl-application.c
index 927e114..87165f7 100644
--- a/src/app/dzl-application.c
+++ b/src/app/dzl-application.c
@@ -55,7 +55,6 @@ dzl_application_real_add_resource_path (DzlApplication *self,
   g_autoptr(GError) error = NULL;
   g_autofree gchar *menu_path = NULL;
   g_autofree gchar *keythemes_path = NULL;
-  g_autofree gchar *icons_path = NULL;
   guint merge_id;
 
   g_assert (DZL_IS_APPLICATION (self));
@@ -66,7 +65,7 @@ dzl_application_real_add_resource_path (DzlApplication *self,
 
   /*
    * Allow the theme manager to monitor the css/Adwaita.css or other themes
-   * based on gtk-theme-name.
+   * based on gtk-theme-name. The theme manager also loads icons.
    */
   dzl_theme_manager_add_resource_path (priv->theme_manager, resource_path);
 
@@ -87,14 +86,6 @@ dzl_application_real_add_resource_path (DzlApplication *self,
    */
   keythemes_path = g_build_filename (resource_path, "keythemes", NULL);
   dzl_shortcut_manager_append_search_path (priv->shortcut_manager, keythemes_path);
-
-  /*
-   * We want to allow loading icons from $resource_path/icons/ just like Gtk
-   * will do for the base application. However, we cannot remove these once
-   * they've been added, so remove_resource_path() does nothing.
-   */
-  icons_path = g_build_filename (resource_path, "icons", NULL);
-  gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (), icons_path);
 }
 
 static void


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