Don't build the path to stock icons

janek37 · Jan 2, 2022 · f033cb6 · f033cb6
1 parent 816d2dc
commit f033cb6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 18 deletions.
diff --git a/help/reference/libview/libatrilview-sections.txt b/help/reference/libview/libatrilview-sections.txt
@@ -314,7 +314,6 @@ EV_STOCK_RESIZE_SW
 EV_STOCK_CLOSE
 EV_STOCK_INVERTED_COLORS
 ev_stock_icons_init
-ev_stock_icons_shutdown
 ev_stock_icons_set_screen
 </SECTION>
 

diff --git a/libview/ev-stock-icons.c b/libview/ev-stock-icons.c
@@ -51,15 +51,13 @@ static const EvStockIcon stock_icons [] = {
 	{ EV_STOCK_SEND_TO,          "document-send"},
 };
 
-static gchar *ev_icons_path;
+#define EV_ICONS_PATH ATRILDATADIR "/icons"
 
 static void
 ev_stock_icons_add_icons_path_for_screen (GdkScreen *screen)
 {
 	GtkIconTheme *icon_theme;
 
-	g_return_if_fail (ev_icons_path != NULL);
-
 	icon_theme = screen ? gtk_icon_theme_get_for_screen (screen) : gtk_icon_theme_get_default ();
 	if (icon_theme) {
 		gchar **path = NULL;
@@ -71,13 +69,13 @@ ev_stock_icons_add_icons_path_for_screen (GdkScreen *screen)
 		 */
 		gtk_icon_theme_get_search_path (icon_theme, &path, &n_paths);
 		for (i = n_paths - 1; i >= 0; i--) {
-			if (g_ascii_strcasecmp (ev_icons_path, path[i]) == 0)
+			if (g_ascii_strcasecmp (EV_ICONS_PATH, path[i]) == 0)
 				break;
 		}
 
 		if (i < 0)
 			gtk_icon_theme_append_search_path (icon_theme,
-							   ev_icons_path);
+							   EV_ICONS_PATH);
 
 		g_strfreev (path);
 	}
@@ -95,8 +93,6 @@ ev_stock_icons_init (void)
 	GtkIconSource *source;
 	gint i;
 
-	ev_icons_path = g_build_filename (ATRILDATADIR, "icons", NULL);
-
         factory = gtk_icon_factory_new ();
         gtk_icon_factory_add_default (factory);
 
@@ -128,10 +124,3 @@ ev_stock_icons_set_screen (GdkScreen *screen)
 
 	ev_stock_icons_add_icons_path_for_screen (screen);
 }
-
-void
-ev_stock_icons_shutdown (void)
-{
-	g_free (ev_icons_path);
-}
-
diff --git a/libview/ev-stock-icons.h b/libview/ev-stock-icons.h
@@ -50,7 +50,6 @@ G_BEGIN_DECLS
 #define EV_STOCK_SEND_TO                "document-send"
 
 void ev_stock_icons_init       (void);
-void ev_stock_icons_shutdown   (void);
 void ev_stock_icons_set_screen (GdkScreen *screen);
 
 G_END_DECLS

diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c
@@ -163,7 +163,6 @@ main (gint argc, gchar **argv)
 		ev_previewer_unlink_tempfile (print_settings);
 
 	ev_shutdown ();
-	ev_stock_icons_shutdown ();
 	g_object_unref (model);
 
 	return 0;

diff --git a/shell/main.c b/shell/main.c
@@ -281,7 +281,6 @@ main (int argc, char *argv[])
 
     done:
 	ev_shutdown ();
-	ev_stock_icons_shutdown ();
 
 	g_object_unref (application);
 	return status;