From 8d18b3c2facb283a41c294de590a48c44a426bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Sat, 20 Jun 2009 16:53:28 +0000
Subject: [PATCH] Init stock items before creating the toolbar (closes
 #2809324).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3882 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog      | 2 ++
 src/main.c     | 2 ++
 src/ui_utils.c | 4 +---
 src/ui_utils.h | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37d5b904c..baed3fa98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
    to easily expand and collapse all groups.
    Refactor the keybindings code for the preferences dialog, prefix all
    related functions.
+ * src/main.c, src/ui_utils.c, src/ui_utils.h:
+   Init stock items before creating the toolbar (closes #2809324).
 
 
 2009-06-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/src/main.c b/src/main.c
index 3075d9d7d..af49e0fb6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -244,6 +244,8 @@ static void main_init(void)
 	ui_prefs.recent_projects_queue		= g_queue_new();
 	main_status.opening_session_files	= FALSE;
 
+	ui_init_stock_items();
+
 	main_widgets.window = create_window1();
 
 	/* add recent projects to the Project menu */
diff --git a/src/ui_utils.c b/src/ui_utils.c
index 96159a72c..ade284118 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1774,7 +1774,7 @@ static void create_config_files_menu(void)
 }
 
 
-static void add_stock_items(void)
+void ui_init_stock_items(void)
 {
 	GtkIconSet *icon_set;
 	GtkIconFactory *factory = gtk_icon_factory_new();
@@ -1833,8 +1833,6 @@ static void init_recent_files(void)
 
 void ui_init(void)
 {
-	add_stock_items();
-
 	init_recent_files();
 
 	ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar");
diff --git a/src/ui_utils.h b/src/ui_utils.h
index d8e680329..efe7566b2 100644
--- a/src/ui_utils.h
+++ b/src/ui_utils.h
@@ -205,6 +205,8 @@ void ui_init(void);
 
 void ui_init_toolbar_widgets(void);
 
+void ui_init_stock_items(void);
+
 void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label,
 		GtkContainer *parent);